X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=configure;h=5074c7ca1c6962289864dbeff6fb94f01de02cf8;hp=dde5a1b0f52997fa5614c84be445a7112b3df1e6;hb=81304798ee736c467839c779c9ca5dca48db7bea;hpb=f79af94ad91dfe693eb9779caf71ea892fb1eff6 diff --git a/configure b/configure index dde5a1b0..5074c7ca 100755 --- a/configure +++ b/configure @@ -1,8 +1,9 @@ #! /bin/sh -# From configure.in Revision: 1.705 . +# From configure.in Revision: 1.733 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20200111. +# Generated by Autoconf 2.52.20210509. # +# Copyright 2003-2020,2021 Thomas E. Dickey # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -60,9 +61,9 @@ as_executable_p="test -f" # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset + as_unset="unset" else - as_unset=false + as_unset="false" fi # NLS nuisances. @@ -97,13 +98,14 @@ exec 6>&1 ac_default_prefix=/usr/local cross_compiling=no subdirs= -MFLAGS= MAKEFLAGS= +MFLAGS= +MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. # This variable seems obsolete. It should probably be removed, and # only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} +: "${ac_max_here_lines=38}" ac_unique_file="ncurses/base/lib_initscr.c" # Factoring default headers for most tests. @@ -204,7 +206,7 @@ do # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case "$ac_option" in -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -245,7 +247,7 @@ do expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo "$ac_feature" | sed 's/-/_/g'` eval "enable_$ac_feature=no" ;; -enable-* | --enable-*) @@ -254,8 +256,8 @@ do expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in + ac_feature=`echo "$ac_feature" | sed 's/-/_/g'` + case "$ac_option" in *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; *) ac_optarg=yes ;; esac @@ -445,8 +447,8 @@ do expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in + ac_package=`echo "$ac_package" | sed 's/-/_/g'` + case "$ac_option" in *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; *) ac_optarg=yes ;; esac @@ -458,7 +460,7 @@ do expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` + ac_package=`echo "$ac_package" | sed 's/-/_/g'` eval "with_$ac_package=no" ;; --x) @@ -492,21 +494,21 @@ Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` eval "$ac_envvar='$ac_optarg'" - export $ac_envvar ;; + export "$ac_envvar" ;; *) # FIXME: should be removed in autoconf 3.0. echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option}" "${host_alias=$ac_option}" "${target_alias=$ac_option}" ;; esac done if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` + ac_option=--`echo "$ac_prev" | sed 's/_/-/g'` { echo "$as_me: error: missing argument to $ac_option" >&2 { (exit 1); exit 1; }; } fi @@ -514,8 +516,8 @@ fi # Be sure to have absolute paths. for ac_var in exec_prefix prefix do - eval ac_val=$`echo $ac_var` - case $ac_val in + eval ac_val=$`echo "$ac_var"` + case "$ac_val" in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; @@ -526,8 +528,8 @@ done for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \ localstatedir libdir includedir oldincludedir infodir mandir do - eval ac_val=$`echo $ac_var` - case $ac_val in + eval ac_val=$`echo "$ac_var"` + case "$ac_val" in [\\/$]* | ?:[\\/]* ) ;; *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; @@ -564,13 +566,13 @@ if test -z "$srcdir"; then ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then +if test ! -r "$srcdir/$ac_unique_file"; then if test "$ac_srcdir_defaulted" = yes; then { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } @@ -760,6 +762,7 @@ Options to Specify the Libraries Built/Used: --with-sysmouse use sysmouse (FreeBSD console) --disable-lib-suffixes disable library suffixes --disable-rpath-hack don't add rpath options for additional libraries + --disable-pkg-ldflags disable extra LDFLAGS for package-scripts Fine-Tuning Your Configuration: --with-extra-suffix=X append extra suffix to header/library paths --disable-overwrite put headers in subdir, omit link to -lcurses @@ -780,7 +783,8 @@ Fine-Tuning Your Configuration: --enable-getcap fast termcap load, no xrefs to terminfo --enable-getcap-cache cache translated termcaps in ~/.terminfo --disable-home-terminfo drop ~/.terminfo from terminfo search-path - --disable-root-environ restrict environment when running as root + --disable-root-environ restrict root use of ncurses environment variables + --disable-root-access restrict file-access when running setuid --enable-symlinks make tic use symbolic links not hard links --enable-broken_linker compile with broken-linker support code --enable-bsdpad recognize BSD-style prefix padding @@ -841,10 +845,12 @@ Experimental Code: --enable-safe-sprintf compile with experimental safe-sprintf code --disable-scroll-hints compile without scroll-hints code --enable-wgetch-events compile with wgetch-events code + --enable-exp-win32 compile with experimental-Windows driver Testing/development Options: --disable-echo do not display "compiling" commands --disable-stripping do not strip (debug info) installed executables - --enable-warnings build: turn on GCC compiler warnings + --enable-warnings test: turn on gcc compiler warnings + --enable-stdnoreturn enable C11 _Noreturn feature for diagnostics --enable-string-hacks work around bogus compiler/loader warnings --enable-assertions test: turn on generation of assertion code --with-dmalloc test: use Gray Watson's dmalloc library @@ -888,42 +894,43 @@ if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. ac_popdir=`pwd` for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue - cd $ac_subdir + cd "$ac_subdir" # A "../" for each directory in /$ac_subdir. - ac_dots=`echo $ac_subdir | + ac_dots=`echo "$ac_subdir" | sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` - case $srcdir in + case "$srcdir" in .) # No --srcdir option. We are building in place. - ac_sub_srcdir=$srcdir ;; + ac_sub_srcdir="$srcdir" ;; [\\/]* | ?:[\\/]* ) # Absolute path. - ac_sub_srcdir=$srcdir/$ac_subdir ;; + ac_sub_srcdir="$srcdir/$ac_subdir" ;; *) # Relative path. - ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;; + ac_sub_srcdir="$ac_dots$srcdir/$ac_subdir" ;; esac # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_sub_srcdir/configure.gnu; then + if test -f "$ac_sub_srcdir/configure.gnu"; then echo - $SHELL $ac_sub_srcdir/configure.gnu --help=recursive - elif test -f $ac_sub_srcdir/configure; then + $SHELL "$ac_sub_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_sub_srcdir/configure"; then echo - $SHELL $ac_sub_srcdir/configure --help=recursive - elif test -f $ac_sub_srcdir/configure.ac || - test -f $ac_sub_srcdir/configure.in; then + $SHELL "$ac_sub_srcdir/configure" --help=recursive + elif test -f "$ac_sub_srcdir/configure.ac" || + test -f "$ac_sub_srcdir/configure.in"; then echo - $ac_configure --help + "$ac_configure" --help else echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi test -n "$ac_init_help" && exit 0 -if $ac_init_version; then +if "$ac_init_version"; then cat <<\EOF +Copyright 2003-2020,2021 Thomas E. Dickey Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -937,7 +944,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52.20200111. Invocation command line was +generated by GNU Autoconf 2.52.20210509. Invocation command line was $ $0 $@ @@ -984,7 +991,7 @@ ac_configure_args= ac_sep= for ac_arg do - case $ac_arg in + case "$ac_arg" in -no-create | --no-create | --no-creat | --no-crea | --no-cre \ | --no-cr | --no-c) ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -1041,7 +1048,7 @@ trap 'exit_status=$? exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' "$ac_signal" done ac_signal=0 @@ -1061,7 +1068,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:1064: loading site script $ac_site_file" >&5 + { echo "$as_me:1071: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -1072,7 +1079,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:1075: loading cache $cache_file" >&5 + { echo "$as_me:1082: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1080,7 +1087,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:1083: creating cache $cache_file" >&5 + { echo "$as_me:1090: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1094,23 +1101,23 @@ for ac_var in `(set) 2>&1 | eval ac_new_set=\$ac_env_${ac_var}_set eval ac_old_val="\$ac_cv_env_${ac_var}_value" eval ac_new_val="\$ac_env_${ac_var}_value" - case $ac_old_set,$ac_new_set in + case "$ac_old_set,$ac_new_set" in set,) - { echo "$as_me:1099: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:1106: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:1103: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:1110: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:1109: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:1116: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:1111: former value: $ac_old_val" >&5 + { echo "$as_me:1118: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:1113: current value: $ac_new_val" >&5 + { echo "$as_me:1120: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -1118,7 +1125,7 @@ echo "$as_me: current value: $ac_new_val" >&2;} # Pass precious variables to config.status. It doesn't matter if # we pass some twice (in addition to the command line arguments). if test "$ac_new_set" = set; then - case $ac_new_val in + case "$ac_new_val" in *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ac_configure_args="$ac_configure_args '$ac_arg'" @@ -1128,35 +1135,43 @@ echo "$as_me: current value: $ac_new_val" >&2;} esac fi done -if $ac_cache_corrupted; then - { echo "$as_me:1132: error: changes in the environment can compromise the build" >&5 +if "$ac_cache_corrupted"; then + { echo "$as_me:1139: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1134: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1141: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_main_return=return +ac_main_return="return" case `echo "testing\c" 2>/dev/null; echo 1,2,3`,`echo -n testing 2>/dev/null; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C= # newlines do not sed ;-) only broken shells would use this case anyway - ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; + *c*,-n*) ECHO_N= + ECHO_C= # newlines do not sed ;-) only broken shells would use this case anyway + ECHO_T=' ' + ;; + *c*,* ) ECHO_N=-n + ECHO_C= + ECHO_T= + ;; + *) ECHO_N= + ECHO_C='\c' + ECHO_T= + ;; esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1155: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1170: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1158: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:1173: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then ac_path_separator=';' else ac_path_separator=: @@ -1168,79 +1183,159 @@ ac_config_headers="$ac_config_headers include/ncurses_cfg.h:include/ncurses_cfg. top_builddir=`pwd` -echo "$as_me:1171: checking for egrep" >&5 +for ac_prog in ggrep grep +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:1190: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$GREP"; then + ac_cv_prog_GREP="$GREP" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_GREP="$ac_prog" +echo "$as_me:1205: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +GREP=$ac_cv_prog_GREP +if test -n "$GREP"; then + echo "$as_me:1213: result: $GREP" >&5 +echo "${ECHO_T}$GREP" >&6 +else + echo "$as_me:1216: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$GREP" && break +done +test -n "$GREP" || GREP=": " + +echo "$as_me:1224: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then +if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + for ac_prog in gegrep egrep +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:1236: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $EGREP in + [\\/]* | ?:[\\/]*) + ac_cv_path_EGREP="$EGREP" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_EGREP="$ac_dir/$ac_word" + echo "$as_me:1253: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +EGREP=$ac_cv_path_EGREP + +if test -n "$EGREP"; then + echo "$as_me:1264: result: $EGREP" >&5 +echo "${ECHO_T}$EGREP" >&6 +else + echo "$as_me:1267: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo "$as_me:1181: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep - test -z "$EGREP" && { { echo "$as_me:1185: error: No egrep program found" >&5 -echo "$as_me: error: No egrep program found" >&2;} + test -n "$EGREP" && break +done +test -n "$EGREP" || EGREP=": " + + test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1275: error: cannot find workable egrep" >&5 +echo "$as_me: error: cannot find workable egrep" >&2;} { (exit 1); exit 1; }; } + fi +fi +echo "$as_me:1280: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6 + EGREP="$ac_cv_path_EGREP" -NCURSES_MAJOR="`$ac_cv_prog_egrep '^NCURSES_MAJOR[ ]*=' $srcdir/dist.mk | sed -e 's/^[^0-9]*//'`" -NCURSES_MINOR="`$ac_cv_prog_egrep '^NCURSES_MINOR[ ]*=' $srcdir/dist.mk | sed -e 's/^[^0-9]*//'`" -NCURSES_PATCH="`$ac_cv_prog_egrep '^NCURSES_PATCH[ ]*=' $srcdir/dist.mk | sed -e 's/^[^0-9]*//'`" +NCURSES_MAJOR="`${EGREP-egrep} '^NCURSES_MAJOR[ ]*=' "$srcdir/dist.mk" | sed -e 's/^[^0-9]*//'`" +NCURSES_MINOR="`${EGREP-egrep} '^NCURSES_MINOR[ ]*=' "$srcdir/dist.mk" | sed -e 's/^[^0-9]*//'`" +NCURSES_PATCH="`${EGREP-egrep} '^NCURSES_PATCH[ ]*=' "$srcdir/dist.mk" | sed -e 's/^[^0-9]*//'`" cf_cv_abi_version=${NCURSES_MAJOR} cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} cf_cv_timestamp=`date` -echo "$as_me:1195: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 +echo "$as_me:1290: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 -if test -f $srcdir/VERSION ; then - echo "$as_me:1199: checking for package version" >&5 +if test -f "$srcdir/VERSION" ; then + echo "$as_me:1294: checking for package version" >&5 echo $ECHO_N "checking for package version... $ECHO_C" >&6 # if there are not enough fields, cut returns the last one... - cf_field1=`sed -e '2,$d' $srcdir/VERSION|cut -f1` - cf_field2=`sed -e '2,$d' $srcdir/VERSION|cut -f2` - cf_field3=`sed -e '2,$d' $srcdir/VERSION|cut -f3` + cf_field1=`sed -e '2,$d' "$srcdir/VERSION" |cut -f1` + cf_field2=`sed -e '2,$d' "$srcdir/VERSION" |cut -f2` + cf_field3=`sed -e '2,$d' "$srcdir/VERSION" |cut -f3` # this is how CF_BUNDLED_INTL uses $VERSION: VERSION="$cf_field1" VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'` - test -z "$VERSION_MAJOR" && { { echo "$as_me:1211: error: missing major-version" >&5 + test -z "$VERSION_MAJOR" && { { echo "$as_me:1306: error: missing major-version" >&5 echo "$as_me: error: missing major-version" >&2;} { (exit 1); exit 1; }; } VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'` - test -z "$VERSION_MINOR" && { { echo "$as_me:1216: error: missing minor-version" >&5 + test -z "$VERSION_MINOR" && { { echo "$as_me:1311: error: missing minor-version" >&5 echo "$as_me: error: missing minor-version" >&2;} { (exit 1); exit 1; }; } - echo "$as_me:1220: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5 + echo "$as_me:1315: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5 echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6 - echo "$as_me:1223: checking for package patch date" >&5 + echo "$as_me:1318: checking for package patch date" >&5 echo $ECHO_N "checking for package patch date... $ECHO_C" >&6 VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'` case .$VERSION_PATCH in (.) - { { echo "$as_me:1228: error: missing patch-date $VERSION_PATCH" >&5 + { { echo "$as_me:1323: error: missing patch-date $VERSION_PATCH" >&5 echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;} { (exit 1); exit 1; }; } ;; (.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]) ;; (*) - { { echo "$as_me:1235: error: illegal patch-date $VERSION_PATCH" >&5 + { { echo "$as_me:1330: error: illegal patch-date $VERSION_PATCH" >&5 echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;} { (exit 1); exit 1; }; } ;; esac - echo "$as_me:1240: result: $VERSION_PATCH" >&5 + echo "$as_me:1335: result: $VERSION_PATCH" >&5 echo "${ECHO_T}$VERSION_PATCH" >&6 else - { { echo "$as_me:1243: error: did not find $srcdir/VERSION" >&5 + { { echo "$as_me:1338: error: did not find $srcdir/VERSION" >&5 echo "$as_me: error: did not find $srcdir/VERSION" >&2;} { (exit 1); exit 1; }; } fi @@ -1248,19 +1343,19 @@ fi # show the actual data that we have for versions: test -n "$verbose" && echo " ABI VERSION $VERSION" 1>&6 -echo "${as_me:-configure}:1251: testing ABI VERSION $VERSION ..." 1>&5 +echo "${as_me:-configure}:1346: testing ABI VERSION $VERSION ..." 1>&5 test -n "$verbose" && echo " VERSION_MAJOR $VERSION_MAJOR" 1>&6 -echo "${as_me:-configure}:1255: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5 +echo "${as_me:-configure}:1350: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5 test -n "$verbose" && echo " VERSION_MINOR $VERSION_MINOR" 1>&6 -echo "${as_me:-configure}:1259: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5 +echo "${as_me:-configure}:1354: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5 test -n "$verbose" && echo " VERSION_PATCH $VERSION_PATCH" 1>&6 -echo "${as_me:-configure}:1263: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5 +echo "${as_me:-configure}:1358: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5 cf_PACKAGE=NCURSES PACKAGE=ncurses @@ -1284,7 +1379,7 @@ test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0 # Check whether --with-rel-version or --without-rel-version was given. if test "${with_rel_version+set}" = set; then withval="$with_rel_version" - { echo "$as_me:1287: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 + { echo "$as_me:1382: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;} cf_cv_rel_version=$withval fi; @@ -1297,13 +1392,13 @@ if test -n "$NCURSES_MAJOR" ; then ([0-9]*) ;; (*) - { { echo "$as_me:1300: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 + { { echo "$as_me:1395: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;} { (exit 1); exit 1; }; } ;; esac else - { { echo "$as_me:1306: error: Release major-version value is empty" >&5 + { { echo "$as_me:1401: error: Release major-version value is empty" >&5 echo "$as_me: error: Release major-version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -1313,13 +1408,13 @@ if test -n "$NCURSES_MINOR" ; then ([0-9]*) ;; (*) - { { echo "$as_me:1316: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 + { { echo "$as_me:1411: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;} { (exit 1); exit 1; }; } ;; esac else - { { echo "$as_me:1322: error: Release minor-version value is empty" >&5 + { { echo "$as_me:1417: error: Release minor-version value is empty" >&5 echo "$as_me: error: Release minor-version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -1332,9 +1427,9 @@ if test "${with_abi_version+set}" = set; then if test "x$cf_cv_abi_version" != "x$withval" then - { echo "$as_me:1335: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 + { echo "$as_me:1430: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;} - case $cf_cv_rel_version in + case "$cf_cv_rel_version" in (5.*) cf_cv_rel_version=$withval.0 ;; @@ -1351,20 +1446,20 @@ if test -n "$cf_cv_abi_version" ; then ([0-9]*) ;; (*) - { { echo "$as_me:1354: error: ABI version is not a number: $cf_cv_abi_version" >&5 + { { echo "$as_me:1449: error: ABI version is not a number: $cf_cv_abi_version" >&5 echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;} { (exit 1); exit 1; }; } ;; esac else - { { echo "$as_me:1360: error: ABI version value is empty" >&5 + { { echo "$as_me:1455: error: ABI version value is empty" >&5 echo "$as_me: error: ABI version value is empty" >&2;} { (exit 1); exit 1; }; } fi if test "x$cf_cv_abi_version" != "x$with_abi_version" then - case $cf_cv_rel_version in + case "$cf_cv_rel_version" in (5.*) cf_cv_rel_version=$with_abi_version.0 ;; @@ -1373,22 +1468,22 @@ fi ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then + if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f $ac_dir/install.sh; then + elif test -f "$ac_dir/install.sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then + elif test -f "$ac_dir/shtool"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1391: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1486: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1398,11 +1493,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1401: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1496: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1405: checking build system type" >&5 +echo "$as_me:1500: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1411,23 +1506,23 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1414: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1509: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:1418: error: $ac_config_sub $ac_cv_build_alias failed." >&5 +ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` || + { { echo "$as_me:1513: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1423: result: $ac_cv_build" >&5 +echo "$as_me:1518: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$as_me:1430: checking host system type" >&5 +echo "$as_me:1525: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1435,21 +1530,21 @@ else ac_cv_host_alias=$host_alias test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:1439: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` || + { { echo "$as_me:1534: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1444: result: $ac_cv_host" >&5 +echo "$as_me:1539: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then - echo "$as_me:1452: checking target system type" >&5 +if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then + echo "$as_me:1547: checking target system type" >&5 echo $ECHO_N "checking target system type... $ECHO_C" >&6 if test "${ac_cv_target+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1457,18 +1552,18 @@ else ac_cv_target_alias=$target_alias test "x$ac_cv_target_alias" = "x" && ac_cv_target_alias=$ac_cv_host_alias -ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || - { { echo "$as_me:1461: error: $ac_config_sub $ac_cv_target_alias failed" >&5 +ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` || + { { echo "$as_me:1556: error: $ac_config_sub $ac_cv_target_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1466: result: $ac_cv_target" >&5 +echo "$as_me:1561: result: $ac_cv_target" >&5 echo "${ECHO_T}$ac_cv_target" >&6 target=$ac_cv_target -target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` # The aliases save the names the user supplied, while $host etc. # will get canonicalized. @@ -1495,13 +1590,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1498: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1593: result: Configuring for $cf_cv_system_name" >&5 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$as_me:1502: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1597: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 - { { echo "$as_me:1504: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1599: error: \"Please remove config.cache and try again.\"" >&5 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} { (exit 1); exit 1; }; } fi @@ -1509,7 +1604,7 @@ fi # Check whether --with-system-type or --without-system-type was given. if test "${with_system_type+set}" = set; then withval="$with_system_type" - { echo "$as_me:1512: WARNING: overriding system type to $withval" >&5 + { echo "$as_me:1607: WARNING: overriding system type to $withval" >&5 echo "$as_me: WARNING: overriding system type to $withval" >&2;} cf_cv_system_name=$withval host_os=$withval @@ -1520,8 +1615,67 @@ fi; cf_user_CFLAGS="$CFLAGS" ### Default install-location +echo "$as_me:1618: checking for fgrep" >&5 +echo $ECHO_N "checking for fgrep... $ECHO_C" >&6 +if test "${ac_cv_path_FGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + for ac_prog in gfgrep fgrep +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:1630: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_FGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $FGREP in + [\\/]* | ?:[\\/]*) + ac_cv_path_FGREP="$FGREP" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_FGREP="$ac_dir/$ac_word" + echo "$as_me:1647: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +FGREP=$ac_cv_path_FGREP -echo "$as_me:1524: checking for prefix" >&5 +if test -n "$FGREP"; then + echo "$as_me:1658: result: $FGREP" >&5 +echo "${ECHO_T}$FGREP" >&6 +else + echo "$as_me:1661: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$FGREP" && break +done +test -n "$FGREP" || FGREP=": " + + test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1669: error: cannot find workable fgrep" >&5 +echo "$as_me: error: cannot find workable fgrep" >&2;} + { (exit 1); exit 1; }; } + fi +fi +echo "$as_me:1674: result: $ac_cv_path_FGREP" >&5 +echo "${ECHO_T}$ac_cv_path_FGREP" >&6 + FGREP="$ac_cv_path_FGREP" + +echo "$as_me:1678: checking for prefix" >&5 echo $ECHO_N "checking for prefix... $ECHO_C" >&6 if test "x$prefix" = "xNONE" ; then case "$cf_cv_system_name" in @@ -1533,34 +1687,34 @@ if test "x$prefix" = "xNONE" ; then ;; esac fi -echo "$as_me:1536: result: $prefix" >&5 +echo "$as_me:1690: result: $prefix" >&5 echo "${ECHO_T}$prefix" >&6 if test "x$prefix" = "xNONE" ; then -echo "$as_me:1540: checking for default include-directory" >&5 +echo "$as_me:1694: checking for default include-directory" >&5 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 test -n "$verbose" && echo 1>&6 for cf_symbol in \ - $includedir \ - $includedir/ncurses \ - $prefix/include \ - $prefix/include/ncurses \ + "$includedir" \ + "$includedir/ncurses" \ + "$prefix/include" \ + "$prefix/include/ncurses" \ /usr/local/include \ /usr/local/include/ncurses \ /usr/include \ /usr/include/ncurses do - cf_dir=`eval echo $cf_symbol` - if test -f $cf_dir/curses.h ; then - if ( fgrep NCURSES_VERSION $cf_dir/curses.h 2>&1 >/dev/null ) ; then + cf_dir=`eval echo "$cf_symbol"` + if test -f "$cf_dir/curses.h" ; then + if ( ${FGREP-fgrep} NCURSES_VERSION "$cf_dir/curses.h" >/dev/null 2>&1 ) ; then includedir="$cf_symbol" - test -n "$verbose" && echo $ac_n " found " 1>&6 + test -n "$verbose" && echo $ECHO_N " found " 1>&6 break fi fi test -n "$verbose" && echo " tested $cf_dir" 1>&6 done -echo "$as_me:1563: result: $includedir" >&5 +echo "$as_me:1717: result: $includedir" >&5 echo "${ECHO_T}$includedir" >&6 fi @@ -1614,16 +1768,16 @@ fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_main_return=return +ac_main_return="return" if test -n "$ac_tool_prefix"; then for ac_prog in $cf_prog_cc do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1626: checking for $ac_word" >&5 +echo "$as_me:1780: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1638,7 +1792,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1641: found $ac_dir/$ac_word" >&5 +echo "$as_me:1795: found $ac_dir/$ac_word" >&5 break done @@ -1646,10 +1800,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1649: result: $CC" >&5 + echo "$as_me:1803: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1652: result: no" >&5 + echo "$as_me:1806: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1662,7 +1816,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1665: checking for $ac_word" >&5 +echo "$as_me:1819: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1677,7 +1831,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1680: found $ac_dir/$ac_word" >&5 +echo "$as_me:1834: found $ac_dir/$ac_word" >&5 break done @@ -1685,10 +1839,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1688: result: $ac_ct_CC" >&5 + echo "$as_me:1842: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1691: result: no" >&5 + echo "$as_me:1845: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1698,32 +1852,32 @@ done CC=$ac_ct_CC fi -test -z "$CC" && { { echo "$as_me:1701: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1855: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1706:" \ +echo "$as_me:1860:" \ "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1709: \"$ac_compiler --version &5\"") >&5 +ac_compiler=`set X $ac_compile; echo "$2"` +{ (eval echo "$as_me:1863: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1712: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:1714: \"$ac_compiler -v &5\"") >&5 + echo "$as_me:1866: \$? = $ac_status" >&5 + (exit "$ac_status"); } +{ (eval echo "$as_me:1868: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1717: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:1719: \"$ac_compiler -V &5\"") >&5 + echo "$as_me:1871: \$? = $ac_status" >&5 + (exit "$ac_status"); } +{ (eval echo "$as_me:1873: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1722: \$? = $ac_status" >&5 - (exit $ac_status); } + echo "$as_me:1876: \$? = $ac_status" >&5 + (exit "$ac_status"); } -cat >conftest.$ac_ext <<_ACEOF -#line 1726 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 1880 "configure" #include "confdefs.h" int @@ -1739,14 +1893,14 @@ ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1742: checking for C compiler default output" >&5 +echo "$as_me:1896: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1745: \"$ac_link_default\"") >&5 +ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'` +if { (eval echo "$as_me:1899: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1748: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:1902: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last # resort. @@ -1767,35 +1921,35 @@ for ac_file in `ls a.exe conftest.exe 2>/dev/null; done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1771: error: C compiler cannot create executables" >&5 +cat "conftest.$ac_ext" >&5 +{ { echo "$as_me:1925: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1777: result: $ac_file" >&5 +echo "$as_me:1931: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1782: checking whether the C compiler works" >&5 +echo "$as_me:1936: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1788: \"$ac_try\"") >&5 + { (eval echo "$as_me:1942: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1791: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:1945: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1798: error: cannot run C compiled programs. + { { echo "$as_me:1952: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1803,25 +1957,25 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1806: result: yes" >&5 +echo "$as_me:1960: result: yes" >&5 echo "${ECHO_T}yes" >&6 -rm -f a.out a.exe conftest$ac_cv_exeext +rm -f a.out a.exe "conftest$ac_cv_exeext" ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1813: checking whether we are cross compiling" >&5 +echo "$as_me:1967: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1815: result: $cross_compiling" >&5 +echo "$as_me:1969: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1818: checking for executable suffix" >&5 +echo "$as_me:1972: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1820: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1974: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1823: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:1977: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -1836,25 +1990,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1839: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1993: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi -rm -f conftest$ac_cv_exeext -echo "$as_me:1845: result: $ac_cv_exeext" >&5 +rm -f "conftest$ac_cv_exeext" +echo "$as_me:1999: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 -rm -f conftest.$ac_ext +rm -f "conftest.$ac_ext" EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1851: checking for object suffix" >&5 +echo "$as_me:2005: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 1857 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2011 "configure" #include "confdefs.h" int @@ -1866,11 +2020,11 @@ main (void) } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1869: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2023: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1872: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:2026: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.map | *.inf ) ;; @@ -1880,25 +2034,25 @@ if { (eval echo "$as_me:1869: \"$ac_compile\"") >&5 done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1884: error: cannot compute OBJEXT: cannot compile" >&5 +cat "conftest.$ac_ext" >&5 +{ { echo "$as_me:2038: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext +rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext" fi -echo "$as_me:1891: result: $ac_cv_objext" >&5 +echo "$as_me:2045: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1895: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:2049: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 1901 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2055 "configure" #include "confdefs.h" int @@ -1912,41 +2066,41 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1916: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2070: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1919: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1922: \"$ac_try\"") >&5 + echo "$as_me:2073: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2076: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1925: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:2079: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1937: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:2091: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1943: checking whether $CC accepts -g" >&5 +echo "$as_me:2097: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 1949 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2103 "configure" #include "confdefs.h" int @@ -1957,27 +2111,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1961: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2115: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1964: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1967: \"$ac_try\"") >&5 + echo "$as_me:2118: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2121: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1970: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:2124: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_prog_cc_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:1980: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:2134: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1998,23 +2152,23 @@ fi # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide # the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF +cat >"conftest.$ac_ext" <<_ACEOF #ifndef __cplusplus choke me #endif _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2007: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2161: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2010: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2013: \"$ac_try\"") >&5 + echo "$as_me:2164: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2167: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2016: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:2170: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then for ac_declaration in \ ''\ '#include ' \ @@ -2024,8 +2178,8 @@ if { (eval echo "$as_me:2007: \"$ac_compile\"") >&5 'extern "C" void exit (int);' \ 'void exit (int);' do - cat >conftest.$ac_ext <<_ACEOF -#line 2028 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2182 "configure" #include "confdefs.h" #include $ac_declaration @@ -2037,27 +2191,27 @@ exit (42); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2041: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2195: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2044: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2047: \"$ac_try\"") >&5 + echo "$as_me:2198: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2201: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2050: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:2204: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 continue fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 2060 "configure" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2214 "configure" #include "confdefs.h" $ac_declaration int @@ -2068,65 +2222,65 @@ exit (42); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2072: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2226: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2075: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2078: \"$ac_try\"") >&5 + echo "$as_me:2229: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2232: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2081: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:2235: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done rm -rf conftest* if test -n "$ac_declaration"; then echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h + echo "$ac_declaration" >>confdefs.h echo '#endif' >>confdefs.h fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" ac_ext=c ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_main_return=return +ac_main_return="return" GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:2111: checking version of $CC" >&5 + echo "$as_me:2265: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:2115: result: $GCC_VERSION" >&5 + echo "$as_me:2269: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi INTEL_COMPILER=no if test "$GCC" = yes ; then - case $host_os in + case "$host_os" in (linux*|gnu*) - echo "$as_me:2124: checking if this is really Intel C compiler" >&5 + echo "$as_me:2278: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" - cat >conftest.$ac_ext <<_ACEOF -#line 2129 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2283 "configure" #include "confdefs.h" int @@ -2142,28 +2296,28 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2146: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2300: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2149: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2152: \"$ac_try\"") >&5 + echo "$as_me:2303: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2306: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2155: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:2309: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:2166: result: $INTEL_COMPILER" >&5 + echo "$as_me:2320: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -2172,12 +2326,11 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:2175: checking if this is really Clang C compiler" >&5 + echo "$as_me:2329: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Qunused-arguments" - cat >conftest.$ac_ext <<_ACEOF -#line 2180 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2333 "configure" #include "confdefs.h" int @@ -2193,40 +2346,116 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2197: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2350: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2200: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2203: \"$ac_try\"") >&5 + echo "$as_me:2353: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2356: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2206: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:2359: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then CLANG_COMPILER=yes -cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:2217: result: $CLANG_COMPILER" >&5 + echo "$as_me:2369: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi -echo "$as_me:2221: checking for $CC option to accept ANSI C" >&5 +CLANG_VERSION=none + +if test "x$CLANG_COMPILER" = "xyes" ; then + case "$CC" in + (c[1-9][0-9]|*/c[1-9][0-9]) + { echo "$as_me:2378: WARNING: replacing broken compiler alias $CC" >&5 +echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;} + CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" + CC=clang + ;; + esac + + echo "$as_me:2385: checking version of $CC" >&5 +echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 + CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + test -z "$CLANG_VERSION" && CLANG_VERSION=unknown + echo "$as_me:2389: result: $CLANG_VERSION" >&5 +echo "${ECHO_T}$CLANG_VERSION" >&6 + + for cf_clang_opt in \ + -Qunused-arguments \ + -Wno-error=implicit-function-declaration + do + echo "$as_me:2396: checking if option $cf_clang_opt works" >&5 +echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cf_clang_opt" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2401 "configure" +#include "confdefs.h" + + #include +int +main (void) +{ + + printf("hello!\\n"); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:2415: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:2418: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:2421: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2424: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_clang_optok=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + cf_clang_optok=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:2435: result: $cf_clang_optok" >&5 +echo "${ECHO_T}$cf_clang_optok" >&6 + CFLAGS="$cf_save_CFLAGS" + if test "$cf_clang_optok" = yes; then + test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 + +echo "${as_me:-configure}:2441: testing adding option $cf_clang_opt ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_clang_opt" + + fi + done +fi + +echo "$as_me:2450: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_prog_cc_stdc=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -#line 2229 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 2458 "configure" #include "confdefs.h" #include #include @@ -2274,51 +2503,51 @@ _ACEOF for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:2278: \"$ac_compile\"") >&5 + rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2507: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2281: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2284: \"$ac_try\"") >&5 + echo "$as_me:2510: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2513: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2287: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:2516: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_prog_cc_stdc=$ac_arg break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext +rm -f "conftest.$ac_objext" done -rm -f conftest.$ac_ext conftest.$ac_objext +rm -f "conftest.$ac_ext" "conftest.$ac_objext" CC=$ac_save_CC fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2304: result: none needed" >&5 + echo "$as_me:2533: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2307: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2536: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac # This should have been defined by AC_PROG_CC -: ${CC:=cc} +: "${CC:=cc}" -echo "$as_me:2315: checking \$CFLAGS variable" >&5 +echo "$as_me:2544: checking \$CFLAGS variable" >&5 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 case "x$CFLAGS" in (*-[IUD]*) - echo "$as_me:2319: result: broken" >&5 + echo "$as_me:2548: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2321: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 + { echo "$as_me:2550: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} cf_flags="$CFLAGS" CFLAGS= @@ -2332,19 +2561,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_arg do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -2363,7 +2592,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -2393,7 +2622,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -2426,18 +2655,18 @@ fi done ;; (*) - echo "$as_me:2429: result: ok" >&5 + echo "$as_me:2658: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2434: checking \$CC variable" >&5 +echo "$as_me:2663: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in (*[\ \ ]-*) - echo "$as_me:2438: result: broken" >&5 + echo "$as_me:2667: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2440: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2669: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` @@ -2455,19 +2684,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_arg do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -2486,7 +2715,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -2516,7 +2745,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -2554,30 +2783,30 @@ fi done test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 -echo "${as_me:-configure}:2557: testing resulting CC: '$CC' ..." 1>&5 +echo "${as_me:-configure}:2786: testing resulting CC: '$CC' ..." 1>&5 test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 -echo "${as_me:-configure}:2561: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2790: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 -echo "${as_me:-configure}:2565: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2794: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; (*) - echo "$as_me:2569: result: ok" >&5 + echo "$as_me:2798: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac ac_ext=c ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_main_return=return -echo "$as_me:2580: checking how to run the C preprocessor" >&5 +ac_main_return="return" +echo "$as_me:2809: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2597,20 +2826,20 @@ do # with a fresh cross-compiler works. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line 2601 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2830 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2606: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:2835: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2612: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:2841: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -2623,27 +2852,27 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line 2635 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2864 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2639: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:2868: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2645: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:2874: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -2657,16 +2886,16 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 # Passes both tests. ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then break fi @@ -2679,7 +2908,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2682: result: $CPP" >&5 +echo "$as_me:2911: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2688,20 +2917,20 @@ do # with a fresh cross-compiler works. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line 2692 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2921 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2697: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:2926: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2703: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:2932: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -2714,27 +2943,27 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line 2726 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2955 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2730: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:2959: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2736: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:2965: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -2748,46 +2977,46 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 # Passes both tests. ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then : else - { { echo "$as_me:2764: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2993: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_main_return=return +ac_main_return="return" if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:2777: checking whether $CC needs -traditional" >&5 + echo "$as_me:3006: checking whether $CC needs -traditional" >&5 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 if test "${ac_cv_prog_gcc_traditional+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_pattern="Autoconf.*'x'" - cat >conftest.$ac_ext <<_ACEOF -#line 2784 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 3013 "configure" #include "confdefs.h" #include int Autoconf = TIOCGETP; _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then + $EGREP "$ac_pattern" >/dev/null 2>&1; then ac_cv_prog_gcc_traditional=yes else ac_cv_prog_gcc_traditional=no @@ -2795,28 +3024,28 @@ fi rm -rf conftest* if test $ac_cv_prog_gcc_traditional = no; then - cat >conftest.$ac_ext <<_ACEOF -#line 2799 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 3028 "configure" #include "confdefs.h" #include int Autoconf = TCGETA; _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then + $EGREP "$ac_pattern" >/dev/null 2>&1; then ac_cv_prog_gcc_traditional=yes fi rm -rf conftest* fi fi -echo "$as_me:2812: result: $ac_cv_prog_gcc_traditional" >&5 +echo "$as_me:3041: result: $ac_cv_prog_gcc_traditional" >&5 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi fi -echo "$as_me:2819: checking whether $CC understands -c and -o together" >&5 +echo "$as_me:3048: checking whether $CC understands -c and -o together" >&5 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6 if test "${cf_cv_prog_CC_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2831,29 +3060,29 @@ CF_EOF # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:2834: \"$ac_try\"") >&5 +if { (eval echo "$as_me:3063: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2837: \$? = $ac_status" >&5 - (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:2839: \"$ac_try\"") >&5 + echo "$as_me:3066: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + test -f conftest2.$ac_objext && { (eval echo "$as_me:3068: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2842: \$? = $ac_status" >&5 - (exit $ac_status); }; + echo "$as_me:3071: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then eval cf_cv_prog_CC_c_o=yes else eval cf_cv_prog_CC_c_o=no fi -rm -rf conftest* +rm -rf ./conftest* fi -if test $cf_cv_prog_CC_c_o = yes; then - echo "$as_me:2853: result: yes" >&5 +if test "$cf_cv_prog_CC_c_o" = yes; then + echo "$as_me:3082: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2856: result: no" >&5 + echo "$as_me:3085: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2867,7 +3096,7 @@ else (*) LDPATH=$PATH:/sbin:/usr/sbin # Extract the first word of "ldconfig", so it can be a program name with args. set dummy ldconfig; ac_word=$2 -echo "$as_me:2870: checking for $ac_word" >&5 +echo "$as_me:3099: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_LDCONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2884,7 +3113,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_LDCONFIG="$ac_dir/$ac_word" - echo "$as_me:2887: found $ac_dir/$ac_word" >&5 + echo "$as_me:3116: found $ac_dir/$ac_word" >&5 break fi done @@ -2895,10 +3124,10 @@ fi LDCONFIG=$ac_cv_path_LDCONFIG if test -n "$LDCONFIG"; then - echo "$as_me:2898: result: $LDCONFIG" >&5 + echo "$as_me:3127: result: $LDCONFIG" >&5 echo "${ECHO_T}$LDCONFIG" >&6 else - echo "$as_me:2901: result: no" >&5 + echo "$as_me:3130: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2906,7 +3135,7 @@ fi esac fi -echo "$as_me:2909: checking if you want to ensure bool is consistent with C++" >&5 +echo "$as_me:3138: checking if you want to ensure bool is consistent with C++" >&5 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6 # Check whether --with-cxx or --without-cxx was given. @@ -2916,7 +3145,7 @@ if test "${with_cxx+set}" = set; then else cf_with_cxx=yes fi; -echo "$as_me:2919: result: $cf_with_cxx" >&5 +echo "$as_me:3148: result: $cf_with_cxx" >&5 echo "${ECHO_T}$cf_with_cxx" >&6 if test "X$cf_with_cxx" = Xno ; then CXX="" @@ -2925,16 +3154,16 @@ else # with autoconf 2.13, we can change the error to a warning: ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_main_return=return +ac_main_return="return" if test -n "$ac_tool_prefix"; then for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:2937: checking for $ac_word" >&5 +echo "$as_me:3166: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2949,7 +3178,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" -echo "$as_me:2952: found $ac_dir/$ac_word" >&5 +echo "$as_me:3181: found $ac_dir/$ac_word" >&5 break done @@ -2957,10 +3186,10 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:2960: result: $CXX" >&5 + echo "$as_me:3189: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:2963: result: no" >&5 + echo "$as_me:3192: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2973,7 +3202,7 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2976: checking for $ac_word" >&5 +echo "$as_me:3205: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2988,7 +3217,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CXX="$ac_prog" -echo "$as_me:2991: found $ac_dir/$ac_word" >&5 +echo "$as_me:3220: found $ac_dir/$ac_word" >&5 break done @@ -2996,10 +3225,10 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:2999: result: $ac_ct_CXX" >&5 + echo "$as_me:3228: result: $ac_ct_CXX" >&5 echo "${ECHO_T}$ac_ct_CXX" >&6 else - echo "$as_me:3002: result: no" >&5 + echo "$as_me:3231: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3011,32 +3240,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++" fi # Provide some information about the compiler. -echo "$as_me:3014:" \ +echo "$as_me:3243:" \ "checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:3017: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:3246: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:3020: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:3022: \"$ac_compiler -v &5\"") >&5 + echo "$as_me:3249: \$? = $ac_status" >&5 + (exit "$ac_status"); } +{ (eval echo "$as_me:3251: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:3025: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:3027: \"$ac_compiler -V &5\"") >&5 + echo "$as_me:3254: \$? = $ac_status" >&5 + (exit "$ac_status"); } +{ (eval echo "$as_me:3256: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:3030: \$? = $ac_status" >&5 - (exit $ac_status); } + echo "$as_me:3259: \$? = $ac_status" >&5 + (exit "$ac_status"); } -echo "$as_me:3033: checking whether we are using the GNU C++ compiler" >&5 +echo "$as_me:3262: checking whether we are using the GNU C++ compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 3039 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 3268 "configure" #include "confdefs.h" int @@ -3050,41 +3279,41 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3054: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:3283: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3057: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3060: \"$ac_try\"") >&5 + echo "$as_me:3286: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:3289: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3063: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:3292: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:3075: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "$as_me:3304: result: $ac_cv_cxx_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS CXXFLAGS="-g" -echo "$as_me:3081: checking whether $CXX accepts -g" >&5 +echo "$as_me:3310: checking whether $CXX accepts -g" >&5 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 3087 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 3316 "configure" #include "confdefs.h" int @@ -3095,27 +3324,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3099: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:3328: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3102: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3105: \"$ac_try\"") >&5 + echo "$as_me:3331: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:3334: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3108: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:3337: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_prog_cxx_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:3118: result: $ac_cv_prog_cxx_g" >&5 +echo "$as_me:3347: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS @@ -3141,8 +3370,8 @@ for ac_declaration in \ 'extern "C" void exit (int);' \ 'void exit (int);' do - cat >conftest.$ac_ext <<_ACEOF -#line 3145 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 3374 "configure" #include "confdefs.h" #include $ac_declaration @@ -3154,27 +3383,27 @@ exit (42); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3158: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:3387: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3161: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3164: \"$ac_try\"") >&5 + echo "$as_me:3390: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:3393: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3167: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:3396: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 continue fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 3177 "configure" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +#line 3406 "configure" #include "confdefs.h" $ac_declaration int @@ -3185,59 +3414,59 @@ exit (42); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3189: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:3418: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3192: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3195: \"$ac_try\"") >&5 + echo "$as_me:3421: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:3424: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3198: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:3427: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done rm -rf conftest* if test -n "$ac_declaration"; then echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h + echo "$ac_declaration" >>confdefs.h echo '#endif' >>confdefs.h fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_main_return=return +ac_main_return="return" ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_main_return=return +ac_main_return="return" if test "x$cf_with_cxx" != xno then # Several of the C++ configurations do not work, particularly when # cross-compiling (20140913 -TD) - echo "$as_me:3232: checking if $CXX works" >&5 + echo "$as_me:3461: checking if $CXX works" >&5 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6 save_CPPFLAGS="$CPPFLAGS" eval cf_includedir=${includedir} CPPFLAGS="$CPPFLAGS -I${cf_includedir}" -cat >conftest.$ac_ext <<_ACEOF -#line 3240 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 3469 "configure" #include "confdefs.h" #include @@ -3253,48 +3482,48 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3257: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:3486: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3260: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3263: \"$ac_try\"") >&5 + echo "$as_me:3489: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:3492: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3266: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:3495: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cxx_works=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cxx_works=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$save_CPPFLAGS" - echo "$as_me:3277: result: $cf_cxx_works" >&5 + echo "$as_me:3506: result: $cf_cxx_works" >&5 echo "${ECHO_T}$cf_cxx_works" >&6 if test "x$cf_cxx_works" = xno then - { echo "$as_me:3281: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5 + { echo "$as_me:3510: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5 echo "$as_me: WARNING: Ignore $CXX, since it cannot compile hello-world." >&2;} cf_with_cxx=no; CXX=""; GXX=""; fi fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_main_return=return +ac_main_return="return" # autoconf 2.5x removed the error (hardcoding it to g++, or just blank) if test "$CXX" = "g++" ; then # Extract the first word of "g++", so it can be a program name with args. set dummy g++; ac_word=$2 -echo "$as_me:3297: checking for $ac_word" >&5 +echo "$as_me:3526: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3311,7 +3540,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_CXX="$ac_dir/$ac_word" - echo "$as_me:3314: found $ac_dir/$ac_word" >&5 + echo "$as_me:3543: found $ac_dir/$ac_word" >&5 break fi done @@ -3322,17 +3551,17 @@ fi CXX=$ac_cv_path_CXX if test -n "$CXX"; then - echo "$as_me:3325: result: $CXX" >&5 + echo "$as_me:3554: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:3328: result: no" >&5 + echo "$as_me:3557: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi case "x$CXX" in (x|xg++) - { echo "$as_me:3335: WARNING: You don't have any C++ compiler, too bad" >&5 + { echo "$as_me:3564: WARNING: You don't have any C++ compiler, too bad" >&5 echo "$as_me: WARNING: You don't have any C++ compiler, too bad" >&2;} cf_with_cxx=no; CXX=""; GXX=""; ;; @@ -3341,7 +3570,7 @@ fi GXX_VERSION=none if test "$GXX" = yes; then - echo "$as_me:3344: checking version of ${CXX:-g++}" >&5 + echo "$as_me:3573: checking version of ${CXX:-g++}" >&5 echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6 GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" if test -z "$GXX_VERSION" @@ -3349,20 +3578,20 @@ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6 GXX_VERSION=unknown GXX=no fi - echo "$as_me:3352: result: $GXX_VERSION" >&5 + echo "$as_me:3581: result: $GXX_VERSION" >&5 echo "${ECHO_T}$GXX_VERSION" >&6 fi -case $GXX_VERSION in -(1*|2.[0-6]*) - # GXX=""; CXX=""; ac_cv_prog_gxx=no - # cf_cxx_library=no - { echo "$as_me:3360: WARNING: templates do not work" >&5 +case "$GXX_VERSION" in +([1-9][0-9].*) + ;; +(1.*|2.[0-6]*) + { echo "$as_me:3589: WARNING: templates do not work" >&5 echo "$as_me: WARNING: templates do not work" >&2;} ;; esac -echo "$as_me:3365: checking if you want to build C++ binding and demo" >&5 +echo "$as_me:3594: checking if you want to build C++ binding and demo" >&5 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6 # Check whether --with-cxx-binding or --without-cxx-binding was given. @@ -3372,15 +3601,15 @@ if test "${with_cxx_binding+set}" = set; then else cf_with_cxx_binding=$cf_with_cxx fi; -echo "$as_me:3375: result: $cf_with_cxx_binding" >&5 +echo "$as_me:3604: result: $cf_with_cxx_binding" >&5 echo "${ECHO_T}$cf_with_cxx_binding" >&6 -echo "$as_me:3378: checking if you want to build with Ada" >&5 +echo "$as_me:3607: checking if you want to build with Ada" >&5 echo $ECHO_N "checking if you want to build with Ada... $ECHO_C" >&6 -echo "$as_me:3380: result: $cf_with_ada" >&5 +echo "$as_me:3609: result: $cf_with_ada" >&5 echo "${ECHO_T}$cf_with_ada" >&6 -echo "$as_me:3383: checking if you want to install terminal database" >&5 +echo "$as_me:3612: checking if you want to install terminal database" >&5 echo $ECHO_N "checking if you want to install terminal database... $ECHO_C" >&6 # Check whether --enable-db-install or --disable-db-install was given. @@ -3390,10 +3619,10 @@ if test "${enable_db_install+set}" = set; then else cf_with_db_install=yes fi; -echo "$as_me:3393: result: $cf_with_db_install" >&5 +echo "$as_me:3622: result: $cf_with_db_install" >&5 echo "${ECHO_T}$cf_with_db_install" >&6 -echo "$as_me:3396: checking if you want to install manpages" >&5 +echo "$as_me:3625: checking if you want to install manpages" >&5 echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6 # Check whether --with-manpages or --without-manpages was given. @@ -3403,10 +3632,10 @@ if test "${with_manpages+set}" = set; then else cf_with_manpages=yes fi; -echo "$as_me:3406: result: $cf_with_manpages" >&5 +echo "$as_me:3635: result: $cf_with_manpages" >&5 echo "${ECHO_T}$cf_with_manpages" >&6 -echo "$as_me:3409: checking if you want to build programs such as tic" >&5 +echo "$as_me:3638: checking if you want to build programs such as tic" >&5 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6 # Check whether --with-progs or --without-progs was given. @@ -3416,18 +3645,18 @@ if test "${with_progs+set}" = set; then else cf_with_progs=yes fi; -echo "$as_me:3419: result: $cf_with_progs" >&5 +echo "$as_me:3648: result: $cf_with_progs" >&5 echo "${ECHO_T}$cf_with_progs" >&6 -if test -f $srcdir/tack/tack.h; then +if test -f "$srcdir/tack/tack.h" ; then if test "x$cross_compiling" = xyes ; then test -n "$verbose" && echo " ignoring tack because we are cross-compiling" 1>&6 -echo "${as_me:-configure}:3426: testing ignoring tack because we are cross-compiling ..." 1>&5 +echo "${as_me:-configure}:3655: testing ignoring tack because we are cross-compiling ..." 1>&5 cf_with_tack=no else - echo "$as_me:3430: checking if you want to build the tack program" >&5 + echo "$as_me:3659: checking if you want to build the tack program" >&5 echo $ECHO_N "checking if you want to build the tack program... $ECHO_C" >&6 # Check whether --with-tack or --without-tack was given. @@ -3437,14 +3666,14 @@ if test "${with_tack+set}" = set; then else cf_with_tack=$cf_with_progs fi; - echo "$as_me:3440: result: $cf_with_tack" >&5 + echo "$as_me:3669: result: $cf_with_tack" >&5 echo "${ECHO_T}$cf_with_tack" >&6 fi else cf_with_tack=no fi -echo "$as_me:3447: checking if you want to build test-programs" >&5 +echo "$as_me:3676: checking if you want to build test-programs" >&5 echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6 # Check whether --with-tests or --without-tests was given. @@ -3454,10 +3683,10 @@ if test "${with_tests+set}" = set; then else cf_with_tests=yes fi; -echo "$as_me:3457: result: $cf_with_tests" >&5 +echo "$as_me:3686: result: $cf_with_tests" >&5 echo "${ECHO_T}$cf_with_tests" >&6 -echo "$as_me:3460: checking if you wish to install curses.h" >&5 +echo "$as_me:3689: checking if you wish to install curses.h" >&5 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6 # Check whether --with-curses-h or --without-curses-h was given. @@ -3467,7 +3696,7 @@ if test "${with_curses_h+set}" = set; then else with_curses_h=yes fi; -echo "$as_me:3470: result: $with_curses_h" >&5 +echo "$as_me:3699: result: $with_curses_h" >&5 echo "${ECHO_T}$with_curses_h" >&6 modules_to_build="ncurses" @@ -3492,7 +3721,7 @@ for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3495: checking for $ac_word" >&5 +echo "$as_me:3724: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3507,7 +3736,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AWK="$ac_prog" -echo "$as_me:3510: found $ac_dir/$ac_word" >&5 +echo "$as_me:3739: found $ac_dir/$ac_word" >&5 break done @@ -3515,38 +3744,20 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:3518: result: $AWK" >&5 + echo "$as_me:3747: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:3521: result: no" >&5 + echo "$as_me:3750: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -test -z "$AWK" && { { echo "$as_me:3528: error: No awk program found" >&5 +test -z "$AWK" && { { echo "$as_me:3757: error: No awk program found" >&5 echo "$as_me: error: No awk program found" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:3532: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi -fi -echo "$as_me:3542: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep - - test -z "$EGREP" && { { echo "$as_me:3546: error: No egrep program found" >&5 -echo "$as_me: error: No egrep program found" >&2;} - { (exit 1); exit 1; }; } - # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -3559,7 +3770,7 @@ echo "$as_me: error: No egrep program found" >&2;} # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:3562: checking for a BSD compatible install" >&5 +echo "$as_me:3773: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -3608,7 +3819,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:3611: result: $INSTALL" >&5 +echo "$as_me:3822: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -3623,9 +3834,9 @@ case $INSTALL in (/*) ;; (*) - cf_dir=`echo $INSTALL | sed -e 's%/[^/]*$%%'` + cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'` test -z "$cf_dir" && cf_dir=. - INSTALL=`cd $cf_dir && pwd`/`echo $INSTALL | sed -e 's%^.*/%%'` + INSTALL="`cd \"$cf_dir\" && pwd`"/"`echo "$INSTALL" | sed -e 's%^.*/%%'`" ;; esac @@ -3633,7 +3844,7 @@ for ac_prog in lint cppcheck splint do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3636: checking for $ac_word" >&5 +echo "$as_me:3847: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3648,7 +3859,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LINT="$ac_prog" -echo "$as_me:3651: found $ac_dir/$ac_word" >&5 +echo "$as_me:3862: found $ac_dir/$ac_word" >&5 break done @@ -3656,10 +3867,10 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:3659: result: $LINT" >&5 + echo "$as_me:3870: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:3662: result: no" >&5 + echo "$as_me:3873: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3672,18 +3883,18 @@ case "x$LINT" in ;; esac -echo "$as_me:3675: checking whether ln -s works" >&5 +echo "$as_me:3886: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:3679: result: yes" >&5 + echo "$as_me:3890: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:3682: result: no, using $LN_S" >&5 + echo "$as_me:3893: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:3686: checking if $LN_S -f options work" >&5 +echo "$as_me:3897: checking if $LN_S -f options work" >&5 echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6 rm -f conf$$.src conf$$dst @@ -3695,12 +3906,12 @@ else cf_prog_ln_sf=no fi rm -f conf$$.dst conf$$src -echo "$as_me:3698: result: $cf_prog_ln_sf" >&5 +echo "$as_me:3909: result: $cf_prog_ln_sf" >&5 echo "${ECHO_T}$cf_prog_ln_sf" >&6 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" -echo "$as_me:3703: checking for long file names" >&5 +echo "$as_me:3914: checking for long file names" >&5 echo $ECHO_N "checking for long file names... $ECHO_C" >&6 if test "${ac_cv_sys_long_file_names+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3721,27 +3932,27 @@ if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then else ac_tmpdirs='/tmp /var/tmp /usr/tmp' fi -for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do - test -d $ac_dir || continue - test -w $ac_dir || continue # It is less confusing to not echo anything here. +for ac_dir in . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do + test -d "$ac_dir" || continue + test -w "$ac_dir" || continue # It is less confusing to not echo anything here. ac_xdir=$ac_dir/cf$$ - (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue + (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue ac_tf1=$ac_xdir/conftest9012345 ac_tf2=$ac_xdir/conftest9012346 - (echo 1 >$ac_tf1) 2>/dev/null - (echo 2 >$ac_tf2) 2>/dev/null - ac_val=`cat $ac_tf1 2>/dev/null` - if test ! -f $ac_tf1 || test "$ac_val" != 1; then + (echo 1 >"$ac_tf1") 2>/dev/null + (echo 2 >"$ac_tf2") 2>/dev/null + ac_val=`cat "$ac_tf1" 2>/dev/null` + if test ! -f "$ac_tf1" || test "$ac_val" != 1; then ac_cv_sys_long_file_names=no - rm -rf $ac_xdir 2>/dev/null + rm -rf "$ac_xdir" 2>/dev/null break fi - rm -rf $ac_xdir 2>/dev/null + rm -rf "$ac_xdir" 2>/dev/null done fi -echo "$as_me:3742: result: $ac_cv_sys_long_file_names" >&5 +echo "$as_me:3953: result: $ac_cv_sys_long_file_names" >&5 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 -if test $ac_cv_sys_long_file_names = yes; then +if test "$ac_cv_sys_long_file_names" = yes; then cat >>confdefs.h <<\EOF #define HAVE_LONG_FILE_NAMES 1 @@ -3758,7 +3969,7 @@ if test "${with_config_suffix+set}" = set; then withval="$with_config_suffix" case "x$withval" in (xyes|xno) - { echo "$as_me:3761: WARNING: expected a value for config-suffix option" >&5 + { echo "$as_me:3972: WARNING: expected a value for config-suffix option" >&5 echo "$as_me: WARNING: expected a value for config-suffix option" >&2;} ;; (*) cf_config_suffix="$withval" @@ -3768,7 +3979,7 @@ fi; # If we find pkg-config, check if we should install the ".pc" files. -echo "$as_me:3771: checking if you want to use pkg-config" >&5 +echo "$as_me:3982: checking if you want to use pkg-config" >&5 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 # Check whether --with-pkg-config or --without-pkg-config was given. @@ -3778,10 +3989,10 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:3781: result: $cf_pkg_config" >&5 +echo "$as_me:3992: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 -case $cf_pkg_config in +case "$cf_pkg_config" in (no) PKG_CONFIG=none ;; @@ -3790,7 +4001,7 @@ case $cf_pkg_config in if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:3793: checking for $ac_word" >&5 +echo "$as_me:4004: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3807,7 +4018,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:3810: found $ac_dir/$ac_word" >&5 + echo "$as_me:4021: found $ac_dir/$ac_word" >&5 break fi done @@ -3818,10 +4029,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:3821: result: $PKG_CONFIG" >&5 + echo "$as_me:4032: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:3824: result: no" >&5 + echo "$as_me:4035: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3830,7 +4041,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:3833: checking for $ac_word" >&5 +echo "$as_me:4044: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3847,7 +4058,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:3850: found $ac_dir/$ac_word" >&5 + echo "$as_me:4061: found $ac_dir/$ac_word" >&5 break fi done @@ -3859,10 +4070,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:3862: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:4073: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:3865: result: no" >&5 + echo "$as_me:4076: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3893,36 +4104,36 @@ case ".$PKG_CONFIG" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval PKG_CONFIG="$PKG_CONFIG" case ".$PKG_CONFIG" in (.NONE/*) - PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:3908: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:4119: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } ;; esac elif test "x$cf_pkg_config" != xno ; then - { echo "$as_me:3915: WARNING: pkg-config is not installed" >&5 + { echo "$as_me:4126: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi -case $PKG_CONFIG in +case "$PKG_CONFIG" in (no|none|yes) - echo "$as_me:3921: checking for pkg-config library directory" >&5 + echo "$as_me:4132: checking for pkg-config library directory" >&5 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6 ;; (*) - echo "$as_me:3925: checking for $PKG_CONFIG library directory" >&5 + echo "$as_me:4136: checking for $PKG_CONFIG library directory" >&5 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 ;; esac @@ -3977,18 +4188,18 @@ case x$PKG_CONFIG_LIBDIR in test -n "$verbose" && echo " list..." 1>&6 -echo "${as_me:-configure}:3980: testing list... ..." 1>&5 +echo "${as_me:-configure}:4191: testing list... ..." 1>&5 for cf_config in $cf_search_path do test -n "$verbose" && echo " checking $cf_config/pkgconfig" 1>&6 -echo "${as_me:-configure}:3986: testing checking $cf_config/pkgconfig ..." 1>&5 +echo "${as_me:-configure}:4197: testing checking $cf_config/pkgconfig ..." 1>&5 - if test -d $cf_config/pkgconfig + if test -d "$cf_config/pkgconfig" then PKG_CONFIG_LIBDIR=$cf_config/pkgconfig - echo "$as_me:3991: checking done" >&5 + echo "$as_me:4202: checking done" >&5 echo $ECHO_N "checking done... $ECHO_C" >&6 break fi @@ -3999,16 +4210,16 @@ echo $ECHO_N "checking done... $ECHO_C" >&6 esac if test "x$PKG_CONFIG_LIBDIR" != xno ; then - echo "$as_me:4002: result: $PKG_CONFIG_LIBDIR" >&5 + echo "$as_me:4213: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 fi if test "x$PKG_CONFIG" != xnone then - echo "$as_me:4008: checking if we should install .pc files for $PKG_CONFIG" >&5 + echo "$as_me:4219: checking if we should install .pc files for $PKG_CONFIG" >&5 echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 else - echo "$as_me:4011: checking if we should install .pc files" >&5 + echo "$as_me:4222: checking if we should install .pc files" >&5 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6 fi @@ -4019,7 +4230,7 @@ if test "${enable_pc_files+set}" = set; then else enable_pc_files=no fi; -echo "$as_me:4022: result: $enable_pc_files" >&5 +echo "$as_me:4233: result: $enable_pc_files" >&5 echo "${ECHO_T}$enable_pc_files" >&6 if test "x$enable_pc_files" != xno @@ -4027,7 +4238,7 @@ then MAKE_PC_FILES= case "x$PKG_CONFIG_LIBDIR" in (xno|xyes) - { echo "$as_me:4030: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 + { echo "$as_me:4241: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;} ;; (*) @@ -4045,19 +4256,19 @@ case ".$PKG_CONFIG_LIBDIR" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" case ".$PKG_CONFIG_LIBDIR" in (.NONE/*) - PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%` + PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%` + PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:4060: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5 + { { echo "$as_me:4271: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -4071,7 +4282,7 @@ fi if test -z "$MAKE_PC_FILES" then - echo "$as_me:4074: checking for suffix to add to pc-files" >&5 + echo "$as_me:4285: checking for suffix to add to pc-files" >&5 echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6 # Check whether --with-pc-suffix or --without-pc-suffix was given. @@ -4086,13 +4297,13 @@ if test "${with_pc_suffix+set}" = set; then esac fi; test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none - echo "$as_me:4089: result: $PC_MODULE_SUFFIX" >&5 + echo "$as_me:4300: result: $PC_MODULE_SUFFIX" >&5 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6 test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX= fi -echo "$as_me:4095: checking if we should assume mixed-case filenames" >&5 +echo "$as_me:4306: checking if we should assume mixed-case filenames" >&5 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 # Check whether --enable-mixed-case or --disable-mixed-case was given. @@ -4102,19 +4313,19 @@ if test "${enable_mixed_case+set}" = set; then else enable_mixedcase=auto fi; -echo "$as_me:4105: result: $enable_mixedcase" >&5 +echo "$as_me:4316: result: $enable_mixedcase" >&5 echo "${ECHO_T}$enable_mixedcase" >&6 if test "$enable_mixedcase" = "auto" ; then -echo "$as_me:4109: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:4320: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes ; then - case $target_alias in - (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) + case "$target_alias" in + (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*) cf_cv_mixedcase=no ;; (*) @@ -4133,7 +4344,7 @@ else fi fi -echo "$as_me:4136: result: $cf_cv_mixedcase" >&5 +echo "$as_me:4347: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -4152,7 +4363,7 @@ EOF fi # do this after mixed-case option (tags/TAGS is not as important as tic). -echo "$as_me:4155: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:4366: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -4172,11 +4383,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:4175: result: yes" >&5 + echo "$as_me:4386: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:4179: result: no" >&5 + echo "$as_me:4390: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -4185,7 +4396,7 @@ for ac_prog in exctags ctags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4188: checking for $ac_word" >&5 +echo "$as_me:4399: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CTAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4200,7 +4411,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CTAGS="$ac_prog" -echo "$as_me:4203: found $ac_dir/$ac_word" >&5 +echo "$as_me:4414: found $ac_dir/$ac_word" >&5 break done @@ -4208,10 +4419,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:4211: result: $CTAGS" >&5 + echo "$as_me:4422: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:4214: result: no" >&5 + echo "$as_me:4425: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4222,7 +4433,7 @@ for ac_prog in exetags etags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4225: checking for $ac_word" >&5 +echo "$as_me:4436: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ETAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4237,7 +4448,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ETAGS="$ac_prog" -echo "$as_me:4240: found $ac_dir/$ac_word" >&5 +echo "$as_me:4451: found $ac_dir/$ac_word" >&5 break done @@ -4245,10 +4456,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:4248: result: $ETAGS" >&5 + echo "$as_me:4459: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:4251: result: no" >&5 + echo "$as_me:4462: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4257,7 +4468,7 @@ done # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. set dummy ${CTAGS:-ctags}; ac_word=$2 -echo "$as_me:4260: checking for $ac_word" >&5 +echo "$as_me:4471: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4272,7 +4483,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_LOWER_TAGS="yes" -echo "$as_me:4275: found $ac_dir/$ac_word" >&5 +echo "$as_me:4486: found $ac_dir/$ac_word" >&5 break done @@ -4281,17 +4492,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:4284: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:4495: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:4287: result: no" >&5 + echo "$as_me:4498: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cf_cv_mixedcase" = yes ; then # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. set dummy ${ETAGS:-etags}; ac_word=$2 -echo "$as_me:4294: checking for $ac_word" >&5 +echo "$as_me:4505: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4306,7 +4517,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_UPPER_TAGS="yes" -echo "$as_me:4309: found $ac_dir/$ac_word" >&5 +echo "$as_me:4520: found $ac_dir/$ac_word" >&5 break done @@ -4315,10 +4526,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:4318: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:4529: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:4321: result: no" >&5 + echo "$as_me:4532: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4338,7 +4549,7 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:4341: checking for makeflags variable" >&5 +echo "$as_me:4552: checking for makeflags variable" >&5 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 if test "${cf_cv_makeflags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4352,10 +4563,10 @@ SHELL = $SHELL all : @ echo '.$cf_option' CF_EOF - cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[ ]*$,,'` + cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | ${FGREP-fgrep} -v "ing directory" | sed -e 's,[ ]*$,,'` case "$cf_result" in (.*k|.*kw) - cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` + cf_result="`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`" case "$cf_result" in (.*CC=*) cf_cv_makeflags= ;; @@ -4368,7 +4579,7 @@ CF_EOF ;; (*) -echo "${as_me:-configure}:4371: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 +echo "${as_me:-configure}:4582: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ;; esac @@ -4376,13 +4587,13 @@ echo "${as_me:-configure}:4371: testing given option \"$cf_option\",no match \"$ rm -f cf_makeflags.tmp fi -echo "$as_me:4379: result: $cf_cv_makeflags" >&5 +echo "$as_me:4590: result: $cf_cv_makeflags" >&5 echo "${ECHO_T}$cf_cv_makeflags" >&6 if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:4385: checking for $ac_word" >&5 +echo "$as_me:4596: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4397,7 +4608,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:4400: found $ac_dir/$ac_word" >&5 +echo "$as_me:4611: found $ac_dir/$ac_word" >&5 break done @@ -4405,10 +4616,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:4408: result: $RANLIB" >&5 + echo "$as_me:4619: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:4411: result: no" >&5 + echo "$as_me:4622: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4417,7 +4628,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:4420: checking for $ac_word" >&5 +echo "$as_me:4631: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4432,7 +4643,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:4435: found $ac_dir/$ac_word" >&5 +echo "$as_me:4646: found $ac_dir/$ac_word" >&5 break done @@ -4441,10 +4652,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:4444: result: $ac_ct_RANLIB" >&5 + echo "$as_me:4655: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:4447: result: no" >&5 + echo "$as_me:4658: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4456,7 +4667,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 -echo "$as_me:4459: checking for $ac_word" >&5 +echo "$as_me:4670: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4471,7 +4682,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LD="${ac_tool_prefix}ld" -echo "$as_me:4474: found $ac_dir/$ac_word" >&5 +echo "$as_me:4685: found $ac_dir/$ac_word" >&5 break done @@ -4479,10 +4690,10 @@ fi fi LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$as_me:4482: result: $LD" >&5 + echo "$as_me:4693: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:4485: result: no" >&5 + echo "$as_me:4696: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4491,7 +4702,7 @@ if test -z "$ac_cv_prog_LD"; then ac_ct_LD=$LD # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 -echo "$as_me:4494: checking for $ac_word" >&5 +echo "$as_me:4705: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4506,7 +4717,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_LD="ld" -echo "$as_me:4509: found $ac_dir/$ac_word" >&5 +echo "$as_me:4720: found $ac_dir/$ac_word" >&5 break done @@ -4515,10 +4726,10 @@ fi fi ac_ct_LD=$ac_cv_prog_ac_ct_LD if test -n "$ac_ct_LD"; then - echo "$as_me:4518: result: $ac_ct_LD" >&5 + echo "$as_me:4729: result: $ac_ct_LD" >&5 echo "${ECHO_T}$ac_ct_LD" >&6 else - echo "$as_me:4521: result: no" >&5 + echo "$as_me:4732: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4530,7 +4741,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:4533: checking for $ac_word" >&5 +echo "$as_me:4744: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4545,7 +4756,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AR="${ac_tool_prefix}ar" -echo "$as_me:4548: found $ac_dir/$ac_word" >&5 +echo "$as_me:4759: found $ac_dir/$ac_word" >&5 break done @@ -4553,10 +4764,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:4556: result: $AR" >&5 + echo "$as_me:4767: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:4559: result: no" >&5 + echo "$as_me:4770: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4565,7 +4776,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:4568: checking for $ac_word" >&5 +echo "$as_me:4779: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4580,7 +4791,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_AR="ar" -echo "$as_me:4583: found $ac_dir/$ac_word" >&5 +echo "$as_me:4794: found $ac_dir/$ac_word" >&5 break done @@ -4589,10 +4800,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:4592: result: $ac_ct_AR" >&5 + echo "$as_me:4803: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4595: result: no" >&5 + echo "$as_me:4806: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4604,7 +4815,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. set dummy ${ac_tool_prefix}nm; ac_word=$2 -echo "$as_me:4607: checking for $ac_word" >&5 +echo "$as_me:4818: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4619,7 +4830,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_NM="${ac_tool_prefix}nm" -echo "$as_me:4622: found $ac_dir/$ac_word" >&5 +echo "$as_me:4833: found $ac_dir/$ac_word" >&5 break done @@ -4627,10 +4838,10 @@ fi fi NM=$ac_cv_prog_NM if test -n "$NM"; then - echo "$as_me:4630: result: $NM" >&5 + echo "$as_me:4841: result: $NM" >&5 echo "${ECHO_T}$NM" >&6 else - echo "$as_me:4633: result: no" >&5 + echo "$as_me:4844: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4639,7 +4850,7 @@ if test -z "$ac_cv_prog_NM"; then ac_ct_NM=$NM # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 -echo "$as_me:4642: checking for $ac_word" >&5 +echo "$as_me:4853: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4654,7 +4865,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NM="nm" -echo "$as_me:4657: found $ac_dir/$ac_word" >&5 +echo "$as_me:4868: found $ac_dir/$ac_word" >&5 break done @@ -4663,10 +4874,10 @@ fi fi ac_ct_NM=$ac_cv_prog_ac_ct_NM if test -n "$ac_ct_NM"; then - echo "$as_me:4666: result: $ac_ct_NM" >&5 + echo "$as_me:4877: result: $ac_ct_NM" >&5 echo "${ECHO_T}$ac_ct_NM" >&6 else - echo "$as_me:4669: result: no" >&5 + echo "$as_me:4880: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4678,7 +4889,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:4681: checking for $ac_word" >&5 +echo "$as_me:4892: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4693,7 +4904,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AR="${ac_tool_prefix}ar" -echo "$as_me:4696: found $ac_dir/$ac_word" >&5 +echo "$as_me:4907: found $ac_dir/$ac_word" >&5 break done @@ -4701,10 +4912,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:4704: result: $AR" >&5 + echo "$as_me:4915: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:4707: result: no" >&5 + echo "$as_me:4918: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4713,7 +4924,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:4716: checking for $ac_word" >&5 +echo "$as_me:4927: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4728,7 +4939,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_AR="ar" -echo "$as_me:4731: found $ac_dir/$ac_word" >&5 +echo "$as_me:4942: found $ac_dir/$ac_word" >&5 break done @@ -4737,10 +4948,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:4740: result: $ac_ct_AR" >&5 + echo "$as_me:4951: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4743: result: no" >&5 + echo "$as_me:4954: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4749,13 +4960,13 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:4752: checking for options to update archives" >&5 +echo "$as_me:4963: checking for options to update archives" >&5 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 if test "${cf_cv_ar_flags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $cf_cv_system_name in + case "$cf_cv_system_name" in (*-msvc*) cf_cv_ar_flags='' cat >mk_static_lib.sh <<-EOF @@ -4782,38 +4993,38 @@ else fi fi - rm -f conftest.$ac_cv_objext + rm -f "conftest.$ac_cv_objext" rm -f conftest.a - cat >conftest.$ac_ext <"conftest.$ac_ext" <&5 + if { (eval echo "$as_me:5003: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4795: \$? = $ac_status" >&5 - (exit $ac_status); } ; then + echo "$as_me:5006: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 - $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null + $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null if test -f conftest.a ; then - cf_cv_ar_flags=$cf_ar_flags + cf_cv_ar_flags="$cf_ar_flags" break fi else test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me:-configure}:4806: testing cannot compile test-program ..." 1>&5 +echo "${as_me:-configure}:5017: testing cannot compile test-program ..." 1>&5 break fi done - rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext + rm -f conftest.a "conftest.$ac_ext" "conftest.$ac_cv_objext" ;; esac fi -echo "$as_me:4816: result: $cf_cv_ar_flags" >&5 +echo "$as_me:5027: result: $cf_cv_ar_flags" >&5 echo "${ECHO_T}$cf_cv_ar_flags" >&6 if test -n "$ARFLAGS" ; then @@ -4824,7 +5035,7 @@ else ARFLAGS=$cf_cv_ar_flags fi -echo "$as_me:4827: checking if you have specified an install-prefix" >&5 +echo "$as_me:5038: checking if you have specified an install-prefix" >&5 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 # Check whether --with-install-prefix or --without-install-prefix was given. @@ -4837,7 +5048,7 @@ if test "${with_install_prefix+set}" = set; then ;; esac fi; -echo "$as_me:4840: result: $DESTDIR" >&5 +echo "$as_me:5051: result: $DESTDIR" >&5 echo "${ECHO_T}$DESTDIR" >&6 ############################################################################### @@ -4846,6 +5057,13 @@ echo "${ECHO_T}$DESTDIR" >&6 # options. The configure script is oriented toward identifying the host # compiler, etc., but we need a build compiler to generate parts of the source. +case "$cf_cv_system_name" in +(*-msvc*) + LDFLAGS="$LDFLAGS user32.lib" + export LDFLAGS + ;; +esac + if test "$cross_compiling" = yes ; then # defaults that we might want to override @@ -4865,7 +5083,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4868: checking for $ac_word" >&5 +echo "$as_me:5086: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_BUILD_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4880,7 +5098,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_BUILD_CC="$ac_prog" -echo "$as_me:4883: found $ac_dir/$ac_word" >&5 +echo "$as_me:5101: found $ac_dir/$ac_word" >&5 break done @@ -4888,10 +5106,10 @@ fi fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - echo "$as_me:4891: result: $BUILD_CC" >&5 + echo "$as_me:5109: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 else - echo "$as_me:4894: result: no" >&5 + echo "$as_me:5112: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4900,12 +5118,12 @@ done test -n "$BUILD_CC" || BUILD_CC="none" fi; - echo "$as_me:4903: checking for native build C compiler" >&5 + echo "$as_me:5121: checking for native build C compiler" >&5 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 - echo "$as_me:4905: result: $BUILD_CC" >&5 + echo "$as_me:5123: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 - echo "$as_me:4908: checking for native build C preprocessor" >&5 + echo "$as_me:5126: checking for native build C preprocessor" >&5 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 # Check whether --with-build-cpp or --without-build-cpp was given. @@ -4915,10 +5133,10 @@ if test "${with_build_cpp+set}" = set; then else BUILD_CPP='${BUILD_CC} -E' fi; - echo "$as_me:4918: result: $BUILD_CPP" >&5 + echo "$as_me:5136: result: $BUILD_CPP" >&5 echo "${ECHO_T}$BUILD_CPP" >&6 - echo "$as_me:4921: checking for native build C flags" >&5 + echo "$as_me:5139: checking for native build C flags" >&5 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 # Check whether --with-build-cflags or --without-build-cflags was given. @@ -4926,10 +5144,10 @@ if test "${with_build_cflags+set}" = set; then withval="$with_build_cflags" BUILD_CFLAGS="$withval" fi; - echo "$as_me:4929: result: $BUILD_CFLAGS" >&5 + echo "$as_me:5147: result: $BUILD_CFLAGS" >&5 echo "${ECHO_T}$BUILD_CFLAGS" >&6 - echo "$as_me:4932: checking for native build C preprocessor-flags" >&5 + echo "$as_me:5150: checking for native build C preprocessor-flags" >&5 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 # Check whether --with-build-cppflags or --without-build-cppflags was given. @@ -4937,10 +5155,10 @@ if test "${with_build_cppflags+set}" = set; then withval="$with_build_cppflags" BUILD_CPPFLAGS="$withval" fi; - echo "$as_me:4940: result: $BUILD_CPPFLAGS" >&5 + echo "$as_me:5158: result: $BUILD_CPPFLAGS" >&5 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - echo "$as_me:4943: checking for native build linker-flags" >&5 + echo "$as_me:5161: checking for native build linker-flags" >&5 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 # Check whether --with-build-ldflags or --without-build-ldflags was given. @@ -4948,10 +5166,10 @@ if test "${with_build_ldflags+set}" = set; then withval="$with_build_ldflags" BUILD_LDFLAGS="$withval" fi; - echo "$as_me:4951: result: $BUILD_LDFLAGS" >&5 + echo "$as_me:5169: result: $BUILD_LDFLAGS" >&5 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - echo "$as_me:4954: checking for native build linker-libraries" >&5 + echo "$as_me:5172: checking for native build linker-libraries" >&5 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 # Check whether --with-build-libs or --without-build-libs was given. @@ -4959,7 +5177,7 @@ if test "${with_build_libs+set}" = set; then withval="$with_build_libs" BUILD_LIBS="$withval" fi; - echo "$as_me:4962: result: $BUILD_LIBS" >&5 + echo "$as_me:5180: result: $BUILD_LIBS" >&5 echo "${ECHO_T}$BUILD_LIBS" >&6 # this assumes we're on Unix. @@ -4968,8 +5186,8 @@ echo "${ECHO_T}$BUILD_LIBS" >&6 : ${BUILD_CC:='${CC}'} - if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then - { { echo "$as_me:4972: error: Cross-build requires two compilers. + if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then + { { echo "$as_me:5190: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&5 echo "$as_me: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&2;} @@ -4994,7 +5212,7 @@ fi ### shared, for example. cf_list_models="" -echo "$as_me:4997: checking if libtool -version-number should be used" >&5 +echo "$as_me:5215: checking if libtool -version-number should be used" >&5 echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6 # Check whether --enable-libtool-version or --disable-libtool-version was given. @@ -5011,7 +5229,7 @@ else cf_libtool_version=yes fi; -echo "$as_me:5014: result: $cf_libtool_version" >&5 +echo "$as_me:5232: result: $cf_libtool_version" >&5 echo "${ECHO_T}$cf_libtool_version" >&6 if test "$cf_libtool_version" = yes ; then @@ -5020,25 +5238,25 @@ else LIBTOOL_VERSION="-version-info" case "x$VERSION" in (x) - { echo "$as_me:5023: WARNING: VERSION was not set" >&5 + { echo "$as_me:5241: WARNING: VERSION was not set" >&5 echo "$as_me: WARNING: VERSION was not set" >&2;} ;; (x*.*.*) ABI_VERSION="$VERSION" test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 -echo "${as_me:-configure}:5030: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 +echo "${as_me:-configure}:5248: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ;; (x*:*:*) ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'` test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 -echo "${as_me:-configure}:5037: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 +echo "${as_me:-configure}:5255: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ;; (*) - { echo "$as_me:5041: WARNING: unexpected VERSION value: $VERSION" >&5 + { echo "$as_me:5259: WARNING: unexpected VERSION value: $VERSION" >&5 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;} ;; esac @@ -5060,7 +5278,7 @@ LIB_LINK='${CC}' LIB_INSTALL= LIB_UNINSTALL= -echo "$as_me:5063: checking if you want to build libraries with libtool" >&5 +echo "$as_me:5281: checking if you want to build libraries with libtool" >&5 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6 # Check whether --with-libtool or --without-libtool was given. @@ -5070,7 +5288,7 @@ if test "${with_libtool+set}" = set; then else with_libtool=no fi; -echo "$as_me:5073: result: $with_libtool" >&5 +echo "$as_me:5291: result: $with_libtool" >&5 echo "${ECHO_T}$with_libtool" >&6 if test "$with_libtool" != "no"; then @@ -5089,19 +5307,19 @@ case ".$with_libtool" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval with_libtool="$with_libtool" case ".$with_libtool" in (.NONE/*) - with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` + with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` + with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:5104: error: expected a pathname, not \"$with_libtool\"" >&5 + { { echo "$as_me:5322: error: expected a pathname, not \"$with_libtool\"" >&5 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -5114,7 +5332,7 @@ esac do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:5117: checking for $ac_word" >&5 +echo "$as_me:5335: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5129,7 +5347,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog" -echo "$as_me:5132: found $ac_dir/$ac_word" >&5 +echo "$as_me:5350: found $ac_dir/$ac_word" >&5 break done @@ -5137,10 +5355,10 @@ fi fi LIBTOOL=$ac_cv_prog_LIBTOOL if test -n "$LIBTOOL"; then - echo "$as_me:5140: result: $LIBTOOL" >&5 + echo "$as_me:5358: result: $LIBTOOL" >&5 echo "${ECHO_T}$LIBTOOL" >&6 else - echo "$as_me:5143: result: no" >&5 + echo "$as_me:5361: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5153,7 +5371,7 @@ if test -z "$LIBTOOL"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:5156: checking for $ac_word" >&5 +echo "$as_me:5374: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5168,7 +5386,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" -echo "$as_me:5171: found $ac_dir/$ac_word" >&5 +echo "$as_me:5389: found $ac_dir/$ac_word" >&5 break done @@ -5176,10 +5394,10 @@ fi fi ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL if test -n "$ac_ct_LIBTOOL"; then - echo "$as_me:5179: result: $ac_ct_LIBTOOL" >&5 + echo "$as_me:5397: result: $ac_ct_LIBTOOL" >&5 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 else - echo "$as_me:5182: result: no" >&5 + echo "$as_me:5400: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5210,7 +5428,7 @@ unset LIBTOOL do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:5213: checking for $ac_word" >&5 +echo "$as_me:5431: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5225,7 +5443,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog" -echo "$as_me:5228: found $ac_dir/$ac_word" >&5 +echo "$as_me:5446: found $ac_dir/$ac_word" >&5 break done @@ -5233,10 +5451,10 @@ fi fi LIBTOOL=$ac_cv_prog_LIBTOOL if test -n "$LIBTOOL"; then - echo "$as_me:5236: result: $LIBTOOL" >&5 + echo "$as_me:5454: result: $LIBTOOL" >&5 echo "${ECHO_T}$LIBTOOL" >&6 else - echo "$as_me:5239: result: no" >&5 + echo "$as_me:5457: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5249,7 +5467,7 @@ if test -z "$LIBTOOL"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:5252: checking for $ac_word" >&5 +echo "$as_me:5470: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5264,7 +5482,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" -echo "$as_me:5267: found $ac_dir/$ac_word" >&5 +echo "$as_me:5485: found $ac_dir/$ac_word" >&5 break done @@ -5272,10 +5490,10 @@ fi fi ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL if test -n "$ac_ct_LIBTOOL"; then - echo "$as_me:5275: result: $ac_ct_LIBTOOL" >&5 + echo "$as_me:5493: result: $ac_ct_LIBTOOL" >&5 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 else - echo "$as_me:5278: result: no" >&5 + echo "$as_me:5496: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5297,7 +5515,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version fi fi if test -z "$LIBTOOL" ; then - { { echo "$as_me:5300: error: Cannot find libtool" >&5 + { { echo "$as_me:5518: error: Cannot find libtool" >&5 echo "$as_me: error: Cannot find libtool" >&2;} { (exit 1); exit 1; }; } fi @@ -5313,7 +5531,7 @@ echo "$as_me: error: Cannot find libtool" >&2;} if test -n "$LIBTOOL" && test "$LIBTOOL" != none then - echo "$as_me:5316: checking version of $LIBTOOL" >&5 + echo "$as_me:5534: checking version of $LIBTOOL" >&5 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6 if test -n "$LIBTOOL" && test "$LIBTOOL" != none @@ -5324,15 +5542,27 @@ else fi test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version - echo "$as_me:5327: result: $cf_cv_libtool_version" >&5 + echo "$as_me:5545: result: $cf_cv_libtool_version" >&5 echo "${ECHO_T}$cf_cv_libtool_version" >&6 - if test -z "$cf_cv_libtool_version" ; then - { { echo "$as_me:5330: error: This is not GNU libtool" >&5 + if test -n "$cf_cv_libtool_version" + then + cf_check_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' -e 's,[()],...,g' -e 's,[ ],-,g' -e '2,$d'` + case "x$cf_check_libtool_version" in + (*...GNU-libtool...*) + ;; + (*) + { { echo "$as_me:5554: error: This is not GNU libtool" >&5 echo "$as_me: error: This is not GNU libtool" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + else + { { echo "$as_me:5560: error: No version found for $LIBTOOL" >&5 +echo "$as_me: error: No version found for $LIBTOOL" >&2;} { (exit 1); exit 1; }; } fi else - { { echo "$as_me:5335: error: GNU libtool has not been found" >&5 + { { echo "$as_me:5565: error: GNU libtool has not been found" >&5 echo "$as_me: error: GNU libtool has not been found" >&2;} { (exit 1); exit 1; }; } fi @@ -5346,7 +5576,7 @@ fi esac # special hack to add --tag option for C++ compiler - case $cf_cv_libtool_version in + case "$cf_cv_libtool_version" in (1.[5-9]*|[2-9].[0-9.a-z]*) LIBTOOL_CXX="$LIBTOOL --tag=CXX" LIBTOOL="$LIBTOOL --tag=CC" @@ -5368,7 +5598,7 @@ cf_list_models="$cf_list_models libtool" else -echo "$as_me:5371: checking if you want to build shared libraries" >&5 +echo "$as_me:5601: checking if you want to build shared libraries" >&5 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 # Check whether --with-shared or --without-shared was given. @@ -5378,11 +5608,11 @@ if test "${with_shared+set}" = set; then else with_shared=no fi; -echo "$as_me:5381: result: $with_shared" >&5 +echo "$as_me:5611: result: $with_shared" >&5 echo "${ECHO_T}$with_shared" >&6 test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared" -echo "$as_me:5385: checking if you want to build static libraries" >&5 +echo "$as_me:5615: checking if you want to build static libraries" >&5 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6 # Check whether --with-normal or --without-normal was given. @@ -5392,11 +5622,11 @@ if test "${with_normal+set}" = set; then else with_normal=yes fi; -echo "$as_me:5395: result: $with_normal" >&5 +echo "$as_me:5625: result: $with_normal" >&5 echo "${ECHO_T}$with_normal" >&6 test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal" -echo "$as_me:5399: checking if you want to build debug libraries" >&5 +echo "$as_me:5629: checking if you want to build debug libraries" >&5 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6 # Check whether --with-debug or --without-debug was given. @@ -5406,11 +5636,11 @@ if test "${with_debug+set}" = set; then else with_debug=yes fi; -echo "$as_me:5409: result: $with_debug" >&5 +echo "$as_me:5639: result: $with_debug" >&5 echo "${ECHO_T}$with_debug" >&6 test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug" -echo "$as_me:5413: checking if you want to build profiling libraries" >&5 +echo "$as_me:5643: checking if you want to build profiling libraries" >&5 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6 # Check whether --with-profile or --without-profile was given. @@ -5420,7 +5650,7 @@ if test "${with_profile+set}" = set; then else with_profile=no fi; -echo "$as_me:5423: result: $with_profile" >&5 +echo "$as_me:5653: result: $with_profile" >&5 echo "${ECHO_T}$with_profile" >&6 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile" @@ -5428,7 +5658,7 @@ fi if test "X$cf_with_cxx_binding" != Xno; then if test "x$with_shared" = "xyes"; then -echo "$as_me:5431: checking if you want to build C++ shared libraries" >&5 +echo "$as_me:5661: checking if you want to build C++ shared libraries" >&5 echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6 # Check whether --with-cxx-shared or --without-cxx-shared was given. @@ -5438,26 +5668,26 @@ if test "${with_cxx_shared+set}" = set; then else with_shared_cxx=no fi; -echo "$as_me:5441: result: $with_shared_cxx" >&5 +echo "$as_me:5671: result: $with_shared_cxx" >&5 echo "${ECHO_T}$with_shared_cxx" >&6 fi fi ############################################################################### -echo "$as_me:5448: checking for specified models" >&5 +echo "$as_me:5678: checking for specified models" >&5 echo $ECHO_N "checking for specified models... $ECHO_C" >&6 test -z "$cf_list_models" && cf_list_models=normal test "$with_libtool" != "no" && cf_list_models=libtool -echo "$as_me:5452: result: $cf_list_models" >&5 +echo "$as_me:5682: result: $cf_list_models" >&5 echo "${ECHO_T}$cf_list_models" >&6 ### Use the first model as the default, and save its suffix for use in building ### up test-applications. -echo "$as_me:5457: checking for default model" >&5 +echo "$as_me:5687: checking for default model" >&5 echo $ECHO_N "checking for default model... $ECHO_C" >&6 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` -echo "$as_me:5460: result: $DFT_LWR_MODEL" >&5 +echo "$as_me:5690: result: $DFT_LWR_MODEL" >&5 echo "${ECHO_T}$DFT_LWR_MODEL" >&6 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -5471,7 +5701,7 @@ LIB_NAME=ncurses LIB_DIR=../lib LIB_2ND=../../lib -echo "$as_me:5474: checking if you want to have a library-prefix" >&5 +echo "$as_me:5704: checking if you want to have a library-prefix" >&5 echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 # Check whether --with-lib-prefix or --without-lib-prefix was given. @@ -5481,13 +5711,13 @@ if test "${with_lib_prefix+set}" = set; then else with_lib_prefix=auto fi; -echo "$as_me:5484: result: $with_lib_prefix" >&5 +echo "$as_me:5714: result: $with_lib_prefix" >&5 echo "${ECHO_T}$with_lib_prefix" >&6 -if test $with_lib_prefix = auto +if test "$with_lib_prefix" = auto then - case $cf_cv_system_name in + case "$cf_cv_system_name" in (OS/2*|os2*) if test "$DFT_LWR_MODEL" = libtool; then LIB_PREFIX='lib' @@ -5503,7 +5733,7 @@ then esac cf_prefix=$LIB_PREFIX -elif test $with_lib_prefix = no +elif test "$with_lib_prefix" = no then LIB_PREFIX= else @@ -5512,19 +5742,19 @@ fi LIB_SUFFIX= - echo "$as_me:5515: checking for PATH separator" >&5 + echo "$as_me:5745: checking for PATH separator" >&5 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 - case $cf_cv_system_name in + case "$cf_cv_system_name" in (os2*) PATH_SEPARATOR=';' ;; (*) ${PATH_SEPARATOR:=':'} ;; esac - echo "$as_me:5522: result: $PATH_SEPARATOR" >&5 + echo "$as_me:5752: result: $PATH_SEPARATOR" >&5 echo "${ECHO_T}$PATH_SEPARATOR" >&6 ############################################################################### -echo "$as_me:5527: checking if you want to build a separate terminfo library" >&5 +echo "$as_me:5757: checking if you want to build a separate terminfo library" >&5 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6 # Check whether --with-termlib or --without-termlib was given. @@ -5534,10 +5764,10 @@ if test "${with_termlib+set}" = set; then else with_termlib=no fi; -echo "$as_me:5537: result: $with_termlib" >&5 +echo "$as_me:5767: result: $with_termlib" >&5 echo "${ECHO_T}$with_termlib" >&6 -echo "$as_me:5540: checking if you want to build a separate tic library" >&5 +echo "$as_me:5770: checking if you want to build a separate tic library" >&5 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6 # Check whether --with-ticlib or --without-ticlib was given. @@ -5547,7 +5777,7 @@ if test "${with_ticlib+set}" = set; then else with_ticlib=no fi; -echo "$as_me:5550: result: $with_ticlib" >&5 +echo "$as_me:5780: result: $with_ticlib" >&5 echo "${ECHO_T}$with_ticlib" >&6 if test X"$CC_G_OPT" = X"" ; then @@ -5560,22 +5790,22 @@ if test X"$CXX_G_OPT" = X"" ; then test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT='' fi -echo "$as_me:5563: checking for default loader flags" >&5 +echo "$as_me:5793: checking for default loader flags" >&5 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 -case $DFT_LWR_MODEL in +case "$DFT_LWR_MODEL" in (libtool) LD_MODEL='' ;; (normal) LD_MODEL='' ;; (debug) LD_MODEL=$CC_G_OPT ;; (profile) LD_MODEL='-pg';; (shared) LD_MODEL='' ;; esac -echo "$as_me:5572: result: $LD_MODEL" >&5 +echo "$as_me:5802: result: $LD_MODEL" >&5 echo "${ECHO_T}$LD_MODEL" >&6 -case $DFT_LWR_MODEL in +case "$DFT_LWR_MODEL" in (shared) -echo "$as_me:5578: checking if rpath option should be used" >&5 +echo "$as_me:5808: checking if rpath option should be used" >&5 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 # Check whether --enable-rpath or --disable-rpath was given. @@ -5585,10 +5815,10 @@ if test "${enable_rpath+set}" = set; then else cf_cv_enable_rpath=no fi; -echo "$as_me:5588: result: $cf_cv_enable_rpath" >&5 +echo "$as_me:5818: result: $cf_cv_enable_rpath" >&5 echo "${ECHO_T}$cf_cv_enable_rpath" >&6 -echo "$as_me:5591: checking if shared libraries should be relinked during install" >&5 +echo "$as_me:5821: checking if shared libraries should be relinked during install" >&5 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6 # Check whether --enable-relink or --disable-relink was given. @@ -5598,7 +5828,7 @@ if test "${enable_relink+set}" = set; then else cf_cv_do_relink=yes fi; -echo "$as_me:5601: result: $cf_cv_do_relink" >&5 +echo "$as_me:5831: result: $cf_cv_do_relink" >&5 echo "${ECHO_T}$cf_cv_do_relink" >&6 ;; esac @@ -5609,9 +5839,9 @@ rel_builddir=.. LD_RPATH_OPT= if test "x$cf_cv_enable_rpath" != xno then - echo "$as_me:5612: checking for an rpath option" >&5 + echo "$as_me:5842: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 - case $cf_cv_system_name in + case "$cf_cv_system_name" in (irix*) if test "$GCC" = yes; then LD_RPATH_OPT="-Wl,-rpath," @@ -5640,12 +5870,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 (*) ;; esac - echo "$as_me:5643: result: $LD_RPATH_OPT" >&5 + echo "$as_me:5873: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:5648: checking if we need a space after rpath option" >&5 + echo "$as_me:5878: checking if we need a space after rpath option" >&5 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -5665,8 +5895,8 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 5669 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5899 "configure" #include "confdefs.h" int @@ -5677,27 +5907,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5681: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:5911: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5684: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5687: \"$ac_try\"") >&5 + echo "$as_me:5914: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:5917: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5690: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5920: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_rpath_space=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_rpath_space=yes fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:5700: result: $cf_rpath_space" >&5 + echo "$as_me:5930: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; @@ -5719,14 +5949,14 @@ fi cf_ld_rpath_opt= test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - echo "$as_me:5722: checking if release/abi version should be used for shared libs" >&5 + echo "$as_me:5952: checking if release/abi version should be used for shared libs" >&5 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 # Check whether --with-shlib-version or --without-shlib-version was given. if test "${with_shlib_version+set}" = set; then withval="$with_shlib_version" test -z "$withval" && withval=auto - case $withval in + case "$withval" in (yes) cf_cv_shlib_version=auto ;; @@ -5734,9 +5964,9 @@ if test "${with_shlib_version+set}" = set; then cf_cv_shlib_version=$withval ;; (*) - echo "$as_me:5737: result: $withval" >&5 + echo "$as_me:5967: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 - { { echo "$as_me:5739: error: option value must be one of: rel, abi, or auto" >&5 + { { echo "$as_me:5969: error: option value must be one of: rel, abi, or auto" >&5 echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} { (exit 1); exit 1; }; } ;; @@ -5745,7 +5975,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} else cf_cv_shlib_version=auto fi; - echo "$as_me:5748: result: $cf_cv_shlib_version" >&5 + echo "$as_me:5978: result: $cf_cv_shlib_version" >&5 echo "${ECHO_T}$cf_cv_shlib_version" >&6 cf_cv_rm_so_locs=no @@ -5759,7 +5989,7 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 then cf_try_fPIC=yes else - case $cf_cv_system_name in + case "$cf_cv_system_name" in (*linux*) # e.g., PGI compiler cf_try_fPIC=yes ;; @@ -5768,14 +5998,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 if test "$cf_try_fPIC" = yes then - echo "$as_me:5771: checking which $CC option to use" >&5 + echo "$as_me:6001: checking which $CC option to use" >&5 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" for CC_SHARED_OPTS in -fPIC -fpic '' do CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" - cat >conftest.$ac_ext <<_ACEOF -#line 5778 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6008 "configure" #include "confdefs.h" #include int @@ -5786,33 +6016,33 @@ int x = 1 return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5790: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:6020: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5793: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5796: \"$ac_try\"") >&5 + echo "$as_me:6023: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:6026: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5799: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6029: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done - echo "$as_me:5808: result: $CC_SHARED_OPTS" >&5 + echo "$as_me:6038: result: $CC_SHARED_OPTS" >&5 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 CFLAGS="$cf_save_CFLAGS" fi cf_cv_shlib_version_infix=no - case $cf_cv_system_name in + case "$cf_cv_system_name" in (aix4.3-9*|aix[5-7]*) if test "$GCC" = yes; then CC_SHARED_OPTS='-Wl,-brtl' @@ -5876,7 +6106,7 @@ CF_EOF MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi cf_cv_shlib_version_infix=yes - echo "$as_me:5879: checking if ld -search_paths_first works" >&5 + echo "$as_me:6109: checking if ld -search_paths_first works" >&5 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5884,8 +6114,8 @@ else cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" - cat >conftest.$ac_ext <<_ACEOF -#line 5888 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6118 "configure" #include "confdefs.h" int @@ -5896,30 +6126,30 @@ int i; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5900: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6130: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5903: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5906: \"$ac_try\"") >&5 + echo "$as_me:6133: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6136: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5909: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6139: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_ldflags_search_paths_first=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_ldflags_search_paths_first=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LDFLAGS=$cf_save_LDFLAGS fi -echo "$as_me:5920: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "$as_me:6150: result: $cf_cv_ldflags_search_paths_first" >&5 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 - if test $cf_cv_ldflags_search_paths_first = yes; then + if test "$cf_cv_ldflags_search_paths_first" = yes; then LDFLAGS="$LDFLAGS -Wl,-search_paths_first" fi ;; @@ -6015,6 +6245,81 @@ EOF mv "\${IMPORT_LIB}" "\${IMPORT_LIB}" CF_EOF chmod +x mk_shared_lib.sh + cat >mk_prog.sh <<-CF_EOF + #!$SHELL + shift + # Ignore first argument (compiler) and use LD (link.exe) unconditionally + LD="$LD" + clopts=() + ldopts=("/subsystem:console") + libs=() + isdll=0 + while test \$# -gt 0; do + case "\$1" in + -link) + # ignore -link argument + ;; + -M[TD] | -M[TD]d) + # ignore runtime-library option + ;; + -dll) + isdll=1 + ;; + -W* | -w*) + # ignore warnings + ;; + -D*) + clopts+=("\$1") + ;; + -I*) + clopts+=("\$1") + ;; + -l*) + libs+=("\`echo \"\$1\" | sed \"s/^-l//\"\`") + ;; + -L*) + ldopts+=("\`echo \"\$1\" | sed \"s/^-L/-LIBPATH:/\"\`") + ;; + *.obj | *.o) + ldopts+=("\$1") + ;; + -Wl,*) + for linkarg in \`echo '\$1' | sed -e 's/-Wl,//' -e 's/,/ /'\`; do + ldopts+=("\${linkarg}") + done + ;; + *.lib) + ldopts+=("\$1") + ;; + -o) + shift + ldopts+=("-out:\$1") + ;; + *) + clopts+=("\$1") + ldopts+=("\$1") + ;; + esac + shift + done + if [ "\$isdll" -ne 0 ]; then + for lib in \${libs[*]}; do + ldopts+=("\$lib.dll.lib") + done + else + for lib in \${libs[*]}; do + ldopts+=("\$lib.lib") + done + fi + cat <<-EOF + Creating program + ** ld options: "\${ldopts[@]}" +EOF + exec \$LD \${ldopts[@]} +CF_EOF + chmod +x mk_prog.sh + LINK_PROGS="$SHELL ${rel_builddir}/mk_prog.sh" + LINK_TESTS="$SHELL ${rel_builddir}/mk_prog.sh" ;; (mingw*) cf_cv_shlib_version=mingw @@ -6062,6 +6367,14 @@ CF_EOF MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' ;; + (nskJ*) + CC_SHARED_OPTS= + MK_SHARED_LIB='${LD} -Wshared -Weld=-export_all -o $@' + ;; + (nskL*) + CC_SHARED_OPTS= + MK_SHARED_LIB='${LD} -Wshared -Wxld=-export_all -o $@' + ;; (nto-qnx*|openbsd*|freebsd[12].*) CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" MK_SHARED_LIB='${LD} ${LDFLAGS} -Bshareable -o $@' @@ -6107,7 +6420,7 @@ CF_EOF MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@' else - MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -Wl,-shared -Wl,-Bshareable -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -o $@' fi ;; (osf*|mls+*) @@ -6115,7 +6428,7 @@ CF_EOF # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't # link with shared libs). MK_SHARED_LIB='${LD} ${LDFLAGS} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $@`' - case $host_os in + case "$host_os" in (osf4*) MK_SHARED_LIB="${MK_SHARED_LIB} -msym" ;; @@ -6172,36 +6485,36 @@ CF_EOF for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" - cat >conftest.$ac_ext <<_ACEOF -#line 6176 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6489 "configure" #include "confdefs.h" #include int main (void) { -printf("Hello\n"); +printf("Hello\\n"); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:6188: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:6501: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6191: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6194: \"$ac_try\"") >&5 + echo "$as_me:6504: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:6507: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6197: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6510: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done CFLAGS="$cf_save_CFLAGS" CC_SHARED_OPTS=$cf_shared_opts @@ -6231,7 +6544,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes ;; (*) - { echo "$as_me:6234: WARNING: ignored --with-shlib-version" >&5 + { echo "$as_me:6547: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac @@ -6241,11 +6554,11 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} if test -n "$cf_try_cflags" then cat > conftest.$ac_ext < int main(int argc, char *argv[]) { - printf("hello\n"); + printf("hello\\n"); return (argv[argc-1] == 0) ; } EOF @@ -6253,18 +6566,18 @@ EOF for cf_opt in $cf_try_cflags do CFLAGS="$cf_save_CFLAGS -$cf_opt" - echo "$as_me:6256: checking if CFLAGS option -$cf_opt works" >&5 + echo "$as_me:6569: checking if CFLAGS option -$cf_opt works" >&5 echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 - if { (eval echo "$as_me:6258: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:6571: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6261: \$? = $ac_status" >&5 - (exit $ac_status); }; then - echo "$as_me:6263: result: yes" >&5 + echo "$as_me:6574: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + echo "$as_me:6576: result: yes" >&5 echo "${ECHO_T}yes" >&6 cf_save_CFLAGS="$CFLAGS" else - echo "$as_me:6267: result: no" >&5 + echo "$as_me:6580: result: no" >&5 echo "${ECHO_T}no" >&6 fi done @@ -6275,21 +6588,21 @@ echo "${ECHO_T}no" >&6 test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}" test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}" - test $cf_cv_rm_so_locs = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations" + test "$cf_cv_rm_so_locs" = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations" test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 -echo "${as_me:-configure}:6282: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 +echo "${as_me:-configure}:6595: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:6286: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:6599: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 -for model in $cf_list_models; do - case $model in +for model in $cf_list_models ; do + case "$model" in (libtool) -echo "$as_me:6292: checking for additional libtool options" >&5 +echo "$as_me:6605: checking for additional libtool options" >&5 echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6 # Check whether --with-libtool-opts or --without-libtool-opts was given. @@ -6299,7 +6612,7 @@ if test "${with_libtool_opts+set}" = set; then else with_libtool_opts=no fi; -echo "$as_me:6302: result: $with_libtool_opts" >&5 +echo "$as_me:6615: result: $with_libtool_opts" >&5 echo "${ECHO_T}$with_libtool_opts" >&6 case .$with_libtool_opts in @@ -6310,7 +6623,7 @@ case .$with_libtool_opts in ;; esac -echo "$as_me:6313: checking if exported-symbols file should be used" >&5 +echo "$as_me:6626: checking if exported-symbols file should be used" >&5 echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6 # Check whether --with-export-syms or --without-export-syms was given. @@ -6325,7 +6638,7 @@ then with_export_syms='${top_srcdir}/package/${PACKAGE}.sym' fi -echo "$as_me:6328: result: $with_export_syms" >&5 +echo "$as_me:6641: result: $with_export_syms" >&5 echo "${ECHO_T}$with_export_syms" >&6 if test "x$with_export_syms" != xno then @@ -6336,56 +6649,56 @@ fi ;; (shared) if test "$CC_SHARED_OPTS" = "unknown"; then - { { echo "$as_me:6339: error: Shared libraries are not supported in this version" >&5 + { { echo "$as_me:6652: error: Shared libraries are not supported in this version" >&5 echo "$as_me: error: Shared libraries are not supported in this version" >&2;} { (exit 1); exit 1; }; } fi # workaround for inept transition to PIE vs PIC... - echo "$as_me:6344: checking if current CFLAGS link properly" >&5 + echo "$as_me:6657: checking if current CFLAGS link properly" >&5 echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 6347 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6660 "configure" #include "confdefs.h" #include int main (void) { -printf("Hello work\n"); +printf("Hello work\\n"); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6359: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6672: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6362: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6365: \"$ac_try\"") >&5 + echo "$as_me:6675: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6678: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6368: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6681: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cflags_work=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cflags_work=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:6377: result: $cf_cflags_work" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:6690: result: $cf_cflags_work" >&5 echo "${ECHO_T}$cf_cflags_work" >&6 if test "$cf_cflags_work" = no then test -n "$verbose" && echo " try to work around by appending shared-options" 1>&6 -echo "${as_me:-configure}:6383: testing try to work around by appending shared-options ..." 1>&5 +echo "${as_me:-configure}:6696: testing try to work around by appending shared-options ..." 1>&5 CFLAGS="$CFLAGS $CC_SHARED_OPTS" fi -echo "$as_me:6388: checking if versioned-symbols file should be used" >&5 +echo "$as_me:6701: checking if versioned-symbols file should be used" >&5 echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6 # Check whether --with-versioned-syms or --without-versioned-syms was given. @@ -6403,18 +6716,18 @@ case "x$with_versioned_syms" in (xno) ;; (x/*) - test -f "$with_versioned_syms" || { { echo "$as_me:6406: error: expected a filename: $with_versioned_syms" >&5 + test -f "$with_versioned_syms" || { { echo "$as_me:6719: error: expected a filename: $with_versioned_syms" >&5 echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;} { (exit 1); exit 1; }; } ;; (*) - test -f "$with_versioned_syms" || { { echo "$as_me:6411: error: expected a filename: $with_versioned_syms" >&5 + test -f "$with_versioned_syms" || { { echo "$as_me:6724: error: expected a filename: $with_versioned_syms" >&5 echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;} { (exit 1); exit 1; }; } with_versioned_syms=`pwd`/"$with_versioned_syms" ;; esac -echo "$as_me:6417: result: $with_versioned_syms" >&5 +echo "$as_me:6730: result: $with_versioned_syms" >&5 echo "${ECHO_T}$with_versioned_syms" >&6 RESULTING_SYMS= @@ -6430,7 +6743,7 @@ then MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"` test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:6433: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:6746: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ;; (*-dy\ *) @@ -6438,11 +6751,11 @@ echo "${as_me:-configure}:6433: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"` test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:6441: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:6754: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ;; (*) - { echo "$as_me:6445: WARNING: this system does not support versioned-symbols" >&5 + { echo "$as_me:6758: WARNING: this system does not support versioned-symbols" >&5 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;} ;; esac @@ -6454,7 +6767,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;} # symbols. if test "x$VERSIONED_SYMS" != "x" then - echo "$as_me:6457: checking if wildcards can be used to selectively omit symbols" >&5 + echo "$as_me:6770: checking if wildcards can be used to selectively omit symbols" >&5 echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6 WILDCARD_SYMS=no @@ -6491,7 +6804,7 @@ local: } submodule_1.0; EOF cat >conftest.$ac_ext <&5 >/dev/null then # test for missing symbol in either Data or Text section - cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ ][DT][ ]'` + cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[ ][DT][ ]'`" test -n "$cf_missing" && WILDCARD_SYMS=yes fi - echo "$as_me:6525: result: $WILDCARD_SYMS" >&5 + echo "$as_me:6838: result: $WILDCARD_SYMS" >&5 echo "${ECHO_T}$WILDCARD_SYMS" >&6 rm -f conftest.* fi @@ -6535,7 +6848,7 @@ done ### Checks for special libraries, must be done up-front. SHLIB_LIST="" -echo "$as_me:6538: checking if you want to link with the GPM mouse library" >&5 +echo "$as_me:6851: checking if you want to link with the GPM mouse library" >&5 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6 # Check whether --with-gpm or --without-gpm was given. @@ -6545,28 +6858,28 @@ if test "${with_gpm+set}" = set; then else with_gpm=maybe fi; -echo "$as_me:6548: result: $with_gpm" >&5 +echo "$as_me:6861: result: $with_gpm" >&5 echo "${ECHO_T}$with_gpm" >&6 if test "$with_gpm" != no ; then - echo "$as_me:6552: checking for gpm.h" >&5 + echo "$as_me:6865: checking for gpm.h" >&5 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6 if test "${ac_cv_header_gpm_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 6558 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6871 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:6562: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:6875: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:6568: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:6881: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -6579,14 +6892,14 @@ if test -z "$ac_cpp_err"; then ac_cv_header_gpm_h=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 ac_cv_header_gpm_h=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6587: result: $ac_cv_header_gpm_h" >&5 +echo "$as_me:6900: result: $ac_cv_header_gpm_h" >&5 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6 -if test $ac_cv_header_gpm_h = yes; then +if test "$ac_cv_header_gpm_h" = yes; then cat >>confdefs.h <<\EOF #define HAVE_GPM_H 1 @@ -6595,7 +6908,7 @@ EOF if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then test -n "$verbose" && echo " assuming we really have GPM library" 1>&6 -echo "${as_me:-configure}:6598: testing assuming we really have GPM library ..." 1>&5 +echo "${as_me:-configure}:6911: testing assuming we really have GPM library ..." 1>&5 cat >>confdefs.h <<\EOF #define HAVE_LIBGPM 1 @@ -6603,15 +6916,15 @@ EOF with_gpm=yes else - echo "$as_me:6606: checking for Gpm_Open in -lgpm" >&5 + echo "$as_me:6919: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 6614 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 6927 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6629,39 +6942,39 @@ Gpm_Open (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6633: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6946: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6636: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6639: \"$ac_try\"") >&5 + echo "$as_me:6949: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6952: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6642: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6955: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_gpm_Gpm_Open=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6653: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:6966: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 -if test $ac_cv_lib_gpm_Gpm_Open = yes; then +if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then with_gpm=yes else if test "$with_gpm" = maybe; then - { echo "$as_me:6660: WARNING: Cannot link with GPM library" >&5 + { echo "$as_me:6973: WARNING: Cannot link with GPM library" >&5 echo "$as_me: WARNING: Cannot link with GPM library" >&2;} with_gpm=no else - { { echo "$as_me:6664: error: Cannot link with GPM library" >&5 + { { echo "$as_me:6977: error: Cannot link with GPM library" >&5 echo "$as_me: error: Cannot link with GPM library" >&2;} { (exit 1); exit 1; }; } fi @@ -6672,7 +6985,7 @@ fi else - test "$with_gpm" != maybe && { echo "$as_me:6675: WARNING: Cannot find GPM header" >&5 + test "$with_gpm" != maybe && { echo "$as_me:6988: WARNING: Cannot find GPM header" >&5 echo "$as_me: WARNING: Cannot find GPM header" >&2;} with_gpm=no @@ -6681,7 +6994,7 @@ fi fi if test "$with_gpm" != no ; then - echo "$as_me:6684: checking if you want to load GPM dynamically" >&5 + echo "$as_me:6997: checking if you want to load GPM dynamically" >&5 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6 # Check whether --with-dlsym or --without-dlsym was given. @@ -6691,18 +7004,18 @@ if test "${with_dlsym+set}" = set; then else with_dlsym=yes fi; - echo "$as_me:6694: result: $with_dlsym" >&5 + echo "$as_me:7007: result: $with_dlsym" >&5 echo "${ECHO_T}$with_dlsym" >&6 if test "x$with_dlsym" = xyes ; then cf_have_dlsym=no -echo "$as_me:6699: checking for dlsym" >&5 +echo "$as_me:7012: checking for dlsym" >&5 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6 if test "${ac_cv_func_dlsym+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 6705 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 7018 "configure" #include "confdefs.h" #define dlsym autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -6732,42 +7045,42 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6736: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7049: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6739: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6742: \"$ac_try\"") >&5 + echo "$as_me:7052: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7055: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6745: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7058: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_dlsym=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_dlsym=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:6755: result: $ac_cv_func_dlsym" >&5 +echo "$as_me:7068: result: $ac_cv_func_dlsym" >&5 echo "${ECHO_T}$ac_cv_func_dlsym" >&6 -if test $ac_cv_func_dlsym = yes; then +if test "$ac_cv_func_dlsym" = yes; then cf_have_dlsym=yes else cf_have_libdl=no -echo "$as_me:6762: checking for dlsym in -ldl" >&5 +echo "$as_me:7075: checking for dlsym in -ldl" >&5 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 if test "${ac_cv_lib_dl_dlsym+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 6770 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7083 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6785,30 +7098,30 @@ dlsym (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6789: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7102: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6792: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6795: \"$ac_try\"") >&5 + echo "$as_me:7105: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7108: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6798: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7111: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_dl_dlsym=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_dl_dlsym=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6809: result: $ac_cv_lib_dl_dlsym" >&5 +echo "$as_me:7122: result: $ac_cv_lib_dl_dlsym" >&5 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 -if test $ac_cv_lib_dl_dlsym = yes; then +if test "$ac_cv_lib_dl_dlsym" = yes; then cf_have_dlsym=yes cf_have_libdl=yes @@ -6835,10 +7148,10 @@ done LIBS="$cf_add_libs" } - echo "$as_me:6838: checking whether able to link to dl*() functions" >&5 + echo "$as_me:7151: checking whether able to link to dl*() functions" >&5 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 6841 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 7154 "configure" #include "confdefs.h" #include int @@ -6855,18 +7168,18 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6859: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7172: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6862: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6865: \"$ac_try\"") >&5 + echo "$as_me:7175: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7178: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6868: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7181: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cat >>confdefs.h <<\EOF #define HAVE_LIBDL 1 @@ -6874,17 +7187,17 @@ EOF else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 - { { echo "$as_me:6879: error: Cannot link test program for libdl" >&5 + { { echo "$as_me:7192: error: Cannot link test program for libdl" >&5 echo "$as_me: error: Cannot link test program for libdl" >&2;} { (exit 1); exit 1; }; } fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:6884: result: ok" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:7197: result: ok" >&5 echo "${ECHO_T}ok" >&6 else - { { echo "$as_me:6887: error: Cannot find dlsym function" >&5 + { { echo "$as_me:7200: error: Cannot find dlsym function" >&5 echo "$as_me: error: Cannot find dlsym function" >&2;} { (exit 1); exit 1; }; } fi @@ -6892,12 +7205,12 @@ fi if test "x$with_gpm" != xyes ; then test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 -echo "${as_me:-configure}:6895: testing assuming soname for gpm is $with_gpm ..." 1>&5 +echo "${as_me:-configure}:7208: testing assuming soname for gpm is $with_gpm ..." 1>&5 cf_cv_gpm_soname="$with_gpm" else -echo "$as_me:6900: checking for soname of gpm library" >&5 +echo "$as_me:7213: checking for soname of gpm library" >&5 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6 if test "${cf_cv_gpm_soname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6931,26 +7244,26 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - if { (eval echo "$as_me:6934: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:7247: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6937: \$? = $ac_status" >&5 - (exit $ac_status); } ; then - if { (eval echo "$as_me:6939: \"$ac_link\"") >&5 + echo "$as_me:7250: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + if { (eval echo "$as_me:7252: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6942: \$? = $ac_status" >&5 - (exit $ac_status); } ; then - cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.` + echo "$as_me:7255: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`" test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown fi fi -rm -rf conftest* +rm -rf ./conftest* LIBS="$cf_save_LIBS" fi fi -echo "$as_me:6953: result: $cf_cv_gpm_soname" >&5 +echo "$as_me:7266: result: $cf_cv_gpm_soname" >&5 echo "${ECHO_T}$cf_cv_gpm_soname" >&6 fi @@ -7018,15 +7331,15 @@ cat >>confdefs.h <<\EOF #define HAVE_LIBGPM 1 EOF -echo "$as_me:7021: checking for Gpm_Wgetch in -lgpm" >&5 +echo "$as_me:7334: checking for Gpm_Wgetch in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 7029 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7342 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7044,32 +7357,32 @@ Gpm_Wgetch (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7048: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7361: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7051: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7054: \"$ac_try\"") >&5 + echo "$as_me:7364: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7367: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7057: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7370: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Wgetch=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_gpm_Gpm_Wgetch=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7068: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 +echo "$as_me:7381: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6 -if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then +if test "$ac_cv_lib_gpm_Gpm_Wgetch" = yes; then -echo "$as_me:7072: checking if GPM is weakly bound to curses library" >&5 +echo "$as_me:7385: checking if GPM is weakly bound to curses library" >&5 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6 if test "${cf_cv_check_gpm_wgetch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7093,31 +7406,31 @@ CF_EOF # to rely on the static library, noting that some packagers may not # include it. LIBS="-static -lgpm -dynamic $LIBS" - if { (eval echo "$as_me:7096: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:7409: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7099: \$? = $ac_status" >&5 - (exit $ac_status); } ; then - if { (eval echo "$as_me:7101: \"$ac_link\"") >&5 + echo "$as_me:7412: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + if { (eval echo "$as_me:7414: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7104: \$? = $ac_status" >&5 - (exit $ac_status); } ; then - cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\' | egrep '\<[vVwW]\>'` + echo "$as_me:7417: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\' | ${EGREP-egrep} '\<[vVwW]\>'`" test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes test -z "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=no fi fi - rm -rf conftest* + rm -rf ./conftest* LIBS="$cf_save_LIBS" fi fi -echo "$as_me:7116: result: $cf_cv_check_gpm_wgetch" >&5 +echo "$as_me:7429: result: $cf_cv_check_gpm_wgetch" >&5 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6 if test "$cf_cv_check_gpm_wgetch" != yes ; then - { echo "$as_me:7120: WARNING: GPM library is already linked with curses - read the FAQ" >&5 + { echo "$as_me:7433: WARNING: GPM library is already linked with curses - read the FAQ" >&5 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;} fi @@ -7125,7 +7438,7 @@ fi fi -echo "$as_me:7128: checking if you want to use PCRE2 for regular-expressions" >&5 +echo "$as_me:7441: checking if you want to use PCRE2 for regular-expressions" >&5 echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6 # Check whether --with-pcre2 or --without-pcre2 was given. @@ -7134,25 +7447,28 @@ if test "${with_pcre2+set}" = set; then fi; test -z "$with_pcre2" && with_pcre2=no -echo "$as_me:7137: result: $with_pcre2" >&5 +echo "$as_me:7450: result: $with_pcre2" >&5 echo "${ECHO_T}$with_pcre2" >&6 if test "x$with_pcre2" != xno ; then + cf_with_pcre2_ok=no + for cf_with_pcre2 in libpcre2 libpcre2-posix libpcre + do -if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre2; then - test -n "$verbose" && echo " found package libpcre2" 1>&6 +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then + test -n "$verbose" && echo " found package $cf_with_pcre2" 1>&6 -echo "${as_me:-configure}:7145: testing found package libpcre2 ..." 1>&5 +echo "${as_me:-configure}:7461: testing found package $cf_with_pcre2 ..." 1>&5 - cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre2 2>/dev/null`" - cf_pkgconfig_libs="`$PKG_CONFIG --libs libpcre2 2>/dev/null`" - test -n "$verbose" && echo " package libpcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6 + cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs "$cf_with_pcre2" 2>/dev/null`" + test -n "$verbose" && echo " package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:7151: testing package libpcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:7467: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 - test -n "$verbose" && echo " package libpcre2 LIBS: $cf_pkgconfig_libs" 1>&6 + test -n "$verbose" && echo " package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:7155: testing package libpcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:7471: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -7161,19 +7477,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -7192,7 +7508,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -7222,7 +7538,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -7268,239 +7584,105 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - : + cf_with_pcre2_ok=yes; break else cf_pkgconfig_incs= cf_pkgconfig_libs= + : +fi -if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre; then - test -n "$verbose" && echo " found package libpcre" 1>&6 + done + cf_with_pcre2_ok=yes || { { echo "$as_me:7595: error: Cannot find PCRE2 library" >&5 +echo "$as_me: error: Cannot find PCRE2 library" >&2;} + { (exit 1); exit 1; }; } -echo "${as_me:-configure}:7279: testing found package libpcre ..." 1>&5 +cat >>confdefs.h <<\EOF +#define HAVE_LIB_PCRE2 1 +EOF - cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre 2>/dev/null`" - cf_pkgconfig_libs="`$PKG_CONFIG --libs libpcre 2>/dev/null`" - test -n "$verbose" && echo " package libpcre CFLAGS: $cf_pkgconfig_incs" 1>&6 + # if pkgconfig gave no results, look for the libraries directly + case "$LIBS" in + (*pcre2-posix*|*pcreposix*) + ;; + (*) + echo "$as_me:7608: checking for regcomp in -lpcre2-posix" >&5 +echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6 +if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpcre2-posix $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7616 "configure" +#include "confdefs.h" -echo "${as_me:-configure}:7285: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char regcomp (); +int +main (void) +{ +regcomp (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7635: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7638: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7641: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7644: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_pcre2_posix_regcomp=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_pcre2_posix_regcomp=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7655: result: $ac_cv_lib_pcre2_posix_regcomp" >&5 +echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6 +if test "$ac_cv_lib_pcre2_posix_regcomp" = yes; then - test -n "$verbose" && echo " package libpcre LIBS: $cf_pkgconfig_libs" 1>&6 +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lpcre2-posix; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" -echo "${as_me:-configure}:7289: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5 - -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= - -for cf_add_cflags in $cf_pkgconfig_incs -do -case $cf_fix_cppflags in -(no) - case $cf_add_cflags in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in - (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - - if test $cf_fix_cppflags = yes ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - elif test "${cf_tst_cflags}" = "\"'" ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - fi - ;; - esac - case "$CPPFLAGS" in - (*$cf_add_cflags) - ;; - (*) - case $cf_add_cflags in - (-D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` - - ;; - esac - - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" - - ;; - esac - ;; - (*) - - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" - - ;; - esac - ;; -(yes) - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac -done - -if test -n "$cf_new_cflags" ; then - - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" - -fi - -if test -n "$cf_new_cppflags" ; then - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" - -fi - -if test -n "$cf_new_extra_cppflags" ; then - - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" - -fi - -cf_add_libs="$LIBS" -# reverse order -cf_add_0lib= -for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done -# filter duplicates -for cf_add_1lib in $cf_add_0lib; do - for cf_add_2lib in $cf_add_libs; do - if test "x$cf_add_1lib" = "x$cf_add_2lib"; then - cf_add_1lib= - break - fi - done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" -done -LIBS="$cf_add_libs" - - : -else - cf_pkgconfig_incs= - cf_pkgconfig_libs= - - { { echo "$as_me:7410: error: Cannot find PCRE2 library" >&5 -echo "$as_me: error: Cannot find PCRE2 library" >&2;} - { (exit 1); exit 1; }; } -fi - -fi - -cat >>confdefs.h <<\EOF -#define HAVE_LIB_PCRE2 1 -EOF - - # if pkgconfig gave no results, look for the libraries directly - case $LIBS in - (*pcre2-posix*|*pcreposix*) - ;; - (*) - echo "$as_me:7426: checking for regcomp in -lpcre2-posix" >&5 -echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6 -if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpcre2-posix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 7434 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char regcomp (); -int -main (void) -{ -regcomp (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7453: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:7456: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7459: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:7462: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_pcre2_posix_regcomp=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_pcre2_posix_regcomp=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:7473: result: $ac_cv_lib_pcre2_posix_regcomp" >&5 -echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6 -if test $ac_cv_lib_pcre2_posix_regcomp = yes; then - -cf_add_libs="$LIBS" -# reverse order -cf_add_0lib= -for cf_add_1lib in -lpcre2-posix; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done -# filter duplicates -for cf_add_1lib in $cf_add_0lib; do - for cf_add_2lib in $cf_add_libs; do - if test "x$cf_add_1lib" = "x$cf_add_2lib"; then - cf_add_1lib= - break - fi - done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" -done -LIBS="$cf_add_libs" - -else - echo "$as_me:7494: checking for regcomp in -lpcreposix" >&5 -echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6 -if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpcreposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 7502 "configure" -#include "confdefs.h" +else + echo "$as_me:7676: checking for regcomp in -lpcreposix" >&5 +echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6 +if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpcreposix $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7684 "configure" +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -7517,30 +7699,30 @@ regcomp (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7521: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7703: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7524: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7527: \"$ac_try\"") >&5 + echo "$as_me:7706: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7709: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7530: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7712: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_pcreposix_regcomp=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_pcreposix_regcomp=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7541: result: $ac_cv_lib_pcreposix_regcomp" >&5 +echo "$as_me:7723: result: $ac_cv_lib_pcreposix_regcomp" >&5 echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6 -if test $ac_cv_lib_pcreposix_regcomp = yes; then +if test "$ac_cv_lib_pcreposix_regcomp" = yes; then cf_add_libs="$LIBS" # reverse order @@ -7559,7 +7741,7 @@ done LIBS="$cf_add_libs" else - { { echo "$as_me:7562: error: Cannot find PCRE2 POSIX library" >&5 + { { echo "$as_me:7744: error: Cannot find PCRE2 POSIX library" >&5 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;} { (exit 1); exit 1; }; } fi @@ -7574,24 +7756,24 @@ fi for ac_header in pcre2posix.h pcreposix.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:7577: checking for $ac_header" >&5 +echo "$as_me:7759: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 7583 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 7765 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:7587: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:7769: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:7593: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:7775: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -7604,14 +7786,14 @@ if test -z "$ac_cpp_err"; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:7612: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then +echo "$as_me:7794: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h </dev/null ; then -echo "$as_me:7626: checking if you want to use sysmouse" >&5 +echo "$as_me:7808: checking if you want to use sysmouse" >&5 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6 # Check whether --with-sysmouse or --without-sysmouse was given. @@ -7634,8 +7816,8 @@ else cf_with_sysmouse=maybe fi; if test "$cf_with_sysmouse" != no ; then - cat >conftest.$ac_ext <<_ACEOF -#line 7638 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 7820 "configure" #include "confdefs.h" #include @@ -7657,27 +7839,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7661: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:7843: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7664: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7667: \"$ac_try\"") >&5 + echo "$as_me:7846: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:7849: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7670: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7852: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_with_sysmouse=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_with_sysmouse=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:7680: result: $cf_with_sysmouse" >&5 +echo "$as_me:7862: result: $cf_with_sysmouse" >&5 echo "${ECHO_T}$cf_with_sysmouse" >&6 test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF @@ -7687,7 +7869,7 @@ EOF fi # pretend that ncurses==ncursesw==ncursest -echo "$as_me:7690: checking if you want to disable library suffixes" >&5 +echo "$as_me:7872: checking if you want to disable library suffixes" >&5 echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6 # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given. @@ -7704,13 +7886,13 @@ else disable_lib_suffixes=no fi; -echo "$as_me:7707: result: $disable_lib_suffixes" >&5 +echo "$as_me:7889: result: $disable_lib_suffixes" >&5 echo "${ECHO_T}$disable_lib_suffixes" >&6 ### If we're building with rpath, try to link non-standard libs that way too. if test "$DFT_LWR_MODEL" = "shared" && test "x$cf_cv_enable_rpath" != xno; then -echo "$as_me:7713: checking if rpath-hack should be disabled" >&5 +echo "$as_me:7895: checking if rpath-hack should be disabled" >&5 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 # Check whether --enable-rpath-hack or --disable-rpath-hack was given. @@ -7718,30 +7900,32 @@ if test "${enable_rpath_hack+set}" = set; then enableval="$enable_rpath_hack" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - cf_disable_rpath_hack=yes + enable_rpath_hack=no else - cf_disable_rpath_hack=no + enable_rpath_hack=yes fi else enableval=yes - cf_disable_rpath_hack=no + enable_rpath_hack=yes fi; -echo "$as_me:7730: result: $cf_disable_rpath_hack" >&5 +if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi +echo "$as_me:7913: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 -if test "$cf_disable_rpath_hack" = no ; then -echo "$as_me:7734: checking for updated LDFLAGS" >&5 +if test "$enable_rpath_hack" = yes ; then + +echo "$as_me:7918: checking for updated LDFLAGS" >&5 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 if test -n "$LD_RPATH_OPT" ; then - echo "$as_me:7737: result: maybe" >&5 + echo "$as_me:7921: result: maybe" >&5 echo "${ECHO_T}maybe" >&6 for ac_prog in ldd do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:7744: checking for $ac_word" >&5 +echo "$as_me:7928: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7756,7 +7940,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_cf_ldd_prog="$ac_prog" -echo "$as_me:7759: found $ac_dir/$ac_word" >&5 +echo "$as_me:7943: found $ac_dir/$ac_word" >&5 break done @@ -7764,10 +7948,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:7767: result: $cf_ldd_prog" >&5 + echo "$as_me:7951: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:7770: result: no" >&5 + echo "$as_me:7954: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7780,8 +7964,8 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" then cf_rpath_oops= -cat >conftest.$ac_ext <<_ACEOF -#line 7784 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7968 "configure" #include "confdefs.h" #include int @@ -7792,25 +7976,25 @@ printf("Hello"); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7796: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7980: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7799: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7802: \"$ac_try\"") >&5 + echo "$as_me:7983: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7986: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7805: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq` - cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` + echo "$as_me:7989: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq` + cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" # If we passed the link-test, but get a "not found" on a given library, # this could be due to inept reconfiguration of gcc to make it only @@ -7826,11 +8010,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext /usr/pkg \ /opt/sfw do - if test -f $cf_rpath_dir/lib/$cf_rpath_src + if test -f "$cf_rpath_dir/lib/$cf_rpath_src" then test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 -echo "${as_me:-configure}:7833: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:8017: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -7842,16 +8026,16 @@ echo "${as_me:-configure}:7833: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:7845: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:8029: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:7849: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:8033: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS do - case $cf_rpath_src in + case "$cf_rpath_src" in (-L*) # check if this refers to a directory which we will ignore @@ -7883,7 +8067,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:7886: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:8070: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -7896,16 +8080,16 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:7899: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:8083: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:7903: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:8087: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS do - case $cf_rpath_src in + case "$cf_rpath_src" in (-L*) # check if this refers to a directory which we will ignore @@ -7937,7 +8121,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:7940: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:8124: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -7950,14 +8134,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:7953: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:8137: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:7957: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:8141: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:7960: result: no" >&5 + echo "$as_me:8144: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7965,10 +8149,38 @@ fi fi +### Depending on the system, someone may use rpath to build ncurses but not +# want users of the package to rely upon that feature. Give those people an +# option to suppress that detail from EXTRA_LDFLAGS. +EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" +if test -n "$EXTRA_PKG_LDFLAGS" +then + echo "$as_me:8158: checking if you want to disable extra LDFLAGS for package-scripts" >&5 +echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6 + +# Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given. +if test "${enable_pkg_ldflags+set}" = set; then + enableval="$enable_pkg_ldflags" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + disable_pkg_ldflags=yes + else + disable_pkg_ldflags=no + fi +else + enableval=yes + disable_pkg_ldflags=no + +fi; + echo "$as_me:8175: result: $disable_pkg_ldflags" >&5 +echo "${ECHO_T}$disable_pkg_ldflags" >&6 + test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS= +fi + ############################################################################### ### use option --with-extra-suffix to append suffix to headers and libraries -echo "$as_me:7971: checking if you wish to append extra suffix to header/library paths" >&5 +echo "$as_me:8183: checking if you wish to append extra suffix to header/library paths" >&5 echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6 EXTRA_SUFFIX= @@ -7976,7 +8188,7 @@ EXTRA_SUFFIX= if test "${with_extra_suffix+set}" = set; then withval="$with_extra_suffix" case x$withval in - (no) + (xno) ;; (xyes|x) EXTRA_SUFFIX=$cf_cv_abi_version @@ -7987,11 +8199,11 @@ if test "${with_extra_suffix+set}" = set; then esac fi; -echo "$as_me:7990: result: $EXTRA_SUFFIX" >&5 +echo "$as_me:8202: result: $EXTRA_SUFFIX" >&5 echo "${ECHO_T}$EXTRA_SUFFIX" >&6 ### use option --disable-overwrite to leave out the link to -lcurses -echo "$as_me:7994: checking if you wish to install ncurses overwriting curses" >&5 +echo "$as_me:8206: checking if you wish to install ncurses overwriting curses" >&5 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6 # Check whether --enable-overwrite or --disable-overwrite was given. @@ -8001,10 +8213,10 @@ if test "${enable_overwrite+set}" = set; then else if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi fi; -echo "$as_me:8004: result: $with_overwrite" >&5 +echo "$as_me:8216: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 -echo "$as_me:8007: checking if external terminfo-database is used" >&5 +echo "$as_me:8219: checking if external terminfo-database is used" >&5 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 # Check whether --enable-database or --disable-database was given. @@ -8014,10 +8226,10 @@ if test "${enable_database+set}" = set; then else use_database=yes fi; -echo "$as_me:8017: result: $use_database" >&5 +echo "$as_me:8229: result: $use_database" >&5 echo "${ECHO_T}$use_database" >&6 -case $host_os in +case "$host_os" in (os2*) TERMINFO_SRC='${top_srcdir}/misc/emx.src' ;; @@ -8030,7 +8242,7 @@ NCURSES_USE_DATABASE=0 if test "$use_database" != no ; then NCURSES_USE_DATABASE=1 - echo "$as_me:8033: checking which terminfo source-file will be installed" >&5 + echo "$as_me:8245: checking which terminfo source-file will be installed" >&5 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6 # Check whether --with-database or --without-database was given. @@ -8038,10 +8250,10 @@ if test "${with_database+set}" = set; then withval="$with_database" TERMINFO_SRC=$withval fi; - echo "$as_me:8041: result: $TERMINFO_SRC" >&5 + echo "$as_me:8253: result: $TERMINFO_SRC" >&5 echo "${ECHO_T}$TERMINFO_SRC" >&6 - echo "$as_me:8044: checking whether to use hashed database instead of directory/tree" >&5 + echo "$as_me:8256: checking whether to use hashed database instead of directory/tree" >&5 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6 # Check whether --with-hashed-db or --without-hashed-db was given. @@ -8051,13 +8263,13 @@ if test "${with_hashed_db+set}" = set; then else with_hashed_db=no fi; - echo "$as_me:8054: result: $with_hashed_db" >&5 + echo "$as_me:8266: result: $with_hashed_db" >&5 echo "${ECHO_T}$with_hashed_db" >&6 else with_hashed_db=no fi -echo "$as_me:8060: checking for list of fallback descriptions" >&5 +echo "$as_me:8272: checking for list of fallback descriptions" >&5 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6 # Check whether --with-fallbacks or --without-fallbacks was given. @@ -8067,7 +8279,7 @@ if test "${with_fallbacks+set}" = set; then else with_fallback= fi; -echo "$as_me:8070: result: $with_fallback" >&5 +echo "$as_me:8282: result: $with_fallback" >&5 echo "${ECHO_T}$with_fallback" >&6 case ".$with_fallback" in @@ -8075,7 +8287,7 @@ case ".$with_fallback" in FALLBACK_LIST= ;; (.yes) - { echo "$as_me:8078: WARNING: expected a list of terminal descriptions" >&5 + { echo "$as_me:8290: WARNING: expected a list of terminal descriptions" >&5 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;} ;; (*) @@ -8083,67 +8295,210 @@ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;} ;; esac -USE_FALLBACKS= -test -z "$FALLBACK_LIST" && USE_FALLBACKS="#" - # The fallback feature in ncurses relies upon tic/infocmp outside the build # tree for generating the terminal descriptions that will be compiled into the # library. If your toolchain is old, it may not handle current terminal # databases. Use configure-options to point to the tools which will be used, # rather than the first ones found on the $PATH. -if test -n "$FALLBACK_LIST" -then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args. +set dummy ${ac_tool_prefix}tic; ac_word=$2 +echo "$as_me:8306: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_TIC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$TIC"; then + ac_cv_prog_TIC="$TIC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_TIC="${ac_tool_prefix}tic" +echo "$as_me:8321: found $ac_dir/$ac_word" >&5 +break +done -# Check whether --with-tic-path or --without-tic-path was given. -if test "${with_tic_path+set}" = set; then - withval="$with_tic_path" - echo "$as_me:8100: checking for tic program for fallbacks" >&5 -echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6 - TIC=$withval - echo "$as_me:8103: result: $TIC" >&5 +fi +fi +TIC=$ac_cv_prog_TIC +if test -n "$TIC"; then + echo "$as_me:8329: result: $TIC" >&5 echo "${ECHO_T}$TIC" >&6 - -if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + echo "$as_me:8332: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -case ".$TIC" in -(.\$\(*\)*|.\'*\'*) - ;; -(..|./*|.\\*) - ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\${*prefix}*|.\${*dir}*) - eval TIC="$TIC" - case ".$TIC" in - (.NONE/*) - TIC=`echo $TIC | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; -(.no|.NONE/*) - TIC=`echo $TIC | sed -e s%NONE%$cf_path_syntax%` - ;; -(*) - { { echo "$as_me:8131: error: expected a pathname, not \"$TIC\"" >&5 -echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;} - { (exit 1); exit 1; }; } - ;; -esac - -else - -test -z "$TIC" && TIC=tic -for ac_prog in $TIC tic -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:8144: checking for $ac_word" >&5 +fi +if test -z "$ac_cv_prog_TIC"; then + ac_ct_TIC=$TIC + # Extract the first word of "tic", so it can be a program name with args. +set dummy tic; ac_word=$2 +echo "$as_me:8341: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_TIC+set}" = set; then +if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_TIC"; then + ac_cv_prog_ac_ct_TIC="$ac_ct_TIC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_TIC="tic" +echo "$as_me:8356: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +ac_ct_TIC=$ac_cv_prog_ac_ct_TIC +if test -n "$ac_ct_TIC"; then + echo "$as_me:8364: result: $ac_ct_TIC" >&5 +echo "${ECHO_T}$ac_ct_TIC" >&6 +else + echo "$as_me:8367: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + TIC=$ac_ct_TIC +else + TIC="$ac_cv_prog_TIC" +fi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args. +set dummy ${ac_tool_prefix}infocmp; ac_word=$2 +echo "$as_me:8379: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_INFOCMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$INFOCMP"; then + ac_cv_prog_INFOCMP="$INFOCMP" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp" +echo "$as_me:8394: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +INFOCMP=$ac_cv_prog_INFOCMP +if test -n "$INFOCMP"; then + echo "$as_me:8402: result: $INFOCMP" >&5 +echo "${ECHO_T}$INFOCMP" >&6 +else + echo "$as_me:8405: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_INFOCMP"; then + ac_ct_INFOCMP=$INFOCMP + # Extract the first word of "infocmp", so it can be a program name with args. +set dummy infocmp; ac_word=$2 +echo "$as_me:8414: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_INFOCMP"; then + ac_cv_prog_ac_ct_INFOCMP="$ac_ct_INFOCMP" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_INFOCMP="infocmp" +echo "$as_me:8429: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP +if test -n "$ac_ct_INFOCMP"; then + echo "$as_me:8437: result: $ac_ct_INFOCMP" >&5 +echo "${ECHO_T}$ac_ct_INFOCMP" >&6 +else + echo "$as_me:8440: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + INFOCMP=$ac_ct_INFOCMP +else + INFOCMP="$ac_cv_prog_INFOCMP" +fi + +if test -n "$FALLBACK_LIST" +then + +# Check whether --with-tic-path or --without-tic-path was given. +if test "${with_tic_path+set}" = set; then + withval="$with_tic_path" + echo "$as_me:8455: checking for tic program for fallbacks" >&5 +echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6 + TIC=$withval + echo "$as_me:8458: result: $TIC" >&5 +echo "${ECHO_T}$TIC" >&6 + +if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" +else + cf_path_syntax="$ac_default_prefix" +fi + +case ".$TIC" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\$\{*prefix\}*|.\$\{*dir\}*) + eval TIC="$TIC" + case ".$TIC" in + (.NONE/*) + TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { { echo "$as_me:8486: error: expected a pathname, not \"$TIC\"" >&5 +echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;} + { (exit 1); exit 1; }; } + ;; +esac + +else + +test -z "$TIC" && TIC="tic" +for ac_prog in $TIC tic +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:8499: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_TIC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else case $TIC in @@ -8158,7 +8513,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TIC="$ac_dir/$ac_word" - echo "$as_me:8161: found $ac_dir/$ac_word" >&5 + echo "$as_me:8516: found $ac_dir/$ac_word" >&5 break fi done @@ -8169,10 +8524,10 @@ fi TIC=$ac_cv_path_TIC if test -n "$TIC"; then - echo "$as_me:8172: result: $TIC" >&5 + echo "$as_me:8527: result: $TIC" >&5 echo "${ECHO_T}$TIC" >&6 else - echo "$as_me:8175: result: no" >&5 + echo "$as_me:8530: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8201,16 +8556,16 @@ case ".$cf_temp" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval cf_temp="$cf_temp" case ".$cf_temp" in (.NONE/*) - cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%` + cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%` + cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%` ;; (*) break @@ -8219,7 +8574,7 @@ esac cf_path_prog="$cf_temp" else - cf_path_prog="`basename $cf_temp`" + cf_path_prog="`basename "$cf_temp"`" fi elif test -z "$cf_path_args" ; then cf_path_args="$cf_temp" @@ -8231,7 +8586,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:8234: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:8589: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 + { echo "$as_me:8604: WARNING: no tic program found for fallbacks" >&5 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} fi @@ -8255,10 +8610,10 @@ fi; # Check whether --with-infocmp-path or --without-infocmp-path was given. if test "${with_infocmp_path+set}" = set; then withval="$with_infocmp_path" - echo "$as_me:8258: checking for infocmp program for fallbacks" >&5 + echo "$as_me:8613: checking for infocmp program for fallbacks" >&5 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6 INFOCMP=$withval - echo "$as_me:8261: result: $INFOCMP" >&5 + echo "$as_me:8616: result: $INFOCMP" >&5 echo "${ECHO_T}$INFOCMP" >&6 if test "x$prefix" != xNONE; then @@ -8274,19 +8629,19 @@ case ".$INFOCMP" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval INFOCMP="$INFOCMP" case ".$INFOCMP" in (.NONE/*) - INFOCMP=`echo $INFOCMP | sed -e s%NONE%$cf_path_syntax%` + INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - INFOCMP=`echo $INFOCMP | sed -e s%NONE%$cf_path_syntax%` + INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:8289: error: expected a pathname, not \"$INFOCMP\"" >&5 + { { echo "$as_me:8644: error: expected a pathname, not \"$INFOCMP\"" >&5 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -8294,12 +8649,12 @@ esac else -test -z "$INFOCMP" && INFOCMP=infocmp +test -z "$INFOCMP" && INFOCMP="infocmp" for ac_prog in $INFOCMP infocmp do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:8302: checking for $ac_word" >&5 +echo "$as_me:8657: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_INFOCMP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8316,7 +8671,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_INFOCMP="$ac_dir/$ac_word" - echo "$as_me:8319: found $ac_dir/$ac_word" >&5 + echo "$as_me:8674: found $ac_dir/$ac_word" >&5 break fi done @@ -8327,10 +8682,10 @@ fi INFOCMP=$ac_cv_path_INFOCMP if test -n "$INFOCMP"; then - echo "$as_me:8330: result: $INFOCMP" >&5 + echo "$as_me:8685: result: $INFOCMP" >&5 echo "${ECHO_T}$INFOCMP" >&6 else - echo "$as_me:8333: result: no" >&5 + echo "$as_me:8688: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8359,16 +8714,16 @@ case ".$cf_temp" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval cf_temp="$cf_temp" case ".$cf_temp" in (.NONE/*) - cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%` + cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%` + cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%` ;; (*) break @@ -8377,7 +8732,7 @@ esac cf_path_prog="$cf_temp" else - cf_path_prog="`basename $cf_temp`" + cf_path_prog="`basename "$cf_temp"`" fi elif test -z "$cf_path_args" ; then cf_path_args="$cf_temp" @@ -8389,7 +8744,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:8392: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:8747: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 + { echo "$as_me:8762: WARNING: no infocmp program found for fallbacks" >&5 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;} fi fi; -else - : ${TIC:=tic} - : ${INFOCMP:=infocmp} + test -z "$TIC" && FALLBACK_LIST= + test -z "$INFOCMP" && FALLBACK_LIST= + if test -z "$FALLBACK_LIST" + then + { echo "$as_me:8772: WARNING: ignoring fallback option because tic/infocmp are not available" >&5 +echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;} + fi fi -echo "$as_me:8418: checking if you want modern xterm or antique" >&5 +USE_FALLBACKS= +test -z "$FALLBACK_LIST" && USE_FALLBACKS="#" + +echo "$as_me:8780: checking if you want modern xterm or antique" >&5 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6 # Check whether --with-xterm-new or --without-xterm-new was given. @@ -8425,15 +8787,15 @@ if test "${with_xterm_new+set}" = set; then else with_xterm_new=yes fi; -case $with_xterm_new in +case "$with_xterm_new" in (no) with_xterm_new=xterm-old;; (*) with_xterm_new=xterm-new;; esac -echo "$as_me:8432: result: $with_xterm_new" >&5 +echo "$as_me:8794: result: $with_xterm_new" >&5 echo "${ECHO_T}$with_xterm_new" >&6 WHICH_XTERM=$with_xterm_new -echo "$as_me:8436: checking if xterm backspace sends BS or DEL" >&5 +echo "$as_me:8798: checking if xterm backspace sends BS or DEL" >&5 echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6 # Check whether --with-xterm-kbs or --without-xterm-kbs was given. @@ -8454,7 +8816,7 @@ case x$with_xterm_kbs in with_xterm_kbs=$withval ;; esac -echo "$as_me:8457: result: $with_xterm_kbs" >&5 +echo "$as_me:8819: result: $with_xterm_kbs" >&5 echo "${ECHO_T}$with_xterm_kbs" >&6 XTERM_KBS=$with_xterm_kbs @@ -8464,7 +8826,7 @@ if test "$use_database" = no ; then MAKE_TERMINFO="#" else -echo "$as_me:8467: checking for list of terminfo directories" >&5 +echo "$as_me:8829: checking for list of terminfo directories" >&5 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. @@ -8492,19 +8854,19 @@ case ".$cf_src_path" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval cf_src_path="$cf_src_path" case ".$cf_src_path" in (.NONE/*) - cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` + cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` + cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:8507: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:8869: error: expected a pathname, not \"$cf_src_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -8527,7 +8889,7 @@ case "x$cf_dst_eval" in ;; esac -echo "$as_me:8530: result: $TERMINFO_DIRS" >&5 +echo "$as_me:8892: result: $TERMINFO_DIRS" >&5 echo "${ECHO_T}$TERMINFO_DIRS" >&6 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <&5 + { echo "$as_me:8901: WARNING: ignoring non-directory/file TERMINFO value" >&5 echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;} unset TERMINFO ;; esac -echo "$as_me:8545: checking for default terminfo directory" >&5 +echo "$as_me:8907: checking for default terminfo directory" >&5 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given. @@ -8566,19 +8928,19 @@ case ".$withval" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval withval="$withval" case ".$withval" in (.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:8581: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:8943: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -8587,7 +8949,7 @@ esac fi eval TERMINFO="$withval" -echo "$as_me:8590: result: $TERMINFO" >&5 +echo "$as_me:8952: result: $TERMINFO" >&5 echo "${ECHO_T}$TERMINFO" >&6 cat >>confdefs.h <&5 +echo "$as_me:8963: checking if big-core option selected" >&5 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6 # Check whether --enable-big-core or --disable-big-core was given. @@ -8609,8 +8971,8 @@ else if test "$cross_compiling" = yes; then with_big_core=no else - cat >conftest.$ac_ext <<_ACEOF -#line 8613 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8975 "configure" #include "confdefs.h" #include @@ -8623,28 +8985,28 @@ int main() { ${cf_cv_main_return:-return}(s == 0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:8627: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:8989: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8630: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:8632: \"$ac_try\"") >&5 + echo "$as_me:8992: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:8994: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8635: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8997: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then with_big_core=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 with_big_core=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi; -echo "$as_me:8647: result: $with_big_core" >&5 +echo "$as_me:9009: result: $with_big_core" >&5 echo "${ECHO_T}$with_big_core" >&6 test "x$with_big_core" = "xyes" && cat >>confdefs.h <<\EOF @@ -8654,7 +9016,7 @@ EOF ### ISO C only guarantees 512-char strings, we have tables which load faster ### when constructed using "big" strings. More than the C compiler, the awk ### program is a limit on most vendor UNIX systems. Check that we can build. -echo "$as_me:8657: checking if big-strings option selected" >&5 +echo "$as_me:9019: checking if big-strings option selected" >&5 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6 # Check whether --enable-big-strings or --disable-big-strings was given. @@ -8678,14 +9040,14 @@ else esac fi; -echo "$as_me:8681: result: $with_big_strings" >&5 +echo "$as_me:9043: result: $with_big_strings" >&5 echo "${ECHO_T}$with_big_strings" >&6 USE_BIG_STRINGS=0 test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1 ### use option --enable-termcap to compile in the termcap fallback support -echo "$as_me:8688: checking if you want termcap-fallback support" >&5 +echo "$as_me:9050: checking if you want termcap-fallback support" >&5 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6 # Check whether --enable-termcap or --disable-termcap was given. @@ -8695,14 +9057,14 @@ if test "${enable_termcap+set}" = set; then else with_termcap=no fi; -echo "$as_me:8698: result: $with_termcap" >&5 +echo "$as_me:9060: result: $with_termcap" >&5 echo "${ECHO_T}$with_termcap" >&6 NCURSES_USE_TERMCAP=0 if test "x$with_termcap" != "xyes" ; then if test "$use_database" = no ; then if test -z "$with_fallback" ; then - { { echo "$as_me:8705: error: You have disabled the database w/o specifying fallbacks" >&5 + { { echo "$as_me:9067: error: You have disabled the database w/o specifying fallbacks" >&5 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;} { (exit 1); exit 1; }; } fi @@ -8715,13 +9077,13 @@ EOF else if test "$with_ticlib" != no ; then - { { echo "$as_me:8718: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 + { { echo "$as_me:9080: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} { (exit 1); exit 1; }; } fi NCURSES_USE_TERMCAP=1 - echo "$as_me:8724: checking for list of termcap files" >&5 + echo "$as_me:9086: checking for list of termcap files" >&5 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6 # Check whether --with-termpath or --without-termpath was given. @@ -8749,19 +9111,19 @@ case ".$cf_src_path" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval cf_src_path="$cf_src_path" case ".$cf_src_path" in (.NONE/*) - cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` + cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` + cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:8764: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:9126: error: expected a pathname, not \"$cf_src_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -8784,7 +9146,7 @@ case "x$cf_dst_eval" in ;; esac - echo "$as_me:8787: result: $TERMPATH" >&5 + echo "$as_me:9149: result: $TERMPATH" >&5 echo "${ECHO_T}$TERMPATH" >&6 test -n "$TERMPATH" && cat >>confdefs.h <>confdefs.h <&5 + echo "$as_me:9157: checking if fast termcap-loader is needed" >&5 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6 # Check whether --enable-getcap or --disable-getcap was given. @@ -8802,14 +9164,14 @@ if test "${enable_getcap+set}" = set; then else with_getcap=no fi; - echo "$as_me:8805: result: $with_getcap" >&5 + echo "$as_me:9167: result: $with_getcap" >&5 echo "${ECHO_T}$with_getcap" >&6 test "x$with_getcap" = "xyes" && cat >>confdefs.h <<\EOF #define USE_GETCAP 1 EOF - echo "$as_me:8812: checking if translated termcaps will be cached in ~/.terminfo" >&5 + echo "$as_me:9174: checking if translated termcaps will be cached in ~/.terminfo" >&5 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6 # Check whether --enable-getcap-cache or --disable-getcap-cache was given. @@ -8819,7 +9181,7 @@ if test "${enable_getcap_cache+set}" = set; then else with_getcap_cache=no fi; - echo "$as_me:8822: result: $with_getcap_cache" >&5 + echo "$as_me:9184: result: $with_getcap_cache" >&5 echo "${ECHO_T}$with_getcap_cache" >&6 test "x$with_getcap_cache" = "xyes" && cat >>confdefs.h <<\EOF @@ -8829,7 +9191,7 @@ EOF fi ### Use option --disable-home-terminfo to completely remove ~/.terminfo -echo "$as_me:8832: checking if ~/.terminfo is wanted" >&5 +echo "$as_me:9194: checking if ~/.terminfo is wanted" >&5 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6 # Check whether --enable-home-terminfo or --disable-home-terminfo was given. @@ -8839,15 +9201,15 @@ if test "${enable_home_terminfo+set}" = set; then else with_home_terminfo=yes fi; -echo "$as_me:8842: result: $with_home_terminfo" >&5 +echo "$as_me:9204: result: $with_home_terminfo" >&5 echo "${ECHO_T}$with_home_terminfo" >&6 test "x$with_home_terminfo" = "xyes" && cat >>confdefs.h <<\EOF #define USE_HOME_TERMINFO 1 EOF -echo "$as_me:8849: checking if you want to use restricted environment when running as root" >&5 -echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6 +echo "$as_me:9211: checking if you want to permit root to use ncurses environment variables" >&5 +echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6 # Check whether --enable-root-environ or --disable-root-environ was given. if test "${enable_root_environ+set}" = set; then @@ -8856,13 +9218,30 @@ if test "${enable_root_environ+set}" = set; then else with_root_environ=yes fi; -echo "$as_me:8859: result: $with_root_environ" >&5 +echo "$as_me:9221: result: $with_root_environ" >&5 echo "${ECHO_T}$with_root_environ" >&6 test "x$with_root_environ" = xyes && cat >>confdefs.h <<\EOF #define USE_ROOT_ENVIRON 1 EOF +echo "$as_me:9228: checking if you want to permit setuid programs to access all files" >&5 +echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6 + +# Check whether --enable-root-environ or --disable-root-environ was given. +if test "${enable_root_environ+set}" = set; then + enableval="$enable_root_environ" + with_root_access=$enableval +else + with_root_access=yes +fi; +echo "$as_me:9238: result: $with_root_access" >&5 +echo "${ECHO_T}$with_root_access" >&6 +test "x$with_root_access" = xyes && +cat >>confdefs.h <<\EOF +#define USE_ROOT_ACCESS 1 +EOF + ### Use option --enable-symlinks to make tic use symlinks, not hard links ### to reduce storage requirements for the terminfo database. @@ -8871,24 +9250,24 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:8874: checking for $ac_header" >&5 +echo "$as_me:9253: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 8880 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9259 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:8884: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:9263: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:8890: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:9269: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -8901,14 +9280,14 @@ if test -z "$ac_cpp_err"; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:8909: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then +echo "$as_me:9288: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:9303: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 8930 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9309 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -8957,29 +9336,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8961: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:9340: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8964: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8967: \"$ac_try\"") >&5 + echo "$as_me:9343: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:9346: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8970: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9349: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:8980: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then +echo "$as_me:9359: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 +if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:9376: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 9003 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9382 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -9030,29 +9409,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9034: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:9413: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9037: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9040: \"$ac_try\"") >&5 + echo "$as_me:9416: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:9419: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9043: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9422: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:9053: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then +echo "$as_me:9432: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 +if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 + echo "$as_me:9443: checking if link/symlink functions work" >&5 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6 if test "${cf_cv_link_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9073,10 +9452,11 @@ else eval 'ac_cv_func_'$cf_func'=error' else - cat >conftest.$ac_ext <<_ACEOF -#line 9077 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9456 "configure" #include "confdefs.h" +#include #include #include #ifdef HAVE_UNISTD_H @@ -9085,52 +9465,59 @@ else int main(void) { int fail = 0; - char *src = "config.log"; + char *src = "conftest.tmp"; char *dst = "conftest.chk"; - struct stat src_sb; - struct stat dst_sb; - - stat(src, &src_sb); - fail = ($cf_func("config.log", "conftest.chk") < 0) - || (stat(dst, &dst_sb) < 0) - || (dst_sb.st_mtime != src_sb.st_mtime); + struct stat src_sb, dst_sb; + FILE *fp = fopen(src, "w"); + if (fp == 0) { fail = 3; } else { + fclose(fp); stat(src, &src_sb); + if ($cf_func(src, dst) < 0) { + fail = 1; + } else if (stat(dst, &dst_sb) < 0) { + fail = 2; + } else { + long diff = (dst_sb.st_mtime - src_sb.st_mtime); + if (diff < 0) diff = -diff; + if (diff > 2) fail = 3; + } + } #ifdef HAVE_UNLINK - unlink(dst); + unlink(dst); unlink(src); #else - remove(dst); + remove(dst); remove(src); #endif ${cf_cv_main_return:-return} (fail); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:9107: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:9494: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9110: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9112: \"$ac_try\"") >&5 + echo "$as_me:9497: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:9499: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9115: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9502: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" eval 'ac_cv_func_'$cf_func'=yes' else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval 'ac_cv_func_'$cf_func'=no' fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi done test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no fi -echo "$as_me:9133: result: $cf_cv_link_funcs" >&5 +echo "$as_me:9520: result: $cf_cv_link_funcs" >&5 echo "${ECHO_T}$cf_cv_link_funcs" >&6 test "$ac_cv_func_link" = yes && cat >>confdefs.h <<\EOF @@ -9150,7 +9537,7 @@ with_symlinks=no # soft links (symbolic links) are useful for some systems where hard links do # not work, or to make it simpler to copy terminfo trees around. if test "x$ac_cv_func_symlink" = xyes ; then - echo "$as_me:9153: checking if tic should use symbolic links" >&5 + echo "$as_me:9540: checking if tic should use symbolic links" >&5 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6 # Check whether --enable-symlinks or --disable-symlinks was given. @@ -9160,21 +9547,21 @@ if test "${enable_symlinks+set}" = set; then else with_symlinks=no fi; - echo "$as_me:9163: result: $with_symlinks" >&5 + echo "$as_me:9550: result: $with_symlinks" >&5 echo "${ECHO_T}$with_symlinks" >&6 fi # If we have hard links and did not choose to use soft links instead, there is # no reason to make this choice optional - use the hard links. if test "$with_symlinks" = no ; then - echo "$as_me:9170: checking if tic should use hard links" >&5 + echo "$as_me:9557: checking if tic should use hard links" >&5 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 if test "x$ac_cv_func_link" = xyes ; then with_links=yes else with_links=no fi - echo "$as_me:9177: result: $with_links" >&5 + echo "$as_me:9564: result: $with_links" >&5 echo "${ECHO_T}$with_links" >&6 fi @@ -9190,7 +9577,7 @@ EOF ### use option --enable-broken-linker to force on use of broken-linker support -echo "$as_me:9193: checking if you want broken-linker support code" >&5 +echo "$as_me:9580: checking if you want broken-linker support code" >&5 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 # Check whether --enable-broken_linker or --disable-broken_linker was given. @@ -9200,10 +9587,10 @@ if test "${enable_broken_linker+set}" = set; then else with_broken_linker=no fi; -echo "$as_me:9203: result: $with_broken_linker" >&5 +echo "$as_me:9590: result: $with_broken_linker" >&5 echo "${ECHO_T}$with_broken_linker" >&6 -: ${BROKEN_LINKER:=0} +: "${BROKEN_LINKER:=0}" if test "x$with_broken_linker" = xyes ; then cat >>confdefs.h <<\EOF @@ -9214,7 +9601,7 @@ EOF fi ### use option --enable-bsdpad to have tputs process BSD-style prefix padding -echo "$as_me:9217: checking if tputs should process BSD-style prefix padding" >&5 +echo "$as_me:9604: checking if tputs should process BSD-style prefix padding" >&5 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6 # Check whether --enable-bsdpad or --disable-bsdpad was given. @@ -9224,7 +9611,7 @@ if test "${enable_bsdpad+set}" = set; then else with_bsdpad=no fi; -echo "$as_me:9227: result: $with_bsdpad" >&5 +echo "$as_me:9614: result: $with_bsdpad" >&5 echo "${ECHO_T}$with_bsdpad" >&6 test "x$with_bsdpad" = xyes && cat >>confdefs.h <<\EOF @@ -9243,14 +9630,14 @@ NCURSES_WINT_T=0 # Check to define _XOPEN_SOURCE "automatically" CPPFLAGS_before_XOPEN="$CPPFLAGS" -echo "$as_me:9246: checking if the POSIX test-macros are already defined" >&5 +echo "$as_me:9633: checking if the POSIX test-macros are already defined" >&5 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 if test "${cf_cv_posix_visible+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 9253 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 9640 "configure" #include "confdefs.h" #include int @@ -9268,28 +9655,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9272: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9659: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9275: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9278: \"$ac_try\"") >&5 + echo "$as_me:9662: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9665: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9281: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9668: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_posix_visible=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_posix_visible=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:9292: result: $cf_cv_posix_visible" >&5 +echo "$as_me:9679: result: $cf_cv_posix_visible" >&5 echo "${ECHO_T}$cf_cv_posix_visible" >&6 if test "$cf_cv_posix_visible" = no; then @@ -9298,7 +9685,7 @@ cf_XOPEN_SOURCE=600 cf_POSIX_C_SOURCE=199506L cf_xopen_source= -case $host_os in +case "$host_os" in (aix[4-7]*) cf_xopen_source="-D_ALL_SOURCE" ;; @@ -9334,14 +9721,14 @@ case $host_os in cf_gnu_xopen_source=$cf_XOPEN_SOURCE -echo "$as_me:9337: checking if this is the GNU C library" >&5 +echo "$as_me:9724: checking if this is the GNU C library" >&5 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 if test "${cf_cv_gnu_library+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 9344 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 9731 "configure" #include "confdefs.h" #include int @@ -9359,28 +9746,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9363: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9750: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9366: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9369: \"$ac_try\"") >&5 + echo "$as_me:9753: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9756: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9372: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9759: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_gnu_library=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_gnu_library=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:9383: result: $cf_cv_gnu_library" >&5 +echo "$as_me:9770: result: $cf_cv_gnu_library" >&5 echo "${ECHO_T}$cf_cv_gnu_library" >&6 if test x$cf_cv_gnu_library = xyes; then @@ -9388,7 +9775,7 @@ if test x$cf_cv_gnu_library = xyes; then # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE # was changed to help a little. newlib incorporated the change about 4 # years later. - echo "$as_me:9391: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo "$as_me:9778: checking if _DEFAULT_SOURCE can be used as a basis" >&5 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 if test "${cf_cv_gnu_library_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9399,8 +9786,8 @@ else test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" - cat >conftest.$ac_ext <<_ACEOF -#line 9403 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9790 "configure" #include "confdefs.h" #include int @@ -9418,34 +9805,34 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9422: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9809: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9425: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9428: \"$ac_try\"") >&5 + echo "$as_me:9812: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9815: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9431: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9818: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_gnu_library_219=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_gnu_library_219=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save" fi -echo "$as_me:9443: result: $cf_cv_gnu_library_219" >&5 +echo "$as_me:9830: result: $cf_cv_gnu_library_219" >&5 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 if test "x$cf_cv_gnu_library_219" = xyes; then cf_save="$CPPFLAGS" - echo "$as_me:9448: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo "$as_me:9835: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9458,19 +9845,19 @@ cf_new_extra_cppflags= for cf_add_cflags in -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -9489,7 +9876,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -9519,7 +9906,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -9549,8 +9936,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi - cat >conftest.$ac_ext <<_ACEOF -#line 9553 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9940 "configure" #include "confdefs.h" #include @@ -9569,28 +9956,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9573: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9960: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9576: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9579: \"$ac_try\"") >&5 + echo "$as_me:9963: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9966: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9582: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9969: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_gnu_dftsrc_219=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_gnu_dftsrc_219=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:9593: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "$as_me:9980: result: $cf_cv_gnu_dftsrc_219" >&5 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" else @@ -9599,14 +9986,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 if test "x$cf_cv_gnu_dftsrc_219" != xyes; then - echo "$as_me:9602: checking if we must define _GNU_SOURCE" >&5 + echo "$as_me:9989: checking if we must define _GNU_SOURCE" >&5 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 9609 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9996 "configure" #include "confdefs.h" #include int @@ -9620,22 +10007,22 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9624: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10011: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9627: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9630: \"$ac_try\"") >&5 + echo "$as_me:10014: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10017: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9633: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10020: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_save="$CPPFLAGS" cf_fix_cppflags=no @@ -9645,19 +10032,19 @@ cf_new_extra_cppflags= for cf_add_cflags in -D_GNU_SOURCE do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -9676,7 +10063,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -9706,7 +10093,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -9736,8 +10123,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi - cat >conftest.$ac_ext <<_ACEOF -#line 9740 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10127 "configure" #include "confdefs.h" #include int @@ -9751,37 +10138,37 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9755: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10142: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9758: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9761: \"$ac_try\"") >&5 + echo "$as_me:10145: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10148: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9764: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10151: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_gnu_source=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:9779: result: $cf_cv_gnu_source" >&5 +echo "$as_me:10166: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 if test "$cf_cv_gnu_source" = yes then - echo "$as_me:9784: checking if we should also define _DEFAULT_SOURCE" >&5 + echo "$as_me:10171: checking if we should also define _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_default_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9790,8 +10177,8 @@ else test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" - cat >conftest.$ac_ext <<_ACEOF -#line 9794 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10181 "configure" #include "confdefs.h" #include int @@ -9805,28 +10192,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9809: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10196: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9812: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9815: \"$ac_try\"") >&5 + echo "$as_me:10199: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10202: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9818: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10205: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_default_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_default_source=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:9829: result: $cf_cv_default_source" >&5 +echo "$as_me:10216: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 if test "$cf_cv_default_source" = yes then @@ -9863,16 +10250,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:9866: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:10253: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:9872: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:10259: testing if the symbol is already defined go no further ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 9875 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10262 "configure" #include "confdefs.h" #include int @@ -9886,22 +10273,22 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9890: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10277: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9893: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9896: \"$ac_try\"") >&5 + echo "$as_me:10280: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10283: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9899: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10286: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_want_posix_source=no case .$cf_POSIX_C_SOURCE in (.[12]??*) @@ -9916,8 +10303,8 @@ cf_want_posix_source=no ;; esac if test "$cf_want_posix_source" = yes ; then - cat >conftest.$ac_ext <<_ACEOF -#line 9920 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10307 "configure" #include "confdefs.h" #include int @@ -9931,28 +10318,28 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9935: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10322: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9938: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9941: \"$ac_try\"") >&5 + echo "$as_me:10325: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10328: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9944: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10331: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:9955: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:10342: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -9960,10 +10347,10 @@ echo "${as_me:-configure}:9955: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:9963: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:10350: testing if the second compile does not leave our definition intact error ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 9966 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10353 "configure" #include "confdefs.h" #include int @@ -9977,33 +10364,33 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9981: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10368: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9984: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9987: \"$ac_try\"") >&5 + echo "$as_me:10371: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10374: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9990: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10377: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_posix_c_source=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:10006: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:10393: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -10017,19 +10404,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_cv_posix_c_source do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -10048,7 +10435,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -10078,7 +10465,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -10116,7 +10503,16 @@ fi # cf_cv_posix_visible (netbsd*) cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ;; -(openbsd[4-9]*) +(openbsd[6-9]*) + # OpenBSD 6.x has broken locale support, both compile-time and runtime. + # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html + # Abusing the conformance level is a workaround. + { echo "$as_me:10510: WARNING: this system does not provide usable locale support" >&5 +echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=700 + ;; +(openbsd[4-5]*) # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw cf_xopen_source="-D_BSD_SOURCE" cf_XOPEN_SOURCE=600 @@ -10143,14 +10539,14 @@ fi # cf_cv_posix_visible ;; (*) -echo "$as_me:10146: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:10542: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 10153 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10549 "configure" #include "confdefs.h" #include @@ -10168,29 +10564,29 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10172: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10568: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10175: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10178: \"$ac_try\"") >&5 + echo "$as_me:10571: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10574: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10181: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10577: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_save="$CPPFLAGS" test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - cat >conftest.$ac_ext <<_ACEOF -#line 10193 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10589 "configure" #include "confdefs.h" #include @@ -10208,32 +10604,32 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10212: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10608: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10215: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10218: \"$ac_try\"") >&5 + echo "$as_me:10611: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10614: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10221: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10617: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_xopen_source=$cf_XOPEN_SOURCE fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:10236: result: $cf_cv_xopen_source" >&5 +echo "$as_me:10632: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -10255,19 +10651,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_temp_xopen_source do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -10286,7 +10682,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -10316,7 +10712,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -10363,16 +10759,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:10366: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:10762: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:10372: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:10768: testing if the symbol is already defined go no further ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 10375 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10771 "configure" #include "confdefs.h" #include int @@ -10386,22 +10782,22 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10390: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10786: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10393: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10396: \"$ac_try\"") >&5 + echo "$as_me:10789: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10792: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10399: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10795: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_want_posix_source=no case .$cf_POSIX_C_SOURCE in (.[12]??*) @@ -10416,8 +10812,8 @@ cf_want_posix_source=no ;; esac if test "$cf_want_posix_source" = yes ; then - cat >conftest.$ac_ext <<_ACEOF -#line 10420 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10816 "configure" #include "confdefs.h" #include int @@ -10431,28 +10827,28 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10435: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10831: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10438: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10441: \"$ac_try\"") >&5 + echo "$as_me:10834: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10837: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10444: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10840: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:10455: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:10851: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -10460,10 +10856,10 @@ echo "${as_me:-configure}:10455: testing ifdef from value $cf_POSIX_C_SOURCE ... test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:10463: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:10859: testing if the second compile does not leave our definition intact error ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 10466 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10862 "configure" #include "confdefs.h" #include int @@ -10477,33 +10873,33 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10481: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10877: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10484: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10487: \"$ac_try\"") >&5 + echo "$as_me:10880: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10883: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10490: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10886: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_posix_c_source=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:10506: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:10902: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -10517,19 +10913,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_cv_posix_c_source do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -10548,7 +10944,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -10578,7 +10974,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -10624,19 +11020,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_xopen_source do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -10655,7 +11051,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -10685,7 +11081,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -10697,7 +11093,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:10700: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:11096: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -10707,7 +11103,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:10710: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:11106: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -10717,7 +11113,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:10720: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:11116: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -10727,10 +11123,10 @@ fi fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:10730: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:11126: checking if _XOPEN_SOURCE really is set" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 10733 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11129 "configure" #include "confdefs.h" #include int @@ -10744,31 +11140,31 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10748: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11144: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10751: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10754: \"$ac_try\"") >&5 + echo "$as_me:11147: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11150: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10757: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11153: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:10766: result: $cf_XOPEN_SOURCE_set" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + echo "$as_me:11162: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 - if test $cf_XOPEN_SOURCE_set = yes + if test "$cf_XOPEN_SOURCE_set" = yes then - cat >conftest.$ac_ext <<_ACEOF -#line 10771 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11167 "configure" #include "confdefs.h" #include int @@ -10782,40 +11178,40 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10786: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11182: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10789: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10792: \"$ac_try\"") >&5 + echo "$as_me:11185: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11188: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10795: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11191: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set_ok=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set_ok=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - if test $cf_XOPEN_SOURCE_set_ok = no +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + if test "$cf_XOPEN_SOURCE_set_ok" = no then - { echo "$as_me:10806: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:11202: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:10811: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:11207: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 10818 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11214 "configure" #include "confdefs.h" #include @@ -10833,29 +11229,29 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10837: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11233: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10840: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10843: \"$ac_try\"") >&5 + echo "$as_me:11236: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11239: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10846: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11242: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_save="$CPPFLAGS" test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - cat >conftest.$ac_ext <<_ACEOF -#line 10858 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11254 "configure" #include "confdefs.h" #include @@ -10873,32 +11269,32 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10877: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11273: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10880: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10883: \"$ac_try\"") >&5 + echo "$as_me:11276: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11279: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10886: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11282: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_xopen_source=$cf_XOPEN_SOURCE fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:10901: result: $cf_cv_xopen_source" >&5 +echo "$as_me:11297: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -10920,19 +11316,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_temp_xopen_source do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -10951,7 +11347,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -10981,7 +11377,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -11021,14 +11417,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS" # Work around breakage on OS X -echo "$as_me:11024: checking if SIGWINCH is defined" >&5 +echo "$as_me:11420: checking if SIGWINCH is defined" >&5 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 if test "${cf_cv_define_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 11031 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11427 "configure" #include "confdefs.h" #include @@ -11042,24 +11438,24 @@ int x = SIGWINCH; (void)x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11046: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11442: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11049: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11052: \"$ac_try\"") >&5 + echo "$as_me:11445: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11448: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11055: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11451: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_define_sigwinch=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 11062 "configure" +cat "conftest.$ac_ext" >&5 +cat >"conftest.$ac_ext" <<_ACEOF +#line 11458 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -11076,35 +11472,35 @@ int x = SIGWINCH; (void)x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11080: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11476: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11083: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11086: \"$ac_try\"") >&5 + echo "$as_me:11479: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11482: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11089: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11485: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_define_sigwinch=maybe else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_define_sigwinch=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:11103: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:11499: result: $cf_cv_define_sigwinch" >&5 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 if test "$cf_cv_define_sigwinch" = maybe ; then -echo "$as_me:11107: checking for actual SIGWINCH definition" >&5 +echo "$as_me:11503: checking for actual SIGWINCH definition" >&5 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 if test "${cf_cv_fixup_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11112,10 +11508,10 @@ else cf_cv_fixup_sigwinch=unknown cf_sigwinch=32 -while test $cf_sigwinch != 1 +while test "$cf_sigwinch" != 1 do - cat >conftest.$ac_ext <<_ACEOF -#line 11118 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11514 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -11136,31 +11532,31 @@ int x = SIGWINCH; (void)x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11140: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11536: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11143: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11146: \"$ac_try\"") >&5 + echo "$as_me:11539: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11542: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11149: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11545: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" -cf_sigwinch=`expr $cf_sigwinch - 1` +cf_sigwinch="`expr "$cf_sigwinch" - 1`" done fi -echo "$as_me:11163: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:11559: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -11170,13 +11566,13 @@ fi # Checks for CODESET support. -echo "$as_me:11173: checking for nl_langinfo and CODESET" >&5 +echo "$as_me:11569: checking for nl_langinfo and CODESET" >&5 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 11179 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11575 "configure" #include "confdefs.h" #include int @@ -11187,30 +11583,30 @@ char* cs = nl_langinfo(CODESET); (void)cs return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11191: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:11587: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11194: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11197: \"$ac_try\"") >&5 + echo "$as_me:11590: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11593: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11200: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11596: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then am_cv_langinfo_codeset=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 am_cv_langinfo_codeset=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:11211: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:11607: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 - if test $am_cv_langinfo_codeset = yes; then + if test "$am_cv_langinfo_codeset" = yes; then cat >>confdefs.h <<\EOF #define HAVE_LANGINFO_CODESET 1 @@ -11222,7 +11618,7 @@ EOF NCURSES_OK_WCHAR_T= NCURSES_OK_WINT_T= -echo "$as_me:11225: checking if you want wide-character code" >&5 +echo "$as_me:11621: checking if you want wide-character code" >&5 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -11232,7 +11628,7 @@ if test "${enable_widec+set}" = set; then else with_widec=no fi; -echo "$as_me:11235: result: $with_widec" >&5 +echo "$as_me:11631: result: $with_widec" >&5 echo "${ECHO_T}$with_widec" >&6 NCURSES_WCWIDTH_GRAPHICS=1 @@ -11256,24 +11652,24 @@ wctype.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:11259: checking for $ac_header" >&5 +echo "$as_me:11655: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 11265 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11661 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:11269: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:11665: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:11275: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:11671: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -11286,14 +11682,14 @@ if test -z "$ac_cpp_err"; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:11294: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then +echo "$as_me:11690: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:11700: checking if wchar.h can be used as is" >&5 echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6 if test "${cf_cv_wchar_h_okay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 11311 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 11707 "configure" #include "confdefs.h" #include @@ -11329,36 +11725,36 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11333: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11729: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11336: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11339: \"$ac_try\"") >&5 + echo "$as_me:11732: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11735: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11342: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11738: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_wchar_h_okay=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_wchar_h_okay=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:11352: result: $cf_cv_wchar_h_okay" >&5 +echo "$as_me:11748: result: $cf_cv_wchar_h_okay" >&5 echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6 -if test $cf_cv_wchar_h_okay = no +if test "$cf_cv_wchar_h_okay" = no then -echo "$as_me:11358: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "$as_me:11754: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 11361 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 11757 "configure" #include "confdefs.h" #include @@ -11373,35 +11769,35 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11377: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11773: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11380: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11383: \"$ac_try\"") >&5 + echo "$as_me:11776: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11779: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11386: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11782: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_result=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_result=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:11395: result: $cf_result" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +echo "$as_me:11791: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" elif test "x" != "x" ; then - echo "$as_me:11401: checking checking for compatible value versus " >&5 + echo "$as_me:11797: checking checking for compatible value versus " >&5 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 11404 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11800 "configure" #include "confdefs.h" #include @@ -11416,26 +11812,26 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11420: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11816: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11423: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11426: \"$ac_try\"") >&5 + echo "$as_me:11819: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11822: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11429: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11825: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_result=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_result=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:11438: result: $cf_result" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + echo "$as_me:11834: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then # perhaps we can override it - try... @@ -11445,7 +11841,7 @@ fi fi -echo "$as_me:11448: checking if wcwidth agrees graphics are single-width" >&5 +echo "$as_me:11844: checking if wcwidth agrees graphics are single-width" >&5 echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6 if test "${cf_cv_wcwidth_graphics+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11515,8 +11911,8 @@ CF_EOF if test "$cross_compiling" = yes; then cf_cv_wcwidth_graphics=unknown else - cat >conftest.$ac_ext <<_ACEOF -#line 11519 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11915 "configure" #include "confdefs.h" #include @@ -11542,46 +11938,46 @@ main(void) if ((fp = fopen("conftest.in", "r")) != 0) { while (fgets(buffer, MY_LEN, fp) != 0) { if (*buffer == '-') { - fprintf(stderr, "\t%s", buffer); + fprintf(stderr, "\\t%s", buffer); } else if (sscanf(buffer, "%x %s", &value, notes) == 2) { ++totals; if (wcwidth(value) == 1) ++passed; - fprintf(stderr, "%d\t%s", wcwidth(value), buffer); + fprintf(stderr, "%d\\t%s", wcwidth(value), buffer); } else { - fprintf(stderr, "?\t%s", buffer); + fprintf(stderr, "?\\t%s", buffer); } } } } - fprintf(stderr, "%d/%d passed wcwidth/graphics check\n", passed, totals); + fprintf(stderr, "%d/%d passed wcwidth/graphics check\\n", passed, totals); return (totals == passed) ? 0 : 1; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:11563: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:11959: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11566: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11568: \"$ac_try\"") >&5 + echo "$as_me:11962: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:11964: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11571: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11967: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_wcwidth_graphics=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_wcwidth_graphics=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:11584: result: $cf_cv_wcwidth_graphics" >&5 +echo "$as_me:11980: result: $cf_cv_wcwidth_graphics" >&5 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6 test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0 @@ -11592,13 +11988,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6 for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:11595: checking for $ac_func" >&5 +echo "$as_me:11991: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 11601 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11997 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -11628,29 +12024,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11632: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12028: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11635: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11638: \"$ac_try\"") >&5 + echo "$as_me:12031: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12034: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11641: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12037: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:11651: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then +echo "$as_me:12047: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 +if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +for ac_header in wchar.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:12062: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 12068 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:12072: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:12078: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err "conftest.$ac_ext" +fi +echo "$as_me:12097: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 if test "${cf_cv_utf8_lib+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cf_save_LIBS="$LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 11671 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12115 "configure" #include "confdefs.h" #include +#include +#ifdef HAVE_WCHAR_H +#include +#endif + int main (void) { @@ -11680,34 +12129,34 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11684: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12133: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11687: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11690: \"$ac_try\"") >&5 + echo "$as_me:12136: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12139: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11693: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12142: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_utf8_lib=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 # If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these # will be set on completion of the AC_TRY_LINK below. cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:11705: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:12154: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 11710 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 12159 "configure" #include "confdefs.h" #include @@ -11719,18 +12168,18 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11723: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12172: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11726: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11729: \"$ac_try\"") >&5 + echo "$as_me:12175: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12178: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11732: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12181: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes cf_cv_header_path_utf8=/usr/include @@ -11738,12 +12187,12 @@ if { (eval echo "$as_me:11723: \"$ac_link\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 LIBS="-lutf8 $cf_save_LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 11746 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 12195 "configure" #include "confdefs.h" #include @@ -11755,18 +12204,18 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11759: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12208: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11762: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11765: \"$ac_try\"") >&5 + echo "$as_me:12211: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12214: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11768: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12217: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes cf_cv_header_path_utf8=/usr/include @@ -11775,16 +12224,16 @@ if { (eval echo "$as_me:11759: \"$ac_link\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_find_linkage_utf8=no LIBS="$cf_save_LIBS" test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:11785: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:12234: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:11787: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:12236: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -11796,7 +12245,7 @@ cf_header_path_list="" if test -n "${CFLAGS}${CPPFLAGS}" ; then for cf_header_path in $CPPFLAGS $CFLAGS do - case $cf_header_path in + case "$cf_header_path" in (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` @@ -11804,11 +12253,11 @@ test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" - test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" - test -d $cf_header_path/include/utf8 && cf_search="$cf_search $cf_header_path/include/utf8" - test -d $cf_header_path/include/utf8/include && cf_search="$cf_search $cf_header_path/include/utf8/include" - test -d $cf_header_path/utf8/include && cf_search="$cf_search $cf_header_path/utf8/include" - test -d $cf_header_path/utf8/include/utf8 && cf_search="$cf_search $cf_header_path/utf8/include/utf8" + test -d "$cf_header_path/include" && cf_search="$cf_search $cf_header_path/include" + test -d "$cf_header_path/include/utf8" && cf_search="$cf_search $cf_header_path/include/utf8" + test -d "$cf_header_path/include/utf8/include" && cf_search="$cf_search $cf_header_path/include/utf8/include" + test -d "$cf_header_path/utf8/include" && cf_search="$cf_search $cf_header_path/utf8/include" + test -d "$cf_header_path/utf8/include/utf8" && cf_search="$cf_search $cf_header_path/utf8/include/utf8" } cf_header_path_list="$cf_header_path_list $cf_search" @@ -11825,11 +12274,11 @@ test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for include-directories under $prefix" - test -d $prefix/include && cf_search="$cf_search $prefix/include" - test -d $prefix/include/utf8 && cf_search="$cf_search $prefix/include/utf8" - test -d $prefix/include/utf8/include && cf_search="$cf_search $prefix/include/utf8/include" - test -d $prefix/utf8/include && cf_search="$cf_search $prefix/utf8/include" - test -d $prefix/utf8/include/utf8 && cf_search="$cf_search $prefix/utf8/include/utf8" + test -d "$prefix/include" && cf_search="$cf_search $prefix/include" + test -d "$prefix/include/utf8" && cf_search="$cf_search $prefix/include/utf8" + test -d "$prefix/include/utf8/include" && cf_search="$cf_search $prefix/include/utf8/include" + test -d "$prefix/utf8/include" && cf_search="$cf_search $prefix/utf8/include" + test -d "$prefix/utf8/include/utf8" && cf_search="$cf_search $prefix/utf8/include/utf8" } for cf_subdir_prefix in \ @@ -11843,13 +12292,13 @@ do test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ -(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { +{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" - test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include" - test -d $cf_subdir_prefix/include/utf8 && cf_search="$cf_search $cf_subdir_prefix/include/utf8" - test -d $cf_subdir_prefix/include/utf8/include && cf_search="$cf_search $cf_subdir_prefix/include/utf8/include" - test -d $cf_subdir_prefix/utf8/include && cf_search="$cf_search $cf_subdir_prefix/utf8/include" - test -d $cf_subdir_prefix/utf8/include/utf8 && cf_search="$cf_search $cf_subdir_prefix/utf8/include/utf8" + test -d "$cf_subdir_prefix/include" && cf_search="$cf_search $cf_subdir_prefix/include" + test -d "$cf_subdir_prefix/include/utf8" && cf_search="$cf_search $cf_subdir_prefix/include/utf8" + test -d "$cf_subdir_prefix/include/utf8/include" && cf_search="$cf_search $cf_subdir_prefix/include/utf8/include" + test -d "$cf_subdir_prefix/utf8/include" && cf_search="$cf_search $cf_subdir_prefix/utf8/include" + test -d "$cf_subdir_prefix/utf8/include/utf8" && cf_search="$cf_search $cf_subdir_prefix/utf8/include/utf8" } done @@ -11857,33 +12306,33 @@ done test "$includedir" != NONE && \ test "$includedir" != "/usr/include" && \ test -d "$includedir" && { - test -d $includedir && cf_search="$cf_search $includedir" - test -d $includedir/utf8 && cf_search="$cf_search $includedir/utf8" + test -d "$includedir" && cf_search="$cf_search $includedir" + test -d "$includedir/utf8" && cf_search="$cf_search $includedir/utf8" } test "$oldincludedir" != NONE && \ test "$oldincludedir" != "/usr/include" && \ test -d "$oldincludedir" && { - test -d $oldincludedir && cf_search="$cf_search $oldincludedir" - test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8" + test -d "$oldincludedir" && cf_search="$cf_search $oldincludedir" + test -d "$oldincludedir/utf8" && cf_search="$cf_search $oldincludedir/utf8" } cf_search="$cf_search $cf_header_path_list" for cf_cv_header_path_utf8 in $cf_search do - if test -d $cf_cv_header_path_utf8 ; then + if test -d "$cf_cv_header_path_utf8" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:11878: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:12327: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" - cat >conftest.$ac_ext <<_ACEOF -#line 11886 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12335 "configure" #include "confdefs.h" #include @@ -11895,40 +12344,40 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11899: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12348: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11902: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11905: \"$ac_try\"") >&5 + echo "$as_me:12351: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12354: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11908: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12357: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:11913: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:12362: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 CPPFLAGS="$cf_save_CPPFLAGS" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi done if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:11931: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:12380: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -11940,7 +12389,7 @@ cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS do - case $cf_library_path in + case "$cf_library_path" in (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` @@ -11948,11 +12397,11 @@ test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" - test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" - test -d $cf_library_path/lib/utf8 && cf_search="$cf_search $cf_library_path/lib/utf8" - test -d $cf_library_path/lib/utf8/lib && cf_search="$cf_search $cf_library_path/lib/utf8/lib" - test -d $cf_library_path/utf8/lib && cf_search="$cf_search $cf_library_path/utf8/lib" - test -d $cf_library_path/utf8/lib/utf8 && cf_search="$cf_search $cf_library_path/utf8/lib/utf8" + test -d "$cf_library_path/lib" && cf_search="$cf_search $cf_library_path/lib" + test -d "$cf_library_path/lib/utf8" && cf_search="$cf_search $cf_library_path/lib/utf8" + test -d "$cf_library_path/lib/utf8/lib" && cf_search="$cf_search $cf_library_path/lib/utf8/lib" + test -d "$cf_library_path/utf8/lib" && cf_search="$cf_search $cf_library_path/utf8/lib" + test -d "$cf_library_path/utf8/lib/utf8" && cf_search="$cf_search $cf_library_path/utf8/lib/utf8" } cf_library_path_list="$cf_library_path_list $cf_search" @@ -11967,11 +12416,11 @@ test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $prefix" - test -d $prefix/lib && cf_search="$cf_search $prefix/lib" - test -d $prefix/lib/utf8 && cf_search="$cf_search $prefix/lib/utf8" - test -d $prefix/lib/utf8/lib && cf_search="$cf_search $prefix/lib/utf8/lib" - test -d $prefix/utf8/lib && cf_search="$cf_search $prefix/utf8/lib" - test -d $prefix/utf8/lib/utf8 && cf_search="$cf_search $prefix/utf8/lib/utf8" + test -d "$prefix/lib" && cf_search="$cf_search $prefix/lib" + test -d "$prefix/lib/utf8" && cf_search="$cf_search $prefix/lib/utf8" + test -d "$prefix/lib/utf8/lib" && cf_search="$cf_search $prefix/lib/utf8/lib" + test -d "$prefix/utf8/lib" && cf_search="$cf_search $prefix/utf8/lib" + test -d "$prefix/utf8/lib/utf8" && cf_search="$cf_search $prefix/utf8/lib/utf8" } for cf_subdir_prefix in \ @@ -11985,13 +12434,13 @@ do test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ -(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { +{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" - test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib" - test -d $cf_subdir_prefix/lib/utf8 && cf_search="$cf_search $cf_subdir_prefix/lib/utf8" - test -d $cf_subdir_prefix/lib/utf8/lib && cf_search="$cf_search $cf_subdir_prefix/lib/utf8/lib" - test -d $cf_subdir_prefix/utf8/lib && cf_search="$cf_search $cf_subdir_prefix/utf8/lib" - test -d $cf_subdir_prefix/utf8/lib/utf8 && cf_search="$cf_search $cf_subdir_prefix/utf8/lib/utf8" + test -d "$cf_subdir_prefix/lib" && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d "$cf_subdir_prefix/lib/utf8" && cf_search="$cf_search $cf_subdir_prefix/lib/utf8" + test -d "$cf_subdir_prefix/lib/utf8/lib" && cf_search="$cf_search $cf_subdir_prefix/lib/utf8/lib" + test -d "$cf_subdir_prefix/utf8/lib" && cf_search="$cf_search $cf_subdir_prefix/utf8/lib" + test -d "$cf_subdir_prefix/utf8/lib/utf8" && cf_search="$cf_search $cf_subdir_prefix/utf8/lib/utf8" } done @@ -12000,16 +12449,16 @@ cf_search="$cf_library_path_list $cf_search" for cf_cv_library_path_utf8 in $cf_search do - if test -d $cf_cv_library_path_utf8 ; then + if test -d "$cf_cv_library_path_utf8" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:12006: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:12455: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lutf8 $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" - cat >conftest.$ac_ext <<_ACEOF -#line 12012 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12461 "configure" #include "confdefs.h" #include @@ -12021,36 +12470,36 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12025: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12474: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12028: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12031: \"$ac_try\"") >&5 + echo "$as_me:12477: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12480: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12034: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12483: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:12039: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:12488: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 CPPFLAGS="$cf_save_CPPFLAGS" LIBS="$cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi done CPPFLAGS="$cf_save_CPPFLAGS" @@ -12062,10 +12511,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" @@ -12076,9 +12525,9 @@ cf_cv_utf8_lib=no fi fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:12081: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:12530: result: $cf_cv_utf8_lib" >&5 echo "${ECHO_T}$cf_cv_utf8_lib" >&6 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between @@ -12092,9 +12541,9 @@ EOF if test -n "$cf_cv_header_path_utf8" ; then for cf_add_incdir in $cf_cv_header_path_utf8 do - while test $cf_add_incdir != /usr/include + while test "$cf_add_incdir" != /usr/include do - if test -d $cf_add_incdir + if test -d "$cf_add_incdir" then cf_have_incdir=no if test -n "$CFLAGS$CPPFLAGS" ; then @@ -12115,8 +12564,8 @@ if test -n "$cf_cv_header_path_utf8" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 12119 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12568 "configure" #include "confdefs.h" #include int @@ -12127,25 +12576,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12131: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12580: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12134: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12137: \"$ac_try\"") >&5 + echo "$as_me:12583: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12586: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12140: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12589: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -12154,11 +12603,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:12157: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:12606: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` test "$cf_top_incdir" = "$cf_add_incdir" && break cf_add_incdir="$cf_top_incdir" else @@ -12174,9 +12623,9 @@ fi if test -n "$cf_cv_library_path_utf8" ; then for cf_add_libdir in $cf_cv_library_path_utf8 do - if test $cf_add_libdir = /usr/lib ; then + if test "$cf_add_libdir" = /usr/lib ; then : - elif test -d $cf_add_libdir + elif test -d "$cf_add_libdir" then cf_have_libdir=no if test -n "$LDFLAGS$LIBS" ; then @@ -12190,7 +12639,7 @@ if test -n "$cf_cv_library_path_utf8" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:12193: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:12642: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -12222,14 +12671,14 @@ fi fi # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:12225: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:12674: checking if we must include wchar.h to declare mbstate_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 if test "${cf_cv_mbstate_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 12232 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 12681 "configure" #include "confdefs.h" #include @@ -12246,24 +12695,24 @@ mbstate_t state return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12250: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12699: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12253: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12256: \"$ac_try\"") >&5 + echo "$as_me:12702: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12705: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12259: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12708: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_mbstate_t=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 12266 "configure" +cat "conftest.$ac_ext" >&5 +cat >"conftest.$ac_ext" <<_ACEOF +#line 12715 "configure" #include "confdefs.h" #include @@ -12281,29 +12730,29 @@ mbstate_t value return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12285: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12734: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12288: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12291: \"$ac_try\"") >&5 + echo "$as_me:12737: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12740: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12294: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12743: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_mbstate_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_mbstate_t=unknown fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12306: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:12755: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -12321,14 +12770,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:12324: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:12773: checking if we must include wchar.h to declare wchar_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 if test "${cf_cv_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 12331 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 12780 "configure" #include "confdefs.h" #include @@ -12345,24 +12794,24 @@ wchar_t state return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12349: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12798: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12352: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12355: \"$ac_try\"") >&5 + echo "$as_me:12801: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12804: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12358: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12807: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_wchar_t=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 12365 "configure" +cat "conftest.$ac_ext" >&5 +cat >"conftest.$ac_ext" <<_ACEOF +#line 12814 "configure" #include "confdefs.h" #include @@ -12380,29 +12829,29 @@ wchar_t value return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12384: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12833: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12387: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12390: \"$ac_try\"") >&5 + echo "$as_me:12836: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12839: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12393: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12842: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_wchar_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_wchar_t=unknown fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12405: result: $cf_cv_wchar_t" >&5 +echo "$as_me:12854: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -12425,14 +12874,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:12428: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:12877: checking if we must include wchar.h to declare wint_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 if test "${cf_cv_wint_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 12435 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 12884 "configure" #include "confdefs.h" #include @@ -12449,24 +12898,24 @@ wint_t state return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12453: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12902: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12456: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12459: \"$ac_try\"") >&5 + echo "$as_me:12905: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12908: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12462: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12911: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_wint_t=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 12469 "configure" +cat "conftest.$ac_ext" >&5 +cat >"conftest.$ac_ext" <<_ACEOF +#line 12918 "configure" #include "confdefs.h" #include @@ -12484,29 +12933,29 @@ wint_t value return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12488: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12937: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12491: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12494: \"$ac_try\"") >&5 + echo "$as_me:12940: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12943: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12497: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12946: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_wint_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_wint_t=unknown fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12509: result: $cf_cv_wint_t" >&5 +echo "$as_me:12958: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -12538,7 +12987,7 @@ EOF fi ### use option --disable-lp64 to allow long chtype -echo "$as_me:12541: checking whether to enable _LP64 definition in curses.h" >&5 +echo "$as_me:12990: checking whether to enable _LP64 definition in curses.h" >&5 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6 # Check whether --enable-lp64 or --disable-lp64 was given. @@ -12548,7 +12997,7 @@ if test "${enable_lp64+set}" = set; then else with_lp64=$cf_dft_with_lp64 fi; -echo "$as_me:12551: result: $with_lp64" >&5 +echo "$as_me:13000: result: $with_lp64" >&5 echo "${ECHO_T}$with_lp64" >&6 if test "x$with_lp64" = xyes ; then @@ -12564,7 +13013,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:12567: checking for special C compiler options needed for large files" >&5 + echo "$as_me:13016: checking for special C compiler options needed for large files" >&5 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12575,8 +13024,8 @@ else while :; do # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. - cat >conftest.$ac_ext <<_ACEOF -#line 12579 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13028 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -12595,64 +13044,64 @@ main (void) return 0; } _ACEOF - rm -f conftest.$ac_objext -if { (eval echo "$as_me:12599: \"$ac_compile\"") >&5 + rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13048: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12602: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12605: \"$ac_try\"") >&5 + echo "$as_me:13051: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13054: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12608: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13057: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext +rm -f "conftest.$ac_objext" CC="$CC -n32" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:12618: \"$ac_compile\"") >&5 + rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13067: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12621: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12624: \"$ac_try\"") >&5 + echo "$as_me:13070: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13073: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12627: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13076: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext +rm -f "conftest.$ac_objext" break done CC=$ac_save_CC - rm -f conftest.$ac_ext + rm -f "conftest.$ac_ext" fi fi -echo "$as_me:12641: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:13090: result: $ac_cv_sys_largefile_CC" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:12647: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:13096: checking for _FILE_OFFSET_BITS value needed for large files" >&5 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do ac_cv_sys_file_offset_bits=no - cat >conftest.$ac_ext <<_ACEOF -#line 12655 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13104 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -12671,26 +13120,26 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12675: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13124: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12678: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12681: \"$ac_try\"") >&5 + echo "$as_me:13127: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13130: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12684: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13133: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 12693 "configure" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13142 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -12710,28 +13159,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12714: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13163: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12717: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12720: \"$ac_try\"") >&5 + echo "$as_me:13166: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13169: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12723: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13172: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_sys_file_offset_bits=64; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:12734: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:13183: result: $ac_cv_sys_file_offset_bits" >&5 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 if test "$ac_cv_sys_file_offset_bits" != no; then @@ -12741,15 +13190,15 @@ EOF fi rm -rf conftest* - echo "$as_me:12744: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:13193: checking for _LARGE_FILES value needed for large files" >&5 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do ac_cv_sys_large_files=no - cat >conftest.$ac_ext <<_ACEOF -#line 12752 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13201 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -12768,26 +13217,26 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12772: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13221: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12775: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12778: \"$ac_try\"") >&5 + echo "$as_me:13224: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13227: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12781: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13230: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 12790 "configure" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13239 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -12807,28 +13256,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12811: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13260: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12814: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12817: \"$ac_try\"") >&5 + echo "$as_me:13263: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13266: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12820: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13269: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_sys_large_files=1; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:12831: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:13280: result: $ac_cv_sys_large_files" >&5 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 if test "$ac_cv_sys_large_files" != no; then @@ -12841,15 +13290,15 @@ rm -rf conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:12844: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:13293: checking for _LARGEFILE_SOURCE value needed for large files" >&5 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do ac_cv_sys_largefile_source=no - cat >conftest.$ac_ext <<_ACEOF -#line 12852 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13301 "configure" #include "confdefs.h" #include int @@ -12860,26 +13309,26 @@ return !fseeko; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12864: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13313: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12867: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12870: \"$ac_try\"") >&5 + echo "$as_me:13316: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13319: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12873: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13322: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 12882 "configure" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13331 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include @@ -12891,28 +13340,28 @@ return !fseeko; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12895: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13344: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12898: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12901: \"$ac_try\"") >&5 + echo "$as_me:13347: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13350: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12904: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13353: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_sys_largefile_source=1; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:12915: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:13364: result: $ac_cv_sys_largefile_source" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 if test "$ac_cv_sys_largefile_source" != no; then @@ -12926,13 +13375,13 @@ rm -rf conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -echo "$as_me:12929: checking for fseeko" >&5 +echo "$as_me:13378: checking for fseeko" >&5 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 if test "${ac_cv_func_fseeko+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 12935 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13384 "configure" #include "confdefs.h" #include int @@ -12943,27 +13392,27 @@ return fseeko && fseeko (stdin, 0, 0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12947: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:13396: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12950: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12953: \"$ac_try\"") >&5 + echo "$as_me:13399: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:13402: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12956: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13405: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_fseeko=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_fseeko=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:12966: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:13415: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -13002,14 +13451,14 @@ fi fi - echo "$as_me:13005: checking whether to use struct dirent64" >&5 + echo "$as_me:13454: checking whether to use struct dirent64" >&5 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 if test "${cf_cv_struct_dirent64+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 13012 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13461 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types" @@ -13031,28 +13480,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13035: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13484: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13038: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13041: \"$ac_try\"") >&5 + echo "$as_me:13487: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13490: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13044: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13493: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_struct_dirent64=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_struct_dirent64=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13055: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:13504: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF @@ -13062,7 +13511,7 @@ EOF fi ### use option --disable-tparm-varargs to make tparm() conform to X/Open -echo "$as_me:13065: checking if you want tparm not to use X/Open fixed-parameter list" >&5 +echo "$as_me:13514: checking if you want tparm not to use X/Open fixed-parameter list" >&5 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. @@ -13072,14 +13521,14 @@ if test "${enable_tparm_varargs+set}" = set; then else with_tparm_varargs=yes fi; -echo "$as_me:13075: result: $with_tparm_varargs" >&5 +echo "$as_me:13524: result: $with_tparm_varargs" >&5 echo "${ECHO_T}$with_tparm_varargs" >&6 NCURSES_TPARM_VARARGS=0 test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1 ### use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw if test "$with_ticlib" != no ; then -echo "$as_me:13082: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 +echo "$as_me:13531: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6 # Check whether --enable-tic-depends or --disable-tic-depends was given. @@ -13089,14 +13538,14 @@ if test "${enable_tic_depends+set}" = set; then else with_tic_depends=yes fi; -echo "$as_me:13092: result: $with_tic_depends" >&5 +echo "$as_me:13541: result: $with_tic_depends" >&5 echo "${ECHO_T}$with_tic_depends" >&6 else with_tic_depends=no fi ### use option --disable-wattr-macros to suppress wattr* macros from curses.h -echo "$as_me:13099: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5 +echo "$as_me:13548: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5 echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6 # Check whether --enable-wattr-macros or --disable-wattr-macros was given. @@ -13108,15 +13557,15 @@ else fi; if [ "x$with_wattr_macros" != xyes ]; then NCURSES_WATTR_MACROS=0 - echo "$as_me:13111: result: yes" >&5 + echo "$as_me:13560: result: yes" >&5 echo "${ECHO_T}yes" >&6 else NCURSES_WATTR_MACROS=1 - echo "$as_me:13115: result: no" >&5 + echo "$as_me:13564: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:13119: checking for X11 rgb file" >&5 +echo "$as_me:13568: checking for X11 rgb file" >&5 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6 # Check whether --with-x11-rgb or --without-x11-rgb was given. @@ -13168,19 +13617,19 @@ case ".$cf_path" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval cf_path="$cf_path" case ".$cf_path" in (.NONE/*) - cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%` + cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%` + cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:13183: error: expected a pathname, not \"$cf_path\"" >&5 + { { echo "$as_me:13632: error: expected a pathname, not \"$cf_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -13188,7 +13637,7 @@ esac fi -echo "$as_me:13191: result: $RGB_PATH" >&5 +echo "$as_me:13640: result: $RGB_PATH" >&5 echo "${ECHO_T}$RGB_PATH" >&6 cat >>confdefs.h <&5 +echo "$as_me:13654: checking for type of bool" >&5 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 # Check whether --with-bool or --without-bool was given. @@ -13212,10 +13661,10 @@ if test "${with_bool+set}" = set; then else NCURSES_BOOL=auto fi; -echo "$as_me:13215: result: $NCURSES_BOOL" >&5 +echo "$as_me:13664: result: $NCURSES_BOOL" >&5 echo "${ECHO_T}$NCURSES_BOOL" >&6 -echo "$as_me:13218: checking for alternate terminal capabilities file" >&5 +echo "$as_me:13667: checking for alternate terminal capabilities file" >&5 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 # Check whether --with-caps or --without-caps was given. @@ -13226,11 +13675,11 @@ else TERMINFO_CAPS=Caps fi; test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps -echo "$as_me:13229: result: $TERMINFO_CAPS" >&5 +echo "$as_me:13678: result: $TERMINFO_CAPS" >&5 echo "${ECHO_T}$TERMINFO_CAPS" >&6 ### use option --with-chtype to override chtype's type -echo "$as_me:13233: checking for type of chtype" >&5 +echo "$as_me:13682: checking for type of chtype" >&5 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 # Check whether --with-chtype or --without-chtype was given. @@ -13240,11 +13689,11 @@ if test "${with_chtype+set}" = set; then else NCURSES_CHTYPE=$cf_dft_chtype fi; -echo "$as_me:13243: result: $NCURSES_CHTYPE" >&5 +echo "$as_me:13692: result: $NCURSES_CHTYPE" >&5 echo "${ECHO_T}$NCURSES_CHTYPE" >&6 ### use option --with-ospeed to override ospeed's type -echo "$as_me:13247: checking for type of ospeed" >&5 +echo "$as_me:13696: checking for type of ospeed" >&5 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 # Check whether --with-ospeed or --without-ospeed was given. @@ -13254,11 +13703,11 @@ if test "${with_ospeed+set}" = set; then else NCURSES_OSPEED=short fi; -echo "$as_me:13257: result: $NCURSES_OSPEED" >&5 +echo "$as_me:13706: result: $NCURSES_OSPEED" >&5 echo "${ECHO_T}$NCURSES_OSPEED" >&6 ### use option --with-mmask-t to override mmask_t's type -echo "$as_me:13261: checking for type of mmask_t" >&5 +echo "$as_me:13710: checking for type of mmask_t" >&5 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6 # Check whether --with-mmask-t or --without-mmask-t was given. @@ -13268,11 +13717,11 @@ if test "${with_mmask_t+set}" = set; then else NCURSES_MMASK_T=$cf_dft_mmask_t fi; -echo "$as_me:13271: result: $NCURSES_MMASK_T" >&5 +echo "$as_me:13720: result: $NCURSES_MMASK_T" >&5 echo "${ECHO_T}$NCURSES_MMASK_T" >&6 ### use option --with-ccharw-max to override CCHARW_MAX size -echo "$as_me:13275: checking for size CCHARW_MAX" >&5 +echo "$as_me:13724: checking for size CCHARW_MAX" >&5 echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6 # Check whether --with-ccharw-max or --without-ccharw-max was given. @@ -13282,16 +13731,16 @@ if test "${with_ccharw_max+set}" = set; then else NCURSES_CCHARW_MAX=5 fi; -echo "$as_me:13285: result: $NCURSES_CCHARW_MAX" >&5 +echo "$as_me:13734: result: $NCURSES_CCHARW_MAX" >&5 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6 -echo "$as_me:13288: checking for ANSI C header files" >&5 +echo "$as_me:13737: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 13294 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13743 "configure" #include "confdefs.h" #include #include @@ -13299,14 +13748,14 @@ else #include _ACEOF -if { (eval echo "$as_me:13302: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:13751: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:13308: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:13757: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -13319,21 +13768,21 @@ if test -z "$ac_cpp_err"; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line 13330 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13779 "configure" #include "confdefs.h" #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then + $EGREP "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -13344,14 +13793,14 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line 13348 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13797 "configure" #include "confdefs.h" #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then + $EGREP "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -13365,8 +13814,8 @@ if test $ac_cv_header_stdc = yes; then if test "$cross_compiling" = yes; then : else - cat >conftest.$ac_ext <<_ACEOF -#line 13369 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13818 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -13391,29 +13840,29 @@ main (void) $ac_main_return (0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:13395: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:13844: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13398: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13400: \"$ac_try\"") >&5 + echo "$as_me:13847: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:13849: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13403: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13852: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_header_stdc=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi fi -echo "$as_me:13416: result: $ac_cv_header_stdc" >&5 +echo "$as_me:13865: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -13429,40 +13878,40 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:13432: checking for $ac_header" >&5 +echo "$as_me:13881: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 13438 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13887 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13444: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13893: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13447: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13450: \"$ac_try\"") >&5 + echo "$as_me:13896: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13899: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13453: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13902: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13463: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then +echo "$as_me:13912: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:13922: checking for signed char" >&5 echo $ECHO_N "checking for signed char... $ECHO_C" >&6 if test "${ac_cv_type_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 13479 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13928 "configure" #include "confdefs.h" $ac_includes_default int @@ -13490,30 +13939,30 @@ if (sizeof (signed char)) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13494: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13943: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13497: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13500: \"$ac_try\"") >&5 + echo "$as_me:13946: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13949: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13503: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13952: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_type_signed_char=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_type_signed_char=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13513: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:13962: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:13516: checking size of signed char" >&5 +echo "$as_me:13965: checking size of signed char" >&5 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 if test "${ac_cv_sizeof_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13521,8 +13970,8 @@ else if test "$ac_cv_type_signed_char" = yes; then if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -#line 13525 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 13974 "configure" #include "confdefs.h" $ac_includes_default int @@ -13533,22 +13982,22 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13537: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13986: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13540: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13543: \"$ac_try\"") >&5 + echo "$as_me:13989: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13992: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13546: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13995: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 13551 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 14000 "configure" #include "confdefs.h" $ac_includes_default int @@ -13559,33 +14008,33 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13563: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:14012: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13566: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13569: \"$ac_try\"") >&5 + echo "$as_me:14015: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14018: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13572: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14021: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` +cat "conftest.$ac_ext" >&5 +ac_lo=`expr "$ac_mid" + 1`; ac_mid=`expr 2 '*' "$ac_mid" + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 13588 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 14037 "configure" #include "confdefs.h" $ac_includes_default int @@ -13596,33 +14045,33 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13600: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:14049: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13603: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13606: \"$ac_try\"") >&5 + echo "$as_me:14052: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14055: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13609: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14058: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` +cat "conftest.$ac_ext" >&5 +ac_hi=`expr "$ac_mid" - 1`; ac_mid=`expr 2 '*' "$ac_mid"` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -#line 13625 "configure" + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +#line 14074 "configure" #include "confdefs.h" $ac_includes_default int @@ -13633,35 +14082,35 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13637: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:14086: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13640: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13643: \"$ac_try\"") >&5 + echo "$as_me:14089: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14092: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13646: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14095: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` +cat "conftest.$ac_ext" >&5 +ac_lo=`expr "$ac_mid" + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done ac_cv_sizeof_signed_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:13659: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:14108: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else - cat >conftest.$ac_ext <<_ACEOF -#line 13664 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 14113 "configure" #include "confdefs.h" $ac_includes_default int @@ -13670,30 +14119,30 @@ main (void) FILE *f = fopen ("conftest.val", "w"); if (!f) $ac_main_return (1); -fprintf (f, "%d", (sizeof (signed char))); +fprintf (f, "%ld", (long)(sizeof (signed char))); fclose (f); ; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:13680: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:14129: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13683: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13685: \"$ac_try\"") >&5 + echo "$as_me:14132: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:14134: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13688: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14137: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_sizeof_signed_char=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi rm -f conftest.val @@ -13701,7 +14150,7 @@ else ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:13704: result: $ac_cv_sizeof_signed_char" >&5 +echo "$as_me:14153: result: $ac_cv_sizeof_signed_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 cat >>confdefs.h <&5 +echo "$as_me:14164: checking if you want to use signed Boolean array in term.h" >&5 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 # Check whether --enable-signed-char or --disable-signed-char was given. @@ -13722,12 +14171,12 @@ if test "${enable_signed_char+set}" = set; then else with_signed_char=no fi; -echo "$as_me:13725: result: $with_signed_char" >&5 +echo "$as_me:14174: result: $with_signed_char" >&5 echo "${ECHO_T}$with_signed_char" >&6 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char" ### use option --with-tparm-arg to override tparm's argument type -echo "$as_me:13730: checking for type of tparm args" >&5 +echo "$as_me:14179: checking for type of tparm args" >&5 echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6 # Check whether --with-tparm-arg or --without-tparm-arg was given. @@ -13737,11 +14186,11 @@ if test "${with_tparm_arg+set}" = set; then else NCURSES_TPARM_ARG=$cf_dft_tparm_arg fi; -echo "$as_me:13740: result: $NCURSES_TPARM_ARG" >&5 +echo "$as_me:14189: result: $NCURSES_TPARM_ARG" >&5 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6 ### Enable compiling-in rcs id's -echo "$as_me:13744: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:14193: checking if RCS identifiers should be compiled-in" >&5 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 # Check whether --with-rcs-ids or --without-rcs-ids was given. @@ -13751,7 +14200,7 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:13754: result: $with_rcs_ids" >&5 +echo "$as_me:14203: result: $with_rcs_ids" >&5 echo "${ECHO_T}$with_rcs_ids" >&6 test "x$with_rcs_ids" = xyes && cat >>confdefs.h <<\EOF @@ -13760,7 +14209,7 @@ EOF ############################################################################### -echo "$as_me:13763: checking format of man-pages" >&5 +echo "$as_me:14212: checking format of man-pages" >&5 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 # Check whether --with-manpage-format or --without-manpage-format was given. @@ -13776,7 +14225,7 @@ MANPAGE_FORMAT=`echo "$MANPAGE_FORMAT" | sed -e 's/,/ /g'` cf_unknown= -case $MANPAGE_FORMAT in +case "$MANPAGE_FORMAT" in (unknown) if test -z "$MANPATH" ; then MANPATH="/usr/man:/usr/share/man" @@ -13784,16 +14233,16 @@ case $MANPAGE_FORMAT in # look for the 'date' man-page (it's most likely to be installed!) MANPAGE_FORMAT= - cf_preform=no - cf_catonly=yes - cf_example=date + cf_preform="no" + cf_catonly="yes" + cf_example="date" IFS="${IFS:- }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for cf_dir in $MANPATH; do test -z "$cf_dir" && cf_dir=/usr/man for cf_name in $cf_dir/man*/$cf_example.[01]* $cf_dir/cat*/$cf_example.[01]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example do - cf_test=`echo $cf_name | sed -e 's/*//'` + cf_test=`echo "$cf_name" | sed -e 's/*//'` if test "x$cf_test" = "x$cf_name" ; then case "$cf_name" in @@ -13824,7 +14273,7 @@ case $MANPAGE_FORMAT in cf_found=yes ;; esac - test $cf_found=yes && break + test "$cf_found" = yes && break fi done # only check the first directory in $MANPATH where we find manpages @@ -13838,7 +14287,7 @@ case $MANPAGE_FORMAT in ;; (*) for cf_option in $MANPAGE_FORMAT; do - case $cf_option in + case "$cf_option" in (gzip|compress|BSDI|normal|formatted|catonly) ;; (*) @@ -13849,14 +14298,14 @@ case $MANPAGE_FORMAT in ;; esac -echo "$as_me:13852: result: $MANPAGE_FORMAT" >&5 +echo "$as_me:14301: result: $MANPAGE_FORMAT" >&5 echo "${ECHO_T}$MANPAGE_FORMAT" >&6 if test -n "$cf_unknown" ; then - { echo "$as_me:13855: WARNING: Unexpected manpage-format $cf_unknown" >&5 + { echo "$as_me:14304: WARNING: Unexpected manpage-format $cf_unknown" >&5 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} fi -echo "$as_me:13859: checking for manpage renaming" >&5 +echo "$as_me:14308: checking for manpage renaming" >&5 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 # Check whether --with-manpage-renames or --without-manpage-renames was given. @@ -13873,7 +14322,7 @@ case ".$MANPAGE_RENAMES" in (.|.yes) # Debian 'man' program? if test -f /etc/debian_version ; then - MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames + MANPAGE_RENAMES=`cd "$srcdir" && pwd`/man/man_db.renames else MANPAGE_RENAMES=no fi @@ -13881,10 +14330,10 @@ case ".$MANPAGE_RENAMES" in esac if test "$MANPAGE_RENAMES" != no ; then - if test -f $srcdir/man/$MANPAGE_RENAMES ; then - MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES - elif test ! -f $MANPAGE_RENAMES ; then - { { echo "$as_me:13887: error: not a filename: $MANPAGE_RENAMES" >&5 + if test -f "$srcdir/man/$MANPAGE_RENAMES" ; then + MANPAGE_RENAMES=`cd "$srcdir/man" && pwd`/$MANPAGE_RENAMES + elif test ! -f "$MANPAGE_RENAMES" ; then + { { echo "$as_me:14336: error: not a filename: $MANPAGE_RENAMES" >&5 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} { (exit 1); exit 1; }; } fi @@ -13894,14 +14343,14 @@ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} # Construct a sed-script to perform renaming within man-pages if test -n "$MANPAGE_RENAMES" ; then test ! -d man && mkdir man - $SHELL $srcdir/man/make_sed.sh $MANPAGE_RENAMES >./edit_man.sed + $SHELL "$srcdir/man/make_sed.sh" "$MANPAGE_RENAMES" >./edit_man.sed fi fi -echo "$as_me:13901: result: $MANPAGE_RENAMES" >&5 +echo "$as_me:14350: result: $MANPAGE_RENAMES" >&5 echo "${ECHO_T}$MANPAGE_RENAMES" >&6 -echo "$as_me:13904: checking if manpage aliases will be installed" >&5 +echo "$as_me:14353: checking if manpage aliases will be installed" >&5 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 # Check whether --with-manpage-aliases or --without-manpage-aliases was given. @@ -13912,7 +14361,7 @@ else MANPAGE_ALIASES=yes fi; -echo "$as_me:13915: result: $MANPAGE_ALIASES" >&5 +echo "$as_me:14364: result: $MANPAGE_ALIASES" >&5 echo "${ECHO_T}$MANPAGE_ALIASES" >&6 case "x$LN_S" in @@ -13926,7 +14375,7 @@ esac MANPAGE_SYMLINKS=no if test "$MANPAGE_ALIASES" = yes ; then -echo "$as_me:13929: checking if manpage symlinks should be used" >&5 +echo "$as_me:14378: checking if manpage symlinks should be used" >&5 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. @@ -13939,17 +14388,17 @@ fi; if test "$$cf_use_symlinks" = no; then if test "$MANPAGE_SYMLINKS" = yes ; then - { echo "$as_me:13942: WARNING: cannot make symlinks" >&5 + { echo "$as_me:14391: WARNING: cannot make symlinks" >&5 echo "$as_me: WARNING: cannot make symlinks" >&2;} MANPAGE_SYMLINKS=no fi fi -echo "$as_me:13948: result: $MANPAGE_SYMLINKS" >&5 +echo "$as_me:14397: result: $MANPAGE_SYMLINKS" >&5 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 fi -echo "$as_me:13952: checking for manpage tbl" >&5 +echo "$as_me:14401: checking for manpage tbl" >&5 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 # Check whether --with-manpage-tbl or --without-manpage-tbl was given. @@ -13960,7 +14409,7 @@ else MANPAGE_TBL=no fi; -echo "$as_me:13963: result: $MANPAGE_TBL" >&5 +echo "$as_me:14412: result: $MANPAGE_TBL" >&5 echo "${ECHO_T}$MANPAGE_TBL" >&6 if test "$prefix" = "NONE" ; then @@ -14041,7 +14490,7 @@ shift || exit 1 if test "\$form" = normal ; then if test "$cf_format" = yes ; then if test "$cf_inboth" = no ; then - $SHELL \$0 format \$verb \$mandir \$srcdir \$* + $SHELL "\$0" format "\$verb" "\$mandir" "\$srcdir" "\$@" exit $? fi fi @@ -14053,19 +14502,19 @@ else fi # process the list of source-files -for i in \$* ; do +for i in "\$@" ; do case \$i in (*.orig|*.rej) ;; (*.[0-9]*) section=\`expr "\$i" : '.*\\.\\([0-9]\\)[xm]*'\`; - if test \$verb = installing ; then - if test ! -d \$cf_subdir\${section} ; then - mkdir -p \$cf_subdir\$section + if test "\$verb" = installing ; then + if test ! -d "\$cf_subdir\${section}" ; then + mkdir -p "\$cf_subdir\$section" fi fi # replace variables in man page - if test ! -f $cf_man_alias ; then + if test ! -f "$cf_man_alias" ; then cat >>$cf_man_alias <<-CF_EOF2 s,@DATADIR@,\$datadir,g s,@TERMINFO@,\${TERMINFO:="no default value"},g @@ -14079,7 +14528,7 @@ CF_EOF for cf_name in captoinfo clear infocmp infotocap reset tabs tic toe tput tset do cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cf_name=`echo $cf_name|sed "$program_transform_name"` + cf_name=`echo "$cf_name" | sed "$program_transform_name"` cat >>$cf_edit_man <<-CF_EOF s,@$cf_NAME@,$cf_name,g CF_EOF @@ -14091,11 +14540,11 @@ CF_EOF2 fi aliases= - cf_source=\`basename \$i\` + cf_source=\`basename "\$i"\` inalias=\$cf_source - test ! -f \$inalias && inalias="\$srcdir/\$inalias" - if test ! -f \$inalias ; then - echo .. skipped \$cf_source + test ! -f "\$inalias" && inalias="\$srcdir/\$inalias" + if test ! -f "\$inalias" ; then + echo ".. skipped \$cf_source" continue fi CF_EOF @@ -14103,8 +14552,8 @@ CF_EOF if test "$MANPAGE_ALIASES" != no ; then cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP + < "\$i" | sed -f `pwd`/edit_man.sed >\$TMP CF_EOF else cat >>$cf_edit_man <\$TMP + < "\$i" >\$TMP CF_EOF fi @@ -14150,22 +14599,22 @@ if test \$cf_tables = yes ; then fi CF_EOF -if test $with_overwrite != yes ; then +if test "$with_overwrite" != yes ; then cat >>$cf_edit_man <\$TMP.out + sed -e "/\\#[ ]*include/s,\$TMP.out mv \$TMP.out \$TMP CF_EOF fi -if test $with_curses_h != yes ; then +if test "$with_curses_h" != yes ; then cat >>$cf_edit_man <\$TMP.out + sed -e "/\\#[ ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out mv \$TMP.out \$TMP CF_EOF fi cat >>$cf_edit_man <\$TMP.out mv \$TMP.out \$TMP fi @@ -14173,8 +14622,8 @@ CF_EOF if test -n "$cf_compress" ; then cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <&5 +echo "$as_me:14745: checking if you want to build with function extensions" >&5 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. @@ -14303,7 +14752,7 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:14306: result: $with_ext_funcs" >&5 +echo "$as_me:14755: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "x$with_ext_funcs" = xyes ; then NCURSES_EXT_FUNCS=1 @@ -14363,7 +14812,7 @@ else GENERATED_EXT_FUNCS= fi -echo "$as_me:14366: checking if you want to build with SCREEN extensions" >&5 +echo "$as_me:14815: checking if you want to build with SCREEN extensions" >&5 echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6 # Check whether --enable-sp-funcs or --disable-sp-funcs was given. @@ -14373,7 +14822,7 @@ if test "${enable_sp_funcs+set}" = set; then else with_sp_funcs=$cf_dft_ext_spfuncs fi; -echo "$as_me:14376: result: $with_sp_funcs" >&5 +echo "$as_me:14825: result: $with_sp_funcs" >&5 echo "${ECHO_T}$with_sp_funcs" >&6 if test "x$with_sp_funcs" = xyes ; then NCURSES_SP_FUNCS=1 @@ -14392,7 +14841,7 @@ else GENERATED_SP_FUNCS= fi -echo "$as_me:14395: checking if you want to build with terminal-driver" >&5 +echo "$as_me:14844: checking if you want to build with terminal-driver" >&5 echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6 # Check whether --enable-term-driver or --disable-term-driver was given. @@ -14402,7 +14851,7 @@ if test "${enable_term_driver+set}" = set; then else with_term_driver=no fi; -echo "$as_me:14405: result: $with_term_driver" >&5 +echo "$as_me:14854: result: $with_term_driver" >&5 echo "${ECHO_T}$with_term_driver" >&6 if test "x$with_term_driver" = xyes ; then @@ -14411,19 +14860,19 @@ cat >>confdefs.h <<\EOF EOF if test "x$with_termlib" != xno ; then - { { echo "$as_me:14414: error: The term-driver option conflicts with the termlib option" >&5 + { { echo "$as_me:14863: error: The term-driver option conflicts with the termlib option" >&5 echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;} { (exit 1); exit 1; }; } fi if test "x$with_sp_funcs" != xyes ; then - { { echo "$as_me:14419: error: The term-driver option relies upon sp-funcs" >&5 + { { echo "$as_me:14868: error: The term-driver option relies upon sp-funcs" >&5 echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;} { (exit 1); exit 1; }; } fi fi ### use option --enable-const to turn on use of const beyond that in XSI. -echo "$as_me:14426: checking for extended use of const keyword" >&5 +echo "$as_me:14875: checking for extended use of const keyword" >&5 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 # Check whether --enable-const or --disable-const was given. @@ -14433,7 +14882,7 @@ if test "${enable_const+set}" = set; then else with_ext_const=$cf_dft_ext_const fi; -echo "$as_me:14436: result: $with_ext_const" >&5 +echo "$as_me:14885: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "x$with_ext_const" = xyes ; then @@ -14441,7 +14890,7 @@ if test "x$with_ext_const" = xyes ; then fi ### use option --enable-ext-colors to turn on use of colors beyond 16. -echo "$as_me:14444: checking if you want to use extended colors" >&5 +echo "$as_me:14893: checking if you want to use extended colors" >&5 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 # Check whether --enable-ext-colors or --disable-ext-colors was given. @@ -14451,22 +14900,22 @@ if test "${enable_ext_colors+set}" = set; then else with_ext_colors=$cf_dft_ext_colors fi; -echo "$as_me:14454: result: $with_ext_colors" >&5 +echo "$as_me:14903: result: $with_ext_colors" >&5 echo "${ECHO_T}$with_ext_colors" >&6 NCURSES_EXT_COLORS=0 if test "x$with_ext_colors" = xyes ; then if test "x$with_widec" != xyes ; then - { echo "$as_me:14459: WARNING: This option applies only to wide-character library" >&5 + { echo "$as_me:14908: WARNING: This option applies only to wide-character library" >&5 echo "$as_me: WARNING: This option applies only to wide-character library" >&2;} else # cannot be ABI 5 since it changes sizeof(cchar_t) if test "${with_abi_version+set}" != set; then - case $cf_cv_rel_version in + case "$cf_cv_rel_version" in (5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:14469: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:14918: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -14494,7 +14943,7 @@ EOF fi ### use option --enable-ext-mouse to modify coding to support 5-button mice -echo "$as_me:14497: checking if you want to use extended mouse encoding" >&5 +echo "$as_me:14946: checking if you want to use extended mouse encoding" >&5 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 # Check whether --enable-ext-mouse or --disable-ext-mouse was given. @@ -14504,18 +14953,18 @@ if test "${enable_ext_mouse+set}" = set; then else with_ext_mouse=$cf_dft_ext_mouse fi; -echo "$as_me:14507: result: $with_ext_mouse" >&5 +echo "$as_me:14956: result: $with_ext_mouse" >&5 echo "${ECHO_T}$with_ext_mouse" >&6 NCURSES_MOUSE_VERSION=1 if test "x$with_ext_mouse" = xyes ; then NCURSES_MOUSE_VERSION=2 if test "${with_abi_version+set}" != set; then - case $cf_cv_rel_version in + case "$cf_cv_rel_version" in (5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:14518: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:14967: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -14524,7 +14973,7 @@ fi fi ### use option --enable-ext-putwin to turn on extended screendumps -echo "$as_me:14527: checking if you want to use extended putwin/screendump" >&5 +echo "$as_me:14976: checking if you want to use extended putwin/screendump" >&5 echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6 # Check whether --enable-ext-putwin or --disable-ext-putwin was given. @@ -14534,7 +14983,7 @@ if test "${enable_ext_putwin+set}" = set; then else with_ext_putwin=$cf_dft_ext_putwin fi; -echo "$as_me:14537: result: $with_ext_putwin" >&5 +echo "$as_me:14986: result: $with_ext_putwin" >&5 echo "${ECHO_T}$with_ext_putwin" >&6 if test "x$with_ext_putwin" = xyes ; then @@ -14544,7 +14993,7 @@ EOF fi -echo "$as_me:14547: checking if you want \$NCURSES_NO_PADDING code" >&5 +echo "$as_me:14996: checking if you want \$NCURSES_NO_PADDING code" >&5 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 # Check whether --enable-no-padding or --disable-no-padding was given. @@ -14554,7 +15003,7 @@ if test "${enable_no_padding+set}" = set; then else with_no_padding=$with_ext_funcs fi; -echo "$as_me:14557: result: $with_no_padding" >&5 +echo "$as_me:15006: result: $with_no_padding" >&5 echo "${ECHO_T}$with_no_padding" >&6 test "x$with_no_padding" = xyes && cat >>confdefs.h <<\EOF @@ -14562,7 +15011,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-sigwinch to turn on use of SIGWINCH logic -echo "$as_me:14565: checking if you want SIGWINCH handler" >&5 +echo "$as_me:15014: checking if you want SIGWINCH handler" >&5 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 # Check whether --enable-sigwinch or --disable-sigwinch was given. @@ -14572,7 +15021,7 @@ if test "${enable_sigwinch+set}" = set; then else with_sigwinch=$with_ext_funcs fi; -echo "$as_me:14575: result: $with_sigwinch" >&5 +echo "$as_me:15024: result: $with_sigwinch" >&5 echo "${ECHO_T}$with_sigwinch" >&6 test "x$with_sigwinch" = xyes && cat >>confdefs.h <<\EOF @@ -14580,7 +15029,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-tcap-names to allow user to define new capabilities -echo "$as_me:14583: checking if you want user-definable terminal capabilities like termcap" >&5 +echo "$as_me:15032: checking if you want user-definable terminal capabilities like termcap" >&5 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 # Check whether --enable-tcap-names or --disable-tcap-names was given. @@ -14590,14 +15039,14 @@ if test "${enable_tcap_names+set}" = set; then else with_tcap_names=$with_ext_funcs fi; -echo "$as_me:14593: result: $with_tcap_names" >&5 +echo "$as_me:15042: result: $with_tcap_names" >&5 echo "${ECHO_T}$with_tcap_names" >&6 NCURSES_XNAMES=0 test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1 ############################################################################## -echo "$as_me:14600: checking if you want to link with the pthread library" >&5 +echo "$as_me:15049: checking if you want to link with the pthread library" >&5 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 # Check whether --with-pthread or --without-pthread was given. @@ -14607,28 +15056,28 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:14610: result: $with_pthread" >&5 +echo "$as_me:15059: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:14614: checking for pthread.h" >&5 + echo "$as_me:15063: checking for pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 if test "${ac_cv_header_pthread_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 14620 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15069 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:14624: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:15073: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:14630: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:15079: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -14641,14 +15090,14 @@ if test -z "$ac_cpp_err"; then ac_cv_header_pthread_h=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 ac_cv_header_pthread_h=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:14649: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:15098: result: $ac_cv_header_pthread_h" >&5 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 -if test $ac_cv_header_pthread_h = yes; then +if test "$ac_cv_header_pthread_h" = yes; then cat >>confdefs.h <<\EOF #define HAVE_PTHREADS_H 1 @@ -14656,7 +15105,7 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:14659: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:15108: checking if we can link with the $cf_lib_pthread library" >&5 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -14676,8 +15125,8 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 14680 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15129 "configure" #include "confdefs.h" #include @@ -14693,27 +15142,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14697: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15146: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14700: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14703: \"$ac_try\"") >&5 + echo "$as_me:15149: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15152: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14706: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15155: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then with_pthread=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 with_pthread=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:14716: result: $with_pthread" >&5 + echo "$as_me:15165: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done @@ -14741,7 +15190,7 @@ cat >>confdefs.h <<\EOF EOF else - { { echo "$as_me:14744: error: Cannot link with pthread library" >&5 + { { echo "$as_me:15193: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -14751,13 +15200,13 @@ fi fi if test "x$with_pthread" != xno; then - echo "$as_me:14754: checking for pthread_kill" >&5 + echo "$as_me:15203: checking for pthread_kill" >&5 echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6 if test "${ac_cv_func_pthread_kill+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 14760 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15209 "configure" #include "confdefs.h" #define pthread_kill autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -14787,31 +15236,31 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14791: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15240: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14794: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14797: \"$ac_try\"") >&5 + echo "$as_me:15243: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15246: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14800: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15249: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_pthread_kill=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_pthread_kill=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14810: result: $ac_cv_func_pthread_kill" >&5 +echo "$as_me:15259: result: $ac_cv_func_pthread_kill" >&5 echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6 -if test $ac_cv_func_pthread_kill = yes; then +if test "$ac_cv_func_pthread_kill" = yes; then - echo "$as_me:14814: checking if you want to allow EINTR in wgetch with pthreads" >&5 + echo "$as_me:15263: checking if you want to allow EINTR in wgetch with pthreads" >&5 echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6 # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given. @@ -14821,7 +15270,7 @@ if test "${enable_pthreads_eintr+set}" = set; then else use_pthreads_eintr=no fi; - echo "$as_me:14824: result: $use_pthreads_eintr" >&5 + echo "$as_me:15273: result: $use_pthreads_eintr" >&5 echo "${ECHO_T}$use_pthreads_eintr" >&6 if test "x$use_pthreads_eintr" = xyes ; then @@ -14832,7 +15281,7 @@ EOF fi fi - echo "$as_me:14835: checking if you want to use weak-symbols for pthreads" >&5 + echo "$as_me:15284: checking if you want to use weak-symbols for pthreads" >&5 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. @@ -14842,18 +15291,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; - echo "$as_me:14845: result: $use_weak_symbols" >&5 + echo "$as_me:15294: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "x$use_weak_symbols" = xyes ; then -echo "$as_me:14849: checking if $CC supports weak symbols" >&5 +echo "$as_me:15298: checking if $CC supports weak symbols" >&5 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 if test "${cf_cv_weak_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 14856 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 15305 "configure" #include "confdefs.h" #include @@ -14878,28 +15327,28 @@ weak_symbol(fopen); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14882: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:15331: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14885: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14888: \"$ac_try\"") >&5 + echo "$as_me:15334: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:15337: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14891: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15340: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_weak_symbols=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_weak_symbols=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14902: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:15351: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -14949,7 +15398,7 @@ fi # opaque outside of that, so there is no --enable-opaque option. We can use # this option without --with-pthreads, but this will be always set for # pthreads. -echo "$as_me:14952: checking if you want reentrant code" >&5 +echo "$as_me:15401: checking if you want reentrant code" >&5 echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6 # Check whether --enable-reentrant or --disable-reentrant was given. @@ -14959,7 +15408,7 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=no fi; -echo "$as_me:14962: result: $with_reentrant" >&5 +echo "$as_me:15411: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "x$with_reentrant" = xyes ; then cf_cv_enable_reentrant=1 @@ -15043,11 +15492,11 @@ cat >>confdefs.h <<\EOF EOF if test "${with_abi_version+set}" != set; then - case $cf_cv_rel_version in + case "$cf_cv_rel_version" in (5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:15050: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:15499: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -15059,7 +15508,7 @@ else NCURSES_SIZE_T=short fi -echo "$as_me:15062: checking if you want opaque curses-library structures" >&5 +echo "$as_me:15511: checking if you want opaque curses-library structures" >&5 echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6 # Check whether --enable-opaque-curses or --disable-opaque-curses was given. @@ -15081,16 +15530,16 @@ else test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no fi; -echo "$as_me:15084: result: $enable_opaque_curses" >&5 +echo "$as_me:15533: result: $enable_opaque_curses" >&5 echo "${ECHO_T}$enable_opaque_curses" >&6 test "$cf_cv_enable_reentrant" = 1 && \ test "$enable_opaque_curses" = no && \ -{ { echo "$as_me:15089: error: reentrant configuration requires opaque library" >&5 +{ { echo "$as_me:15538: error: reentrant configuration requires opaque library" >&5 echo "$as_me: error: reentrant configuration requires opaque library" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:15093: checking if you want opaque form-library structures" >&5 +echo "$as_me:15542: checking if you want opaque form-library structures" >&5 echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6 # Check whether --enable-opaque-form or --disable-opaque-form was given. @@ -15100,10 +15549,10 @@ if test "${enable_opaque_form+set}" = set; then else enable_opaque_form=no fi; -echo "$as_me:15103: result: $enable_opaque_form" >&5 +echo "$as_me:15552: result: $enable_opaque_form" >&5 echo "${ECHO_T}$enable_opaque_form" >&6 -echo "$as_me:15106: checking if you want opaque menu-library structures" >&5 +echo "$as_me:15555: checking if you want opaque menu-library structures" >&5 echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6 # Check whether --enable-opaque-menu or --disable-opaque-menu was given. @@ -15113,10 +15562,10 @@ if test "${enable_opaque_menu+set}" = set; then else enable_opaque_menu=no fi; -echo "$as_me:15116: result: $enable_opaque_menu" >&5 +echo "$as_me:15565: result: $enable_opaque_menu" >&5 echo "${ECHO_T}$enable_opaque_menu" >&6 -echo "$as_me:15119: checking if you want opaque panel-library structures" >&5 +echo "$as_me:15568: checking if you want opaque panel-library structures" >&5 echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6 # Check whether --enable-opaque-panel or --disable-opaque-panel was given. @@ -15126,7 +15575,7 @@ if test "${enable_opaque_panel+set}" = set; then else enable_opaque_panel=no fi; -echo "$as_me:15129: result: $enable_opaque_panel" >&5 +echo "$as_me:15578: result: $enable_opaque_panel" >&5 echo "${ECHO_T}$enable_opaque_panel" >&6 NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1 @@ -15136,7 +15585,7 @@ NCURSES_OPAQUE_PANEL=0; test "$enable_opaque_panel" = yes && NCURSES_OPAQUE_PAN ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:15139: checking for prefix used to wrap public variables" >&5 + echo "$as_me:15588: checking for prefix used to wrap public variables" >&5 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 # Check whether --with-wrap-prefix or --without-wrap-prefix was given. @@ -15146,7 +15595,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:15149: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:15598: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -15159,7 +15608,7 @@ EOF ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:15162: checking if you want all development code" >&5 +echo "$as_me:15611: checking if you want all development code" >&5 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 # Check whether --with-develop or --without-develop was given. @@ -15169,11 +15618,11 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:15172: result: $with_develop" >&5 +echo "$as_me:15621: result: $with_develop" >&5 echo "${ECHO_T}$with_develop" >&6 ### use option --enable-hard-tabs to turn on use of hard-tabs optimize -echo "$as_me:15176: checking if you want hard-tabs code" >&5 +echo "$as_me:15625: checking if you want hard-tabs code" >&5 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 # Check whether --enable-hard-tabs or --disable-hard-tabs was given. @@ -15183,7 +15632,7 @@ if test "${enable_hard_tabs+set}" = set; then else enable_hard_tabs=$with_develop fi; -echo "$as_me:15186: result: $enable_hard_tabs" >&5 +echo "$as_me:15635: result: $enable_hard_tabs" >&5 echo "${ECHO_T}$enable_hard_tabs" >&6 test "x$enable_hard_tabs" = xyes && cat >>confdefs.h <<\EOF @@ -15191,7 +15640,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize -echo "$as_me:15194: checking if you want limited support for xmc" >&5 +echo "$as_me:15643: checking if you want limited support for xmc" >&5 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. @@ -15201,7 +15650,7 @@ if test "${enable_xmc_glitch+set}" = set; then else enable_xmc_glitch=$with_develop fi; -echo "$as_me:15204: result: $enable_xmc_glitch" >&5 +echo "$as_me:15653: result: $enable_xmc_glitch" >&5 echo "${ECHO_T}$enable_xmc_glitch" >&6 test "x$enable_xmc_glitch" = xyes && cat >>confdefs.h <<\EOF @@ -15211,7 +15660,7 @@ EOF ############################################################################### # These are just experimental, probably should not be in a package: -echo "$as_me:15214: checking if you do not want to assume colors are white-on-black" >&5 +echo "$as_me:15663: checking if you do not want to assume colors are white-on-black" >&5 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 # Check whether --enable-assumed-color or --disable-assumed-color was given. @@ -15221,7 +15670,7 @@ if test "${enable_assumed_color+set}" = set; then else with_assumed_color=yes fi; -echo "$as_me:15224: result: $with_assumed_color" >&5 +echo "$as_me:15673: result: $with_assumed_color" >&5 echo "${ECHO_T}$with_assumed_color" >&6 test "x$with_assumed_color" = xyes && cat >>confdefs.h <<\EOF @@ -15229,7 +15678,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-hashmap to turn on use of hashmap scrolling logic -echo "$as_me:15232: checking if you want hashmap scrolling-optimization code" >&5 +echo "$as_me:15681: checking if you want hashmap scrolling-optimization code" >&5 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 # Check whether --enable-hashmap or --disable-hashmap was given. @@ -15239,7 +15688,7 @@ if test "${enable_hashmap+set}" = set; then else with_hashmap=yes fi; -echo "$as_me:15242: result: $with_hashmap" >&5 +echo "$as_me:15691: result: $with_hashmap" >&5 echo "${ECHO_T}$with_hashmap" >&6 test "x$with_hashmap" = xyes && cat >>confdefs.h <<\EOF @@ -15247,7 +15696,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment -echo "$as_me:15250: checking if you want colorfgbg code" >&5 +echo "$as_me:15699: checking if you want colorfgbg code" >&5 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 # Check whether --enable-colorfgbg or --disable-colorfgbg was given. @@ -15257,7 +15706,7 @@ if test "${enable_colorfgbg+set}" = set; then else with_colorfgbg=no fi; -echo "$as_me:15260: result: $with_colorfgbg" >&5 +echo "$as_me:15709: result: $with_colorfgbg" >&5 echo "${ECHO_T}$with_colorfgbg" >&6 test "x$with_colorfgbg" = xyes && cat >>confdefs.h <<\EOF @@ -15265,7 +15714,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-fvisibility to turn on use of gcc-specific feature -echo "$as_me:15268: checking if you want to use gcc -fvisibility option" >&5 +echo "$as_me:15717: checking if you want to use gcc -fvisibility option" >&5 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6 # Check whether --enable-fvisibility or --disable-fvisibility was given. @@ -15275,14 +15724,14 @@ if test "${enable_fvisibility+set}" = set; then else cf_with_fvisibility=no fi; -echo "$as_me:15278: result: $cf_with_fvisibility" >&5 +echo "$as_me:15727: result: $cf_with_fvisibility" >&5 echo "${ECHO_T}$cf_with_fvisibility" >&6 NCURSES_IMPEXP= NCURSES_CXX_IMPEXP= if test "x$cf_with_fvisibility" = xyes; then -echo "$as_me:15285: checking if $CC -fvisibility=hidden option works" >&5 +echo "$as_me:15734: checking if $CC -fvisibility=hidden option works" >&5 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6 if test "${cf_cv_fvisibility_hidden+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15290,8 +15739,8 @@ else cf_save_cflags="$CFLAGS" CFLAGS="$CFLAGS -fvisibility=hidden" - cat >conftest.$ac_ext <<_ACEOF -#line 15294 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15743 "configure" #include "confdefs.h" __attribute__ ((visibility("default"))) int somefunc() {return 42;} @@ -15306,29 +15755,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15310: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15759: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15313: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15316: \"$ac_try\"") >&5 + echo "$as_me:15762: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15765: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15319: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15768: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_fvisibility_hidden=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_fvisibility_hidden=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" CFLAGS=$cf_save_cflags fi -echo "$as_me:15331: result: $cf_cv_fvisibility_hidden" >&5 +echo "$as_me:15780: result: $cf_cv_fvisibility_hidden" >&5 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6 if test "x$cf_cv_fvisibility_hidden" = xyes @@ -15341,19 +15790,19 @@ cf_new_extra_cppflags= for cf_add_cflags in -fvisibility=hidden do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -15372,7 +15821,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -15402,7 +15851,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -15438,12 +15887,12 @@ fi then ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_main_return=return +ac_main_return="return" -echo "$as_me:15446: checking if $CXX -fvisibility=hidden option works" >&5 +echo "$as_me:15895: checking if $CXX -fvisibility=hidden option works" >&5 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6 if test "${cf_cv_fvisibility_hidden2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15451,8 +15900,8 @@ else cf_save_cflags="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -fvisibility=hidden" - cat >conftest.$ac_ext <<_ACEOF -#line 15455 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15904 "configure" #include "confdefs.h" __attribute__ ((visibility("default"))) int somefunc() {return 42;} @@ -15467,29 +15916,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15471: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15920: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15474: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15477: \"$ac_try\"") >&5 + echo "$as_me:15923: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15926: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15480: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15929: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_fvisibility_hidden2=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_fvisibility_hidden2=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" CXXFLAGS=$cf_save_cflags fi -echo "$as_me:15492: result: $cf_cv_fvisibility_hidden2" >&5 +echo "$as_me:15941: result: $cf_cv_fvisibility_hidden2" >&5 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6 if test "x$cf_cv_fvisibility_hidden2" = xyes @@ -15505,19 +15954,19 @@ cf_new_extra_cppflags= for cf_add_cflags in -fvisibility=hidden do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -15536,7 +15985,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -15566,7 +16015,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -15603,16 +16052,16 @@ CFLAGS="$cf_save_CXXFLAGS" fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_main_return=return +ac_main_return="return" fi fi ### use option --enable-interop to turn on use of bindings used for interop -echo "$as_me:15615: checking if you want interop bindings" >&5 +echo "$as_me:16064: checking if you want interop bindings" >&5 echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6 # Check whether --enable-interop or --disable-interop was given. @@ -15622,13 +16071,13 @@ if test "${enable_interop+set}" = set; then else with_exp_interop=$cf_dft_interop fi; -echo "$as_me:15625: result: $with_exp_interop" >&5 +echo "$as_me:16074: result: $with_exp_interop" >&5 echo "${ECHO_T}$with_exp_interop" >&6 NCURSES_INTEROP_FUNCS=0 test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1 -echo "$as_me:15631: checking if you want experimental safe-sprintf code" >&5 +echo "$as_me:16080: checking if you want experimental safe-sprintf code" >&5 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. @@ -15638,13 +16087,13 @@ if test "${enable_safe_sprintf+set}" = set; then else with_safe_sprintf=no fi; -echo "$as_me:15641: result: $with_safe_sprintf" >&5 +echo "$as_me:16090: result: $with_safe_sprintf" >&5 echo "${ECHO_T}$with_safe_sprintf" >&6 ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic # when hashmap is used scroll hints are useless if test "$with_hashmap" = no ; then -echo "$as_me:15647: checking if you want to experiment without scrolling-hints code" >&5 +echo "$as_me:16096: checking if you want to experiment without scrolling-hints code" >&5 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 # Check whether --enable-scroll-hints or --disable-scroll-hints was given. @@ -15654,7 +16103,7 @@ if test "${enable_scroll_hints+set}" = set; then else with_scroll_hints=yes fi; -echo "$as_me:15657: result: $with_scroll_hints" >&5 +echo "$as_me:16106: result: $with_scroll_hints" >&5 echo "${ECHO_T}$with_scroll_hints" >&6 test "x$with_scroll_hints" = xyes && cat >>confdefs.h <<\EOF @@ -15663,7 +16112,7 @@ EOF fi -echo "$as_me:15666: checking if you want wgetch-events code" >&5 +echo "$as_me:16115: checking if you want wgetch-events code" >&5 echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6 # Check whether --enable-wgetch-events or --disable-wgetch-events was given. @@ -15673,18 +16122,58 @@ if test "${enable_wgetch_events+set}" = set; then else with_wgetch_events=no fi; -echo "$as_me:15676: result: $with_wgetch_events" >&5 +echo "$as_me:16125: result: $with_wgetch_events" >&5 echo "${ECHO_T}$with_wgetch_events" >&6 -test "x$with_wgetch_events" = xyes && +if test "x$with_wgetch_events" = xyes ; then + cat >>confdefs.h <<\EOF #define NCURSES_WGETCH_EVENTS 1 EOF + NCURSES_WGETCH_EVENTS=1 +else + NCURSES_WGETCH_EVENTS=0 +fi + +case "$cf_cv_system_name" in +(*mingw32*|*mingw64*|*-msvc*) + echo "$as_me:16140: checking if you want experimental-Windows driver" >&5 +echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6 + +# Check whether --enable-exp-win32 or --disable-exp-win32 was given. +if test "${enable_exp_win32+set}" = set; then + enableval="$enable_exp_win32" + with_exp_win32=$enableval +else + with_exp_win32=no +fi; + echo "$as_me:16150: result: $with_exp_win32" >&5 +echo "${ECHO_T}$with_exp_win32" >&6 + if test "x$with_exp_win32" = xyes + then + +cat >>confdefs.h <<\EOF +#define EXP_WIN32_DRIVER 1 +EOF + + EXP_WIN32_DRIVER=1 + INTERNALS_HDR='$(INCDIR)/nc_win32.h' + else + INTERNALS_HDR='$(INCDIR)/nc_mingw.h' + EXP_WIN32_DRIVER=0 + fi + ;; +(*) + EXP_WIN32_DRIVER=0 + INTERNALS_HDR= + ;; +esac + ############################################################################### ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:15687: checking if you want to see long compiling messages" >&5 +echo "$as_me:16176: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -15718,7 +16207,7 @@ else ECHO_CC='' fi; -echo "$as_me:15721: result: $enableval" >&5 +echo "$as_me:16210: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "x$enable_echo" = xyes; then @@ -15731,7 +16220,7 @@ fi # --disable-stripping is used for debugging -echo "$as_me:15734: checking if you want to install stripped executables" >&5 +echo "$as_me:16223: checking if you want to install stripped executables" >&5 echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6 # Check whether --enable-stripping or --disable-stripping was given. @@ -15739,33 +16228,33 @@ if test "${enable_stripping+set}" = set; then enableval="$enable_stripping" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - with_stripping=no + enable_stripping=no else - with_stripping=yes + enable_stripping=yes fi else enableval=yes - with_stripping=yes + enable_stripping=yes fi; -echo "$as_me:15751: result: $with_stripping" >&5 -echo "${ECHO_T}$with_stripping" >&6 +echo "$as_me:16240: result: $enable_stripping" >&5 +echo "${ECHO_T}$enable_stripping" >&6 -if test "$with_stripping" = yes +if test "$enable_stripping" = yes then INSTALL_OPT_S="-s" else INSTALL_OPT_S= fi -: ${INSTALL:=install} -echo "$as_me:15762: checking if install accepts -p option" >&5 +: "${INSTALL:=install}" +echo "$as_me:16251: checking if install accepts -p option" >&5 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6 if test "${cf_cv_install_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - rm -rf conftest* + rm -rf ./conftest* date >conftest.in mkdir conftest.out sleep 3 @@ -15787,13 +16276,13 @@ else else cf_cv_install_p=no fi - rm -rf conftest* + rm -rf ./conftest* fi -echo "$as_me:15793: result: $cf_cv_install_p" >&5 +echo "$as_me:16282: result: $cf_cv_install_p" >&5 echo "${ECHO_T}$cf_cv_install_p" >&6 -echo "$as_me:15796: checking if install needs to be told about ownership" >&5 +echo "$as_me:16285: checking if install needs to be told about ownership" >&5 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6 case `$ac_config_guess` in (*minix) @@ -15804,11 +16293,11 @@ case `$ac_config_guess` in ;; esac -echo "$as_me:15807: result: $with_install_o" >&5 +echo "$as_me:16296: result: $with_install_o" >&5 echo "${ECHO_T}$with_install_o" >&6 if test "x$with_install_o" = xyes then - INSTALL_OPT_O=`id root|sed -e 's/uid=[0-9]*(/ -o /' -e 's/gid=[0-9]*(/ -g /' -e 's/ [^=[:space:]][^=[:space:]]*=.*/ /' -e 's/)//g'` + INSTALL_OPT_O="`id root|sed -e 's/uid=[0-9]*(/ -o /' -e 's/gid=[0-9]*(/ -g /' -e 's/ [^=[:space:]][^=[:space:]]*=.*/ /' -e 's/)//g'`" else INSTALL_OPT_O= fi @@ -15828,75 +16317,288 @@ then fi ### use option --enable-warnings to turn on all gcc warnings -echo "$as_me:15831: checking if you want to see compiler warnings" >&5 -echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 - -# Check whether --enable-warnings or --disable-warnings was given. -if test "${enable_warnings+set}" = set; then - enableval="$enable_warnings" - with_warnings=$enableval -fi; -echo "$as_me:15839: result: $with_warnings" >&5 -echo "${ECHO_T}$with_warnings" >&6 - -if test "x$with_warnings" = "xyes"; then - ADAFLAGS="$ADAFLAGS -gnatg" +echo "$as_me:16321: checking if you want to use C11 _Noreturn feature" >&5 +echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 -if test "x$have_x" = xyes; then +# Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. +if test "${enable_stdnoreturn+set}" = set; then + enableval="$enable_stdnoreturn" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + enable_stdnoreturn=yes + else + enable_stdnoreturn=no + fi +else + enableval=no + enable_stdnoreturn=no -cf_save_LIBS_CF_CONST_X_STRING="$LIBS" -cf_save_CFLAGS_CF_CONST_X_STRING="$CFLAGS" -cf_save_CPPFLAGS_CF_CONST_X_STRING="$CPPFLAGS" -LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}" -for cf_X_CFLAGS in $X_CFLAGS -do - case "x$cf_X_CFLAGS" in - x-[IUD]*) - CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS" - ;; - *) - CFLAGS="$CFLAGS $cf_X_CFLAGS" - ;; - esac -done +fi; +echo "$as_me:16338: result: $enable_stdnoreturn" >&5 +echo "${ECHO_T}$enable_stdnoreturn" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 15865 "configure" +if test $enable_stdnoreturn = yes; then +echo "$as_me:16342: checking for C11 _Noreturn feature" >&5 +echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 +if test "${cf_cv_c11_noreturn+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 16348 "configure" #include "confdefs.h" +#include #include -#include +#include +static _Noreturn void giveup(void) { exit(0); } int main (void) { -String foo = malloc(1); (void)foo +if (feof(stdin)) giveup() ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:15880: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:16365: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15883: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15886: \"$ac_try\"") >&5 + echo "$as_me:16368: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:16371: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15889: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:16374: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_c11_noreturn=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_c11_noreturn=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + +fi +echo "$as_me:16385: result: $cf_cv_c11_noreturn" >&5 +echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 +else + cf_cv_c11_noreturn=no, +fi + +if test "$cf_cv_c11_noreturn" = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_STDNORETURN_H 1 +EOF + +cat >>confdefs.h <&6 + +echo "${as_me:-configure}:16415: testing repairing CFLAGS: $CFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CFLAGS + do + case "x$cf_temp_scan" in + (x-Werror=*) + + test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " + EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan" + + ;; + (*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; + esac + done + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + +echo "${as_me:-configure}:16438: testing ... fixed $CFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +echo "${as_me:-configure}:16442: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +fi + +if test "$GCC" = yes || test "$GXX" = yes +then + case $CPPFLAGS in + (*-Werror=*) + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +echo "${as_me:-configure}:16454: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CPPFLAGS + do + case "x$cf_temp_scan" in + (x-Werror=*) + + test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " + EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan" + + ;; + (*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; + esac + done + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + +echo "${as_me:-configure}:16477: testing ... fixed $CPPFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +echo "${as_me:-configure}:16481: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +fi + +if test "$GCC" = yes || test "$GXX" = yes +then + case $LDFLAGS in + (*-Werror=*) + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 + +echo "${as_me:-configure}:16493: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $LDFLAGS + do + case "x$cf_temp_scan" in + (x-Werror=*) + + test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " + EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan" + + ;; + (*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; + esac + done + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + +echo "${as_me:-configure}:16516: testing ... fixed $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +echo "${as_me:-configure}:16520: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +fi + +echo "$as_me:16526: checking if you want to turn on gcc warnings" >&5 +echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 + +# Check whether --enable-warnings or --disable-warnings was given. +if test "${enable_warnings+set}" = set; then + enableval="$enable_warnings" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + enable_warnings=yes + else + enable_warnings=no + fi +else + enableval=no + enable_warnings=no + +fi; +echo "$as_me:16543: result: $enable_warnings" >&5 +echo "${ECHO_T}$enable_warnings" >&6 +if test "$enable_warnings" = "yes" +then + +if test "x$have_x" = xyes; then + +cf_save_LIBS_CF_CONST_X_STRING="$LIBS" +cf_save_CFLAGS_CF_CONST_X_STRING="$CFLAGS" +cf_save_CPPFLAGS_CF_CONST_X_STRING="$CPPFLAGS" +LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}" +for cf_X_CFLAGS in $X_CFLAGS +do + case "x$cf_X_CFLAGS" in + x-[IUD]*) + CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS" + ;; + *) + CFLAGS="$CFLAGS $cf_X_CFLAGS" + ;; + esac +done + +cat >"conftest.$ac_ext" <<_ACEOF +#line 16567 "configure" +#include "confdefs.h" + +#include +#include + +int +main (void) +{ +String foo = malloc(1); free((void*)foo) + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:16582: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:16585: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:16588: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16591: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then -echo "$as_me:15892: checking for X11/Xt const-feature" >&5 +echo "$as_me:16594: checking for X11/Xt const-feature" >&5 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 if test "${cf_cv_const_x_string+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 15899 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 16601 "configure" #include "confdefs.h" #define _CONST_X_STRING /* X11R7.8 (perhaps) */ @@ -15912,39 +16614,39 @@ String foo = malloc(1); *foo = 0 return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:15916: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:16618: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15919: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15922: \"$ac_try\"") >&5 + echo "$as_me:16621: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:16624: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15925: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:16627: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_const_x_string=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_const_x_string=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15940: result: $cf_cv_const_x_string" >&5 +echo "$as_me:16642: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" CFLAGS="$cf_save_CFLAGS_CF_CONST_X_STRING" CPPFLAGS="$cf_save_CPPFLAGS_CF_CONST_X_STRING" -case $cf_cv_const_x_string in +case "$cf_cv_const_x_string" in (no) test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " @@ -15961,12 +16663,12 @@ esac else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -cat > conftest.$ac_ext < "conftest.$ac_ext" <&5 + { echo "$as_me:16687: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS="-Wall" + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" for cf_opt in \ wd1419 \ wd1683 \ @@ -15998,12 +16700,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:16001: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:16703: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16004: \$? = $ac_status" >&5 - (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:16006: result: ... -$cf_opt" >&5 + echo "$as_me:16706: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + test -n "$verbose" && echo "$as_me:16708: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -16011,10 +16713,9 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:16014: checking for $CC warning options..." >&5 + { echo "$as_me:16716: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS= cf_warn_CONST="" test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" cf_gcc_warnings="Wignored-qualifiers Wlogical-op Wvarargs" @@ -16035,30 +16736,30 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:16038: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:16739: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16041: \$? = $ac_status" >&5 - (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:16043: result: ... -$cf_opt" >&5 + echo "$as_me:16742: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + test -n "$verbose" && echo "$as_me:16744: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 - case $cf_opt in + case "$cf_opt" in (Winline) - case $GCC_VERSION in + case "$GCC_VERSION" in ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:16051: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:16752: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac ;; (Wpointer-arith) - case $GCC_VERSION in + case "$GCC_VERSION" in ([12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:16061: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:16762: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -16069,121 +16770,338 @@ echo "${as_me:-configure}:16061: testing feature is broken in gcc $GCC_VERSION . done CFLAGS="$cf_save_CFLAGS" fi -rm -rf conftest* - - if test "x$cf_with_cxx" = xyes ; then +rm -rf ./conftest* -INTEL_CPLUSPLUS=no +fi -if test "$GCC" = yes ; then - case $host_os in - (linux*|gnu*) - echo "$as_me:16081: checking if this is really Intel C++ compiler" >&5 -echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 - cf_save_CFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -no-gcc" - cat >conftest.$ac_ext <<_ACEOF -#line 16086 "configure" +if test "$GCC" = yes || test "$GXX" = yes +then +cat > conftest.i <&5 +echo "$as_me: checking for $CC __attribute__ directives..." >&6;} +cat > "conftest.$ac_ext" <&5 +cf_ATTRIBUTE=`echo "$cf_attribute" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cf_directive="__attribute__(($cf_attribute))" + echo "checking for $CC $cf_directive" 1>&5 + + case "$cf_attribute" in + (printf) + cf_printf_attribute=yes + cat >conftest.h <conftest.h <conftest.h <&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16106: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16109: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16112: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - INTEL_CPLUSPLUS=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147" + echo "$as_me:16850: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + test -n "$verbose" && echo "$as_me:16852: result: ... $cf_attribute" >&5 +echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case "$cf_attribute" in + (noreturn) -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext - CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:16123: result: $INTEL_CPLUSPLUS" >&5 -echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 - ;; - esac -fi +cat >>confdefs.h <&5 -echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6 - cf_save_CFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Qunused-arguments" - cat >conftest.$ac_ext <<_ACEOF -#line 16137 "configure" -#include "confdefs.h" +cat >>confdefs.h <<\EOF +#define GCC_PRINTF 1 +EOF -int -main (void) -{ + fi -#ifdef __clang__ -#else -make an error -#endif +cat >>confdefs.h <>confdefs.h <<\EOF +#define GCC_SCANF 1 +EOF + + fi + +cat >>confdefs.h <>confdefs.h <>confdefs.h +fi +rm -rf ./conftest* +fi + +fi + +if test "x$enable_warnings" = "xyes"; then + + ADAFLAGS="$ADAFLAGS -gnatg" + + if test "x$cf_with_cxx" = xyes ; then + +INTEL_CPLUSPLUS=no + +if test "$GCC" = yes ; then + case "$host_os" in + (linux*|gnu*) + echo "$as_me:16924: checking if this is really Intel C++ compiler" >&5 +echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -no-gcc" + cat >"conftest.$ac_ext" <<_ACEOF +#line 16929 "configure" +#include "confdefs.h" + +int +main (void) +{ + +#ifdef __INTEL_COMPILER +#else +make an error +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:16946: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:16949: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:16952: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16955: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + INTEL_CPLUSPLUS=yes +cf_save_CFLAGS="$cf_save_CFLAGS -we147" + +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CXXFLAGS="$cf_save_CFLAGS" + echo "$as_me:16966: result: $INTEL_CPLUSPLUS" >&5 +echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 + ;; + esac +fi + +CLANG_CPLUSPLUS=no + +if test "$GCC" = yes ; then + echo "$as_me:16975: checking if this is really Clang C++ compiler" >&5 +echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CXXFLAGS" + cat >"conftest.$ac_ext" <<_ACEOF +#line 16979 "configure" +#include "confdefs.h" + +int +main (void) +{ + +#ifdef __clang__ +#else +make an error +#endif + + ; + return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:16154: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:16996: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16157: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16160: \"$ac_try\"") >&5 + echo "$as_me:16999: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:17002: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16163: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17005: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then CLANG_CPLUSPLUS=yes -cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:16174: result: $CLANG_CPLUSPLUS" >&5 + echo "$as_me:17015: result: $CLANG_CPLUSPLUS" >&5 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 fi +CLANG_VERSION=none + +if test "x$CLANG_CPLUSPLUS" = "xyes" ; then + case "$CC" in + (c[1-9][0-9]|*/c[1-9][0-9]) + { echo "$as_me:17024: WARNING: replacing broken compiler alias $CC" >&5 +echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;} + CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" + CC=clang + ;; + esac + + echo "$as_me:17031: checking version of $CC" >&5 +echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 + CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + test -z "$CLANG_VERSION" && CLANG_VERSION=unknown + echo "$as_me:17035: result: $CLANG_VERSION" >&5 +echo "${ECHO_T}$CLANG_VERSION" >&6 + + for cf_clang_opt in \ + -Qunused-arguments \ + -Wno-error=implicit-function-declaration + do + echo "$as_me:17042: checking if option $cf_clang_opt works" >&5 +echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cf_clang_opt" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17047 "configure" +#include "confdefs.h" + + #include +int +main (void) +{ + + printf("hello!\\n"); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17061: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17064: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17067: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17070: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_clang_optok=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + cf_clang_optok=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:17081: result: $cf_clang_optok" >&5 +echo "${ECHO_T}$cf_clang_optok" >&6 + CFLAGS="$cf_save_CFLAGS" + if test "$cf_clang_optok" = yes; then + test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 + +echo "${as_me:-configure}:17087: testing adding option $cf_clang_opt ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_clang_opt" + + fi + done +fi + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_main_return=return +ac_main_return="return" cat > conftest.$ac_ext <&5 + { echo "$as_me:17122: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-Wall" @@ -16218,12 +17136,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" - if { (eval echo "$as_me:16221: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17139: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16224: \$? = $ac_status" >&5 - (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:16226: result: ... -$cf_opt" >&5 + echo "$as_me:17142: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + test -n "$verbose" && echo "$as_me:17144: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" fi @@ -16232,13 +17150,13 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GXX" = yes then - { echo "$as_me:16235: checking for $CXX warning options..." >&5 + { echo "$as_me:17153: checking for $CXX warning options..." >&5 echo "$as_me: checking for $CXX warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-W -Wall" cf_gxx_extra_warnings="" test "$with_ext_const" = yes && cf_gxx_extra_warnings="Wwrite-strings" - case "$GCC_VERSION" in + case "$GXX_VERSION" in ([1-2].*) ;; (*) @@ -16262,195 +17180,61 @@ echo "$as_me: checking for $CXX warning options..." >&6;} Wundef $cf_gxx_extra_warnings Wno-unused do CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" - if { (eval echo "$as_me:16265: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17183: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16268: \$? = $ac_status" >&5 - (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:16270: result: ... -$cf_opt" >&5 + echo "$as_me:17186: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + test -n "$verbose" && echo "$as_me:17188: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" else - test -n "$verbose" && echo "$as_me:16274: result: ... no -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:17192: result: ... no -$cf_opt" >&5 echo "${ECHO_T}... no -$cf_opt" >&6 fi done CXXFLAGS="$cf_save_CXXFLAGS" fi -rm -rf conftest* +rm -rf ./conftest* ac_ext=c ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_main_return=return +ac_main_return="return" fi fi -if test "$GCC" = yes -then -cat > conftest.i <&5 -echo "$as_me: checking for $CC __attribute__ directives..." >&6;} -cat > conftest.$ac_ext <&5 - - case $cf_attribute in - (printf) - cf_printf_attribute=yes - cat >conftest.h <conftest.h <conftest.h <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:16365: \$? = $ac_status" >&5 - (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:16367: result: ... $cf_attribute" >&5 -echo "${ECHO_T}... $cf_attribute" >&6 - cat conftest.h >>confdefs.h - case $cf_attribute in - (noreturn) - -cat >>confdefs.h <>confdefs.h <<\EOF -#define GCC_PRINTF 1 -EOF - - fi - -cat >>confdefs.h <>confdefs.h <<\EOF -#define GCC_SCANF 1 -EOF - - fi - -cat >>confdefs.h <>confdefs.h <>confdefs.h -fi -rm -rf conftest* -fi - -echo "$as_me:16426: checking if you want to work around bogus compiler/loader warnings" >&5 +echo "$as_me:17210: checking if you want to work around bogus compiler/loader warnings" >&5 echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 # Check whether --enable-string-hacks or --disable-string-hacks was given. if test "${enable_string_hacks+set}" = set; then enableval="$enable_string_hacks" - with_string_hacks=$enableval + enable_string_hacks=$enableval else - with_string_hacks=no + enable_string_hacks=no fi; -echo "$as_me:16436: result: $with_string_hacks" >&5 -echo "${ECHO_T}$with_string_hacks" >&6 +echo "$as_me:17220: result: $enable_string_hacks" >&5 +echo "${ECHO_T}$enable_string_hacks" >&6 -if test "x$with_string_hacks" = "xyes"; then +if test "x$enable_string_hacks" = "xyes"; then cat >>confdefs.h <<\EOF #define USE_STRING_HACKS 1 EOF - { echo "$as_me:16445: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + { echo "$as_me:17229: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} - echo "$as_me:16447: checking for strlcat" >&5 + echo "$as_me:17231: checking for strlcat" >&5 echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 if test "${ac_cv_func_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 16453 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17237 "configure" #include "confdefs.h" #define strlcat autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -16480,29 +17264,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16484: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17268: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16487: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16490: \"$ac_try\"") >&5 + echo "$as_me:17271: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17274: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16493: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17277: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_strlcat=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_strlcat=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16503: result: $ac_cv_func_strlcat" >&5 +echo "$as_me:17287: result: $ac_cv_func_strlcat" >&5 echo "${ECHO_T}$ac_cv_func_strlcat" >&6 -if test $ac_cv_func_strlcat = yes; then +if test "$ac_cv_func_strlcat" = yes; then cat >>confdefs.h <<\EOF #define HAVE_STRLCAT 1 @@ -16510,15 +17294,15 @@ EOF else - echo "$as_me:16513: checking for strlcat in -lbsd" >&5 + echo "$as_me:17297: checking for strlcat in -lbsd" >&5 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 16521 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17305 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16536,30 +17320,30 @@ strlcat (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16540: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17324: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16543: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16546: \"$ac_try\"") >&5 + echo "$as_me:17327: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17330: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16549: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17333: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_bsd_strlcat=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_bsd_strlcat=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16560: result: $ac_cv_lib_bsd_strlcat" >&5 +echo "$as_me:17344: result: $ac_cv_lib_bsd_strlcat" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 -if test $ac_cv_lib_bsd_strlcat = yes; then +if test "$ac_cv_lib_bsd_strlcat" = yes; then cf_add_libs="$LIBS" # reverse order @@ -16580,24 +17364,24 @@ LIBS="$cf_add_libs" for ac_header in bsd/string.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:16583: checking for $ac_header" >&5 +echo "$as_me:17367: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 16589 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17373 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:16593: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:17377: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:16599: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:17383: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -16610,14 +17394,14 @@ if test -z "$ac_cpp_err"; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:16618: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then +echo "$as_me:17402: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:17423: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 16645 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17429 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -16672,29 +17456,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16676: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17460: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16679: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16682: \"$ac_try\"") >&5 + echo "$as_me:17463: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17466: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16685: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17469: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16695: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then +echo "$as_me:17479: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 +if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:17492: checking if you want to enable runtime assertions" >&5 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 # Check whether --enable-assertions or --disable-assertions was given. @@ -16715,7 +17499,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:16718: result: $with_assertions" >&5 +echo "$as_me:17502: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -16731,27 +17515,32 @@ fi ### use option --disable-leaks to suppress "permanent" leaks, for testing -echo "$as_me:16734: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:17518: checking if you want to use dmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then withval="$with_dmalloc" + case "x$withval" in + (x|xno) ;; + (*) + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" + with_dmalloc=yes cat >>confdefs.h <&5 +echo "$as_me:17540: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 -case .$with_cflags in +case ".$with_cflags" in (.*-g*) case .$CFLAGS in (.*-g*) @@ -16765,19 +17554,19 @@ cf_new_extra_cppflags= for cf_add_cflags in -g do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -16796,7 +17585,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -16826,7 +17615,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -16862,24 +17651,24 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:16865: checking for dmalloc.h" >&5 + echo "$as_me:17654: checking for dmalloc.h" >&5 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 16871 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17660 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:16875: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:17664: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:16881: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:17670: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -16892,24 +17681,24 @@ if test -z "$ac_cpp_err"; then ac_cv_header_dmalloc_h=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 ac_cv_header_dmalloc_h=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:16900: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:17689: result: $ac_cv_header_dmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 -if test $ac_cv_header_dmalloc_h = yes; then +if test "$ac_cv_header_dmalloc_h" = yes; then -echo "$as_me:16904: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:17693: checking for dmalloc_debug in -ldmalloc" >&5 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 16912 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17701 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16927,30 +17716,30 @@ dmalloc_debug (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16931: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17720: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16934: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16937: \"$ac_try\"") >&5 + echo "$as_me:17723: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17726: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16940: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17729: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_dmalloc_dmalloc_debug=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16951: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:17740: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 -if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then +if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then cat >>confdefs.h <&5 +echo "$as_me:17755: checking if you want to use dbmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 # Check whether --with-dbmalloc or --without-dbmalloc was given. if test "${with_dbmalloc+set}" = set; then withval="$with_dbmalloc" + case "x$withval" in + (x|xno) ;; + (*) + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" + with_dbmalloc=yes cat >>confdefs.h <&5 +echo "$as_me:17777: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 -case .$with_cflags in +case ".$with_cflags" in (.*-g*) case .$CFLAGS in (.*-g*) @@ -16997,19 +17791,19 @@ cf_new_extra_cppflags= for cf_add_cflags in -g do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -17028,7 +17822,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -17058,7 +17852,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -17094,24 +17888,24 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:17097: checking for dbmalloc.h" >&5 + echo "$as_me:17891: checking for dbmalloc.h" >&5 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dbmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 17103 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17897 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:17107: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:17901: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:17113: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:17907: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -17124,24 +17918,24 @@ if test -z "$ac_cpp_err"; then ac_cv_header_dbmalloc_h=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 ac_cv_header_dbmalloc_h=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:17132: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:17926: result: $ac_cv_header_dbmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 -if test $ac_cv_header_dbmalloc_h = yes; then +if test "$ac_cv_header_dbmalloc_h" = yes; then -echo "$as_me:17136: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:17930: checking for debug_malloc in -ldbmalloc" >&5 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 17144 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17938 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17159,30 +17953,30 @@ debug_malloc (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17163: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17957: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17166: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17169: \"$ac_try\"") >&5 + echo "$as_me:17960: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17963: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17172: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17966: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_dbmalloc_debug_malloc=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17183: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:17977: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 -if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then +if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then cat >>confdefs.h <&5 +echo "$as_me:17992: checking if you want to use valgrind for testing" >&5 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 # Check whether --with-valgrind or --without-valgrind was given. if test "${with_valgrind+set}" = set; then withval="$with_valgrind" + case "x$withval" in + (x|xno) ;; + (*) + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" + with_valgrind=yes cat >>confdefs.h <&5 +echo "$as_me:18014: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 -case .$with_cflags in +case ".$with_cflags" in (.*-g*) case .$CFLAGS in (.*-g*) @@ -17229,19 +18028,19 @@ cf_new_extra_cppflags= for cf_add_cflags in -g do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -17260,7 +18059,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -17290,7 +18089,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -17325,20 +18124,21 @@ fi ;; esac -echo "$as_me:17328: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:18127: checking if you want to perform memory-leak testing" >&5 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 # Check whether --enable-leaks or --disable-leaks was given. if test "${enable_leaks+set}" = set; then enableval="$enable_leaks" - if test "x$enableval" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi + enable_leaks=$enableval else - : ${with_no_leaks:=no} + enable_leaks=yes fi; -echo "$as_me:17338: result: $with_no_leaks" >&5 +if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi +echo "$as_me:18138: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 -if test "$with_no_leaks" = yes ; then +if test "$enable_leaks" = no ; then cat >>confdefs.h <<\EOF #define NO_LEAKS 1 @@ -17387,7 +18187,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:17390: checking whether to add trace feature to all models" >&5 +echo "$as_me:18190: checking whether to add trace feature to all models" >&5 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 # Check whether --with-trace or --without-trace was given. @@ -17397,7 +18197,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:17400: result: $cf_with_trace" >&5 +echo "$as_me:18200: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "x$cf_with_trace" = xyes ; then @@ -17411,19 +18211,19 @@ cf_new_extra_cppflags= for cf_add_cflags in -DTRACE do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -17442,7 +18242,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -17472,7 +18272,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -17511,7 +18311,7 @@ else ADA_TRACE=FALSE fi -echo "$as_me:17514: checking if we want to use GNAT projects" >&5 +echo "$as_me:18314: checking if we want to use GNAT projects" >&5 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 # Check whether --enable-gnat-projects or --disable-gnat-projects was given. @@ -17528,23 +18328,27 @@ else enable_gnat_projects=yes fi; -echo "$as_me:17531: result: $enable_gnat_projects" >&5 +echo "$as_me:18331: result: $enable_gnat_projects" >&5 echo "${ECHO_T}$enable_gnat_projects" >&6 ### Checks for libraries. -case $cf_cv_system_name in +case "$cf_cv_system_name" in (*mingw32*|*mingw64*) + if test "x$with_exp_win32" = xyes ; then + CPPFLAGS="$CPPFLAGS -DWINVER=0x0600 -DWIN32_LEAN_AND_MEAN" + else CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN" + fi # Note: WINVER may be a problem with Windows 10 ;; (*) -echo "$as_me:17541: checking for gettimeofday" >&5 +echo "$as_me:18345: checking for gettimeofday" >&5 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 if test "${ac_cv_func_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 17547 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18351 "configure" #include "confdefs.h" #define gettimeofday autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -17574,29 +18378,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17578: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18382: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17581: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17584: \"$ac_try\"") >&5 + echo "$as_me:18385: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18388: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17587: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18391: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_gettimeofday=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_gettimeofday=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:17597: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:18401: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 -if test $ac_cv_func_gettimeofday = yes; then +if test "$ac_cv_func_gettimeofday" = yes; then cat >>confdefs.h <<\EOF #define HAVE_GETTIMEOFDAY 1 @@ -17604,15 +18408,15 @@ EOF else -echo "$as_me:17607: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:18411: checking for gettimeofday in -lbsd" >&5 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 17615 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 18419 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17630,30 +18434,30 @@ gettimeofday (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17634: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18438: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17637: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17640: \"$ac_try\"") >&5 + echo "$as_me:18441: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18444: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17643: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18447: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gettimeofday=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_bsd_gettimeofday=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17654: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:18458: result: $ac_cv_lib_bsd_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 -if test $ac_cv_lib_bsd_gettimeofday = yes; then +if test "$ac_cv_lib_bsd_gettimeofday" = yes; then cat >>confdefs.h <<\EOF #define HAVE_GETTIMEOFDAY 1 @@ -17681,14 +18485,14 @@ fi ;; esac -echo "$as_me:17684: checking if -lm needed for math functions" >&5 +echo "$as_me:18488: checking if -lm needed for math functions" >&5 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 if test "${cf_cv_need_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 17691 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18495 "configure" #include "confdefs.h" #include @@ -17698,32 +18502,32 @@ else int main (void) { -double x = rand(); printf("result = %g\n", pow(sin(x),x)) +double x = rand(); printf("result = %g\\n", pow(sin(x),x)) ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17707: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18511: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17710: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17713: \"$ac_try\"") >&5 + echo "$as_me:18514: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18517: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17716: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18520: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_need_libm=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_need_libm=yes fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:17726: result: $cf_cv_need_libm" >&5 +echo "$as_me:18530: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes then @@ -17731,13 +18535,13 @@ MATH_LIB=-lm fi ### Checks for header files. -echo "$as_me:17734: checking for ANSI C header files" >&5 +echo "$as_me:18538: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 17740 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18544 "configure" #include "confdefs.h" #include #include @@ -17745,14 +18549,14 @@ else #include _ACEOF -if { (eval echo "$as_me:17748: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:18552: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:17754: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:18558: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -17765,21 +18569,21 @@ if test -z "$ac_cpp_err"; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line 17776 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18580 "configure" #include "confdefs.h" #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then + $EGREP "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -17790,14 +18594,14 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line 17794 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18598 "configure" #include "confdefs.h" #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then + $EGREP "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -17811,8 +18615,8 @@ if test $ac_cv_header_stdc = yes; then if test "$cross_compiling" = yes; then : else - cat >conftest.$ac_ext <<_ACEOF -#line 17815 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18619 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -17837,29 +18641,29 @@ main (void) $ac_main_return (0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:17841: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:18645: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17844: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17846: \"$ac_try\"") >&5 + echo "$as_me:18648: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:18650: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17849: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18653: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_header_stdc=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi fi -echo "$as_me:17862: result: $ac_cv_header_stdc" >&5 +echo "$as_me:18666: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -17872,13 +18676,13 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:17875: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:18679: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 17881 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18685 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -17892,29 +18696,29 @@ return 0; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:17896: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:18700: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17899: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17902: \"$ac_try\"") >&5 + echo "$as_me:18703: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:18706: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17905: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18709: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17915: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then +echo "$as_me:18719: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 + echo "$as_me:18732: checking for opendir in -ldir" >&5 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 if test "${ac_cv_lib_dir_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 17936 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 18740 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17951,43 +18755,43 @@ opendir (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17955: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18759: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17958: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17961: \"$ac_try\"") >&5 + echo "$as_me:18762: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18765: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17964: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18768: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_dir_opendir=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_dir_opendir=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17975: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:18779: result: $ac_cv_lib_dir_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 -if test $ac_cv_lib_dir_opendir = yes; then +if test "$ac_cv_lib_dir_opendir" = yes; then LIBS="$LIBS -ldir" fi else - echo "$as_me:17982: checking for opendir in -lx" >&5 + echo "$as_me:18786: checking for opendir in -lx" >&5 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 if test "${ac_cv_lib_x_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 17990 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 18794 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18005,42 +18809,42 @@ opendir (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18009: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18813: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18012: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18015: \"$ac_try\"") >&5 + echo "$as_me:18816: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18819: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18018: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18822: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_x_opendir=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_x_opendir=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18029: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:18833: result: $ac_cv_lib_x_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 -if test $ac_cv_lib_x_opendir = yes; then +if test "$ac_cv_lib_x_opendir" = yes; then LIBS="$LIBS -lx" fi fi -echo "$as_me:18037: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:18841: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 18043 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18847 "configure" #include "confdefs.h" #include #include @@ -18055,27 +18859,27 @@ return 0; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18059: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:18863: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18062: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18065: \"$ac_try\"") >&5 + echo "$as_me:18866: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:18869: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18068: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18872: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_header_time=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_header_time=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:18078: result: $ac_cv_header_time" >&5 +echo "$as_me:18882: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -18086,88 +18890,70 @@ EOF fi cf_regex_func=no - -cf_regex_libs="regex re" -case $host_os in +cf_regex_libs= +case "$host_os" in (mingw*) - cf_regex_libs="gnurx $cf_regex_libs" - ;; -esac - -echo "$as_me:18097: checking for regcomp" >&5 -echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 -if test "${ac_cv_func_regcomp+set}" = set; then + # -lsystre -ltre -lintl -liconv + echo "$as_me:18897: checking for regcomp in -lsystre" >&5 +echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6 +if test "${ac_cv_lib_systre_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 18103 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsystre $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 18905 "configure" #include "confdefs.h" -#define regcomp autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef regcomp +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif - /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char regcomp (void); - +char regcomp (); int main (void) { - -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_regcomp) || defined (__stub___regcomp) -#error found stub for regcomp -#endif - - return regcomp (); +regcomp (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18134: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18924: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18137: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18140: \"$ac_try\"") >&5 + echo "$as_me:18927: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18930: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18143: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_regcomp=yes + echo "$as_me:18933: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_systre_regcomp=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_regcomp=no +cat "conftest.$ac_ext" >&5 +ac_cv_lib_systre_regcomp=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18153: result: $ac_cv_func_regcomp" >&5 -echo "${ECHO_T}$ac_cv_func_regcomp" >&6 -if test $ac_cv_func_regcomp = yes; then - cf_regex_func=regcomp -else +echo "$as_me:18944: result: $ac_cv_lib_systre_regcomp" >&5 +echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6 +if test "$ac_cv_lib_systre_regcomp" = yes; then - for cf_regex_lib in $cf_regex_libs - do - as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh` -echo "$as_me:18162: checking for regcomp in -l$cf_regex_lib" >&5 -echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo "$as_me:18948: checking for libiconv_open in -liconv" >&5 +echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6 +if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-l$cf_regex_lib $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 18170 "configure" +LIBS="-liconv $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 18956 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18176,44 +18962,44 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char regcomp (); +char libiconv_open (); int main (void) { -regcomp (); +libiconv_open (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18189: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18975: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18192: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18195: \"$ac_try\"") >&5 + echo "$as_me:18978: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18981: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18198: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Lib=yes" + echo "$as_me:18984: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_iconv_libiconv_open=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_Lib=no" +cat "conftest.$ac_ext" >&5 +ac_cv_lib_iconv_libiconv_open=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18209: result: `eval echo '${'$as_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +echo "$as_me:18995: result: $ac_cv_lib_iconv_libiconv_open" >&5 +echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6 +if test "$ac_cv_lib_iconv_libiconv_open" = yes; then cf_add_libs="$LIBS" # reverse order cf_add_0lib= -for cf_add_1lib in -l$cf_regex_lib; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +for cf_add_1lib in -liconv; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done # filter duplicates for cf_add_1lib in $cf_add_0lib; do for cf_add_2lib in $cf_add_libs; do @@ -18226,86 +19012,86 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - cf_regex_func=regcomp - break -fi - - done - fi -if test "$cf_regex_func" = no ; then - echo "$as_me:18238: checking for compile" >&5 -echo $ECHO_N "checking for compile... $ECHO_C" >&6 -if test "${ac_cv_func_compile+set}" = set; then + echo "$as_me:19017: checking for libintl_gettext in -lintl" >&5 +echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6 +if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 18244 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 19025 "configure" #include "confdefs.h" -#define compile autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef compile +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif - /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char compile (void); - +char libintl_gettext (); int main (void) { - -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_compile) || defined (__stub___compile) -#error found stub for compile -#endif - - return compile (); +libintl_gettext (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18275: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19044: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18278: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18281: \"$ac_try\"") >&5 + echo "$as_me:19047: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19050: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18284: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_compile=yes + echo "$as_me:19053: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_intl_libintl_gettext=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_compile=no +cat "conftest.$ac_ext" >&5 +ac_cv_lib_intl_libintl_gettext=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18294: result: $ac_cv_func_compile" >&5 -echo "${ECHO_T}$ac_cv_func_compile" >&6 -if test $ac_cv_func_compile = yes; then - cf_regex_func=compile -else +echo "$as_me:19064: result: $ac_cv_lib_intl_libintl_gettext" >&5 +echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6 +if test "$ac_cv_lib_intl_libintl_gettext" = yes; then - echo "$as_me:18300: checking for compile in -lgen" >&5 -echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6 -if test "${ac_cv_lib_gen_compile+set}" = set; then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lintl; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + +fi + + echo "$as_me:19086: checking for tre_regcomp in -ltre" >&5 +echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6 +if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lgen $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 18308 "configure" +LIBS="-ltre $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 19094 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18314,44 +19100,44 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char compile (); +char tre_regcomp (); int main (void) { -compile (); +tre_regcomp (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18327: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19113: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18330: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18333: \"$ac_try\"") >&5 + echo "$as_me:19116: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19119: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18336: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gen_compile=yes + echo "$as_me:19122: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_tre_tre_regcomp=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_gen_compile=no +cat "conftest.$ac_ext" >&5 +ac_cv_lib_tre_tre_regcomp=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18347: result: $ac_cv_lib_gen_compile" >&5 -echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 -if test $ac_cv_lib_gen_compile = yes; then +echo "$as_me:19133: result: $ac_cv_lib_tre_tre_regcomp" >&5 +echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6 +if test "$ac_cv_lib_tre_tre_regcomp" = yes; then cf_add_libs="$LIBS" # reverse order cf_add_0lib= -for cf_add_1lib in -lgen; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +for cf_add_1lib in -ltre; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done # filter duplicates for cf_add_1lib in $cf_add_0lib; do for cf_add_2lib in $cf_add_libs; do @@ -18364,416 +19150,785 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - cf_regex_func=compile fi -fi +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lsystre; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" -fi + cf_regex_func=regcomp -if test "$cf_regex_func" = no ; then - { echo "$as_me:18375: WARNING: cannot find regular expression library" >&5 -echo "$as_me: WARNING: cannot find regular expression library" >&2;} -fi +else -echo "$as_me:18379: checking for regular-expression headers" >&5 -echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 -if test "${cf_cv_regex_hdrs+set}" = set; then + echo "$as_me:19175: checking for regcomp in -lgnurx" >&5 +echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6 +if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cf_cv_regex_hdrs=no -case $cf_regex_func in -(compile) - for cf_regex_hdr in regexp.h regexpr.h - do - cat >conftest.$ac_ext <<_ACEOF -#line 18391 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgnurx $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 19183 "configure" #include "confdefs.h" -#include <$cf_regex_hdr> + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char regcomp (); int main (void) { - - char *p = compile("", "", "", 0); - int x = step("", ""); - (void)p; - (void)x; - +regcomp (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18408: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19202: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18411: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18414: \"$ac_try\"") >&5 + echo "$as_me:19205: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19208: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18417: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_regex_hdrs=$cf_regex_hdr - break - + echo "$as_me:19211: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gnurx_regcomp=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_gnurx_regcomp=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +echo "$as_me:19222: result: $ac_cv_lib_gnurx_regcomp" >&5 +echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6 +if test "$ac_cv_lib_gnurx_regcomp" = yes; then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lgnurx; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + + cf_regex_func=regcomp +fi + +fi + ;; (*) - for cf_regex_hdr in regex.h - do - cat >conftest.$ac_ext <<_ACEOF -#line 18434 "configure" + cf_regex_libs="regex re" + echo "$as_me:19250: checking for regcomp" >&5 +echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 +if test "${ac_cv_func_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 19256 "configure" #include "confdefs.h" -#include -#include <$cf_regex_hdr> +#define regcomp autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef regcomp + +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char regcomp (void); + int main (void) { - regex_t *p = 0; - int x = regcomp(p, "", 0); - int y = regexec(p, "", 0, 0, 0); - (void)x; - (void)y; - regfree(p); +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_regcomp) || defined (__stub___regcomp) +#error found stub for regcomp +#endif + return regcomp (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18454: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19287: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18457: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18460: \"$ac_try\"") >&5 + echo "$as_me:19290: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19293: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18463: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_regex_hdrs=$cf_regex_hdr - break - + echo "$as_me:19296: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_regcomp=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_func_regcomp=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - done - ;; -esac - +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18479: result: $cf_cv_regex_hdrs" >&5 -echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 +echo "$as_me:19306: result: $ac_cv_func_regcomp" >&5 +echo "${ECHO_T}$ac_cv_func_regcomp" >&6 +if test "$ac_cv_func_regcomp" = yes; then + cf_regex_func=regcomp +else -case $cf_cv_regex_hdrs in - (no) { echo "$as_me:18483: WARNING: no regular expression header found" >&5 -echo "$as_me: WARNING: no regular expression header found" >&2;} ;; - (regex.h) -cat >>confdefs.h <<\EOF -#define HAVE_REGEX_H_FUNCS 1 -EOF - ;; - (regexp.h) -cat >>confdefs.h <<\EOF -#define HAVE_REGEXP_H_FUNCS 1 -EOF - ;; - (regexpr.h) -cat >>confdefs.h <<\EOF -#define HAVE_REGEXPR_H_FUNCS 1 -EOF - ;; -esac + for cf_regex_lib in $cf_regex_libs + do + as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh` +echo "$as_me:19315: checking for regcomp in -l$cf_regex_lib" >&5 +echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$cf_regex_lib $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 19323 "configure" +#include "confdefs.h" -for ac_header in \ -fcntl.h \ -getopt.h \ -limits.h \ -locale.h \ -math.h \ -poll.h \ -sys/bsdtypes.h \ -sys/ioctl.h \ -sys/param.h \ -sys/poll.h \ -sys/select.h \ -sys/time.h \ -sys/times.h \ -ttyent.h \ -unistd.h \ -wctype.h \ - -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18522: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 18528 "configure" -#include "confdefs.h" -#include <$ac_header> +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char regcomp (); +int +main (void) +{ +regcomp (); + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:18532: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19342: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:18538: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + echo "$as_me:19345: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19348: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19351: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +cat "conftest.$ac_ext" >&5 +eval "$as_ac_Lib=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18557: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then -fi +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -l$cf_regex_lib; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done +LIBS="$cf_add_libs" -for ac_header in unistd.h getopt.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18570: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 18576 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:18580: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:18586: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_ext + cf_regex_func=regcomp + break fi -echo "$as_me:18605: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 -if test "${cf_cv_getopt_header+set}" = set; then + ;; +esac + +if test "$cf_regex_func" = no ; then + echo "$as_me:19394: checking for compile" >&5 +echo $ECHO_N "checking for compile... $ECHO_C" >&6 +if test "${ac_cv_func_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cf_cv_getopt_header=none -for cf_header in stdio.h stdlib.h unistd.h getopt.h -do -cat >conftest.$ac_ext <<_ACEOF -#line 18625 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 19400 "configure" #include "confdefs.h" +#define compile autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef compile + +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char compile (void); -#include <$cf_header> int main (void) { -int x = optind; char *y = optarg + +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_compile) || defined (__stub___compile) +#error found stub for compile +#endif + + return compile (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18638: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19431: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18641: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18644: \"$ac_try\"") >&5 + echo "$as_me:19434: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19437: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18647: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_getopt_header=$cf_header - break + echo "$as_me:19440: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_compile=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done - -fi -echo "$as_me:18659: result: $cf_cv_getopt_header" >&5 -echo "${ECHO_T}$cf_cv_getopt_header" >&6 -if test $cf_cv_getopt_header != none ; then - -cat >>confdefs.h <<\EOF -#define HAVE_GETOPT_HEADER 1 -EOF - +cat "conftest.$ac_ext" >&5 +ac_cv_func_compile=no fi -if test $cf_cv_getopt_header = getopt.h ; then - -cat >>confdefs.h <<\EOF -#define NEED_GETOPT_H 1 -EOF - +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi +echo "$as_me:19450: result: $ac_cv_func_compile" >&5 +echo "${ECHO_T}$ac_cv_func_compile" >&6 +if test "$ac_cv_func_compile" = yes; then + cf_regex_func=compile +else -echo "$as_me:18676: checking if external environ is declared" >&5 -echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6 -if test "${cf_cv_dcl_environ+set}" = set; then + echo "$as_me:19456: checking for compile in -lgen" >&5 +echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6 +if test "${ac_cv_lib_gen_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF -#line 18683 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgen $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 19464 "configure" #include "confdefs.h" -#ifdef HAVE_STDLIB_H -#include +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" #endif -#include +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char compile (); int main (void) { -int x = (int) environ +compile (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18699: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19483: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18702: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18705: \"$ac_try\"") >&5 + echo "$as_me:19486: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19489: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18708: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_dcl_environ=yes + echo "$as_me:19492: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gen_compile=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_dcl_environ=no +cat "conftest.$ac_ext" >&5 +ac_cv_lib_gen_compile=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18719: result: $cf_cv_dcl_environ" >&5 -echo "${ECHO_T}$cf_cv_dcl_environ" >&6 +echo "$as_me:19503: result: $ac_cv_lib_gen_compile" >&5 +echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 +if test "$ac_cv_lib_gen_compile" = yes; then -if test "$cf_cv_dcl_environ" = no ; then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lgen; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" -cf_result=`echo "decl_environ" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + cf_regex_func=compile +fi - cat >>confdefs.h <&5 +echo "$as_me: WARNING: cannot find regular expression library" >&2;} +fi -echo "$as_me:18734: checking if external environ exists" >&5 -echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6 -if test "${cf_cv_have_environ+set}" = set; then +echo "$as_me:19535: checking for regular-expression headers" >&5 +echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 +if test "${cf_cv_regex_hdrs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 18741 "configure" +cf_cv_regex_hdrs=no +case "$cf_regex_func" in +(compile) + for cf_regex_hdr in regexp.h regexpr.h + do + cat >"conftest.$ac_ext" <<_ACEOF +#line 19547 "configure" #include "confdefs.h" - -#undef environ -extern int environ; - +#include <$cf_regex_hdr> int main (void) { -environ = 2 + + char *p = compile("", "", "", 0); + int x = step("", ""); + (void)p; + (void)x; + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18756: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19564: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18759: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18762: \"$ac_try\"") >&5 + echo "$as_me:19567: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19570: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18765: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_have_environ=yes + echo "$as_me:19573: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_regex_hdrs=$cf_regex_hdr + break + else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_have_environ=no +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + done + ;; +(*) + for cf_regex_hdr in regex.h + do + cat >"conftest.$ac_ext" <<_ACEOF +#line 19590 "configure" +#include "confdefs.h" +#include +#include <$cf_regex_hdr> +int +main (void) +{ -fi -echo "$as_me:18776: result: $cf_cv_have_environ" >&5 + regex_t *p = 0; + int x = regcomp(p, "", 0); + int y = regexec(p, "", 0, 0, 0); + (void)x; + (void)y; + regfree(p); + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19610: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:19613: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19616: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19619: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_regex_hdrs=$cf_regex_hdr + break + +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + done + ;; +esac + +fi +echo "$as_me:19635: result: $cf_cv_regex_hdrs" >&5 +echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 + +case "$cf_cv_regex_hdrs" in + (no) { echo "$as_me:19639: WARNING: no regular expression header found" >&5 +echo "$as_me: WARNING: no regular expression header found" >&2;} ;; + (regex.h) +cat >>confdefs.h <<\EOF +#define HAVE_REGEX_H_FUNCS 1 +EOF + ;; + (regexp.h) +cat >>confdefs.h <<\EOF +#define HAVE_REGEXP_H_FUNCS 1 +EOF + ;; + (regexpr.h) +cat >>confdefs.h <<\EOF +#define HAVE_REGEXPR_H_FUNCS 1 +EOF + ;; +esac + +for ac_header in \ +fcntl.h \ +getopt.h \ +limits.h \ +locale.h \ +math.h \ +poll.h \ +sys/ioctl.h \ +sys/param.h \ +sys/poll.h \ +sys/select.h \ +sys/time.h \ +sys/times.h \ +ttyent.h \ +unistd.h \ +wctype.h \ + +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:19677: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 19683 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:19687: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:19693: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err "conftest.$ac_ext" +fi +echo "$as_me:19712: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 19731 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:19735: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:19741: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err "conftest.$ac_ext" +fi +echo "$as_me:19760: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 +if test "${cf_cv_getopt_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cf_cv_getopt_header=none +for cf_header in stdio.h stdlib.h unistd.h getopt.h +do +cat >"conftest.$ac_ext" <<_ACEOF +#line 19780 "configure" +#include "confdefs.h" + +#include <$cf_header> +int +main (void) +{ +int x = optind; char *y = optarg; (void)x; (void)y + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:19793: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:19796: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:19799: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19802: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_getopt_header=$cf_header + break +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +done + +fi +echo "$as_me:19814: result: $cf_cv_getopt_header" >&5 +echo "${ECHO_T}$cf_cv_getopt_header" >&6 +if test "$cf_cv_getopt_header" != none ; then + +cat >>confdefs.h <<\EOF +#define HAVE_GETOPT_HEADER 1 +EOF + +fi +if test "$cf_cv_getopt_header" = getopt.h ; then + +cat >>confdefs.h <<\EOF +#define NEED_GETOPT_H 1 +EOF + +fi + +echo "$as_me:19831: checking if external environ is declared" >&5 +echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6 +if test "${cf_cv_dcl_environ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >"conftest.$ac_ext" <<_ACEOF +#line 19838 "configure" +#include "confdefs.h" + +#ifdef HAVE_STDLIB_H +#include +#endif +#include +int +main (void) +{ +int x = (int) environ + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:19854: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:19857: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:19860: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19863: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_dcl_environ=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_dcl_environ=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + +fi +echo "$as_me:19874: result: $cf_cv_dcl_environ" >&5 +echo "${ECHO_T}$cf_cv_dcl_environ" >&6 + +if test "$cf_cv_dcl_environ" = no ; then + +cf_result=`echo "decl_environ" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 +echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6 +if test "${cf_cv_have_environ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >"conftest.$ac_ext" <<_ACEOF +#line 19896 "configure" +#include "confdefs.h" + +#undef environ +extern int environ; + +int +main (void) +{ +environ = 2 + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19911: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:19914: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19917: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19920: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_environ=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_have_environ=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + +fi +echo "$as_me:19931: result: $cf_cv_have_environ" >&5 echo "${ECHO_T}$cf_cv_have_environ" >&6 if test "$cf_cv_have_environ" = yes ; then @@ -18786,13 +19941,13 @@ EOF fi -echo "$as_me:18789: checking for getenv" >&5 +echo "$as_me:19944: checking for getenv" >&5 echo $ECHO_N "checking for getenv... $ECHO_C" >&6 if test "${ac_cv_func_getenv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 18795 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 19950 "configure" #include "confdefs.h" #define getenv autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18822,39 +19977,39 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18826: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19981: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18829: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18832: \"$ac_try\"") >&5 + echo "$as_me:19984: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19987: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18835: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19990: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_getenv=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_getenv=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18845: result: $ac_cv_func_getenv" >&5 +echo "$as_me:20000: result: $ac_cv_func_getenv" >&5 echo "${ECHO_T}$ac_cv_func_getenv" >&6 for ac_func in putenv setenv strdup do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:18851: checking for $ac_func" >&5 +echo "$as_me:20006: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 18857 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 20012 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18884,29 +20039,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18888: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:20043: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18891: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18894: \"$ac_try\"") >&5 + echo "$as_me:20046: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:20049: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18897: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20052: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18907: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then +echo "$as_me:20062: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 +if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:20072: checking if getenv returns consistent values" >&5 echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6 if test "${cf_cv_consistent_getenv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18923,8 +20078,8 @@ else if test "$cross_compiling" = yes; then cf_cv_consistent_getenv=unknown else - cat >conftest.$ac_ext <<_ACEOF -#line 18927 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 20082 "configure" #include "confdefs.h" #include @@ -18973,7 +20128,7 @@ int main(void) mynames[j] = str_alloc(environ[j]); equals = strchr(mynames[j], '='); if (equals != 0) { - *equals++ = '\0'; + *equals++ = '\\0'; myvalues[j] = str_alloc(equals); } else { myvalues[j] = str_alloc(""); @@ -19007,13 +20162,13 @@ int main(void) char *value = getenv(mynames[j]); if (pass) { if (value == 0) { - fprintf(stderr, "getenv returned null for %s\n", mynames[j]); + fprintf(stderr, "getenv returned null for %s\\n", mynames[j]); ${cf_cv_main_return:-return}(1); } else if (value != mypointer[j]) { - fprintf(stderr, "getenv returned different pointer for %s\n", mynames[j]); + fprintf(stderr, "getenv returned different pointer for %s\\n", mynames[j]); ${cf_cv_main_return:-return}(1); } else if (strcmp(value, myvalues[j])) { - fprintf(stderr, "getenv returned different value for %s\n", mynames[j]); + fprintf(stderr, "getenv returned different value for %s\\n", mynames[j]); ${cf_cv_main_return:-return}(1); } } else { @@ -19021,7 +20176,7 @@ int main(void) mypointer[j] = value; for (k = 0; k < j; ++k) { if (mypointer[j] == mypointer[k]) { - fprintf(stderr, "getenv returned same pointer for %s and %s\n", mynames[j], mynames[k]); + fprintf(stderr, "getenv returned same pointer for %s and %s\\n", mynames[j], mynames[k]); ${cf_cv_main_return:-return}(1); } } @@ -19032,29 +20187,29 @@ int main(void) } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:19036: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:20191: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19039: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19041: \"$ac_try\"") >&5 + echo "$as_me:20194: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:20196: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19044: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20199: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_consistent_getenv=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_consistent_getenv=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:19057: result: $cf_cv_consistent_getenv" >&5 +echo "$as_me:20212: result: $cf_cv_consistent_getenv" >&5 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6 if test "x$cf_cv_consistent_getenv" = xno @@ -19069,143 +20224,18 @@ fi if test "x$cf_cv_consistent_getenv" = xno && \ test "x$cf_with_trace" = xyes then - { echo "$as_me:19072: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 + { echo "$as_me:20227: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;} fi -# check for ISC (this may also define _POSIX_SOURCE) -# Note: even non-Posix ISC needs to declare fd_set -if test "x$ISC" = xyes ; then - -echo "$as_me:19080: checking for main in -lcposix" >&5 -echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6 -if test "${ac_cv_lib_cposix_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 19088 "configure" -#include "confdefs.h" - -int -main (void) -{ -main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19100: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:19103: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19106: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:19109: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_cposix_main=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_cposix_main=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:19120: result: $ac_cv_lib_cposix_main" >&5 -echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6 -if test $ac_cv_lib_cposix_main = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6 -if test "${ac_cv_lib_inet_bzero+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-linet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 19139 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char bzero (); -int -main (void) -{ -bzero (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19158: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:19161: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19164: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:19167: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_inet_bzero=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_inet_bzero=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:19178: result: $ac_cv_lib_inet_bzero" >&5 -echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 -if test $ac_cv_lib_inet_bzero = yes; then - -cf_add_libs="$LIBS" -# reverse order -cf_add_0lib= -for cf_add_1lib in -linet; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done -# filter duplicates -for cf_add_1lib in $cf_add_0lib; do - for cf_add_2lib in $cf_add_libs; do - if test "x$cf_add_1lib" = "x$cf_add_2lib"; then - cf_add_1lib= - break - fi - done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" -done -LIBS="$cf_add_libs" - -fi -fi - -echo "$as_me:19201: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:20231: checking if sys/time.h works with sys/select.h" >&5 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 if test "${cf_cv_sys_time_select+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 19208 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 20238 "configure" #include "confdefs.h" #include @@ -19224,29 +20254,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19228: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20258: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19231: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19234: \"$ac_try\"") >&5 + echo "$as_me:20261: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20264: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19237: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20267: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_sys_time_select=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_sys_time_select=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19249: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:20279: result: $cf_cv_sys_time_select" >&5 echo "${ECHO_T}$cf_cv_sys_time_select" >&6 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF @@ -19256,18 +20286,18 @@ EOF ### checks for compiler characteristics ac_ext=c ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_main_return=return +ac_main_return="return" -echo "$as_me:19264: checking for an ANSI C-conforming const" >&5 +echo "$as_me:20294: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 19270 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 20300 "configure" #include "confdefs.h" int @@ -19324,27 +20354,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19328: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20358: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19331: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19334: \"$ac_try\"") >&5 + echo "$as_me:20361: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20364: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19337: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20367: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_c_const=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19347: result: $ac_cv_c_const" >&5 +echo "$as_me:20377: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -19354,15 +20384,15 @@ EOF fi -echo "$as_me:19357: checking for inline" >&5 +echo "$as_me:20387: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF -#line 19365 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 20395 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -19370,28 +20400,28 @@ $ac_kw int foo () {return 0; } #endif _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19374: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20404: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19377: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19380: \"$ac_try\"") >&5 + echo "$as_me:20407: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20410: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19383: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20413: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_c_inline=$ac_kw; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:19394: result: $ac_cv_c_inline" >&5 +echo "$as_me:20424: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -19417,7 +20447,7 @@ if test "$ac_cv_c_inline" != no ; then : elif test "$GCC" = yes then - echo "$as_me:19420: checking if $CC supports options to tune inlining" >&5 + echo "$as_me:20450: checking if $CC supports options to tune inlining" >&5 echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6 if test "${cf_cv_gcc_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19425,8 +20455,8 @@ else cf_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS --param max-inline-insns-single=1200" - cat >conftest.$ac_ext <<_ACEOF -#line 19429 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 20459 "configure" #include "confdefs.h" inline int foo(void) { return 1; } int @@ -19437,29 +20467,29 @@ ${cf_cv_main_return:-return} foo() return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19441: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20471: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19444: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19447: \"$ac_try\"") >&5 + echo "$as_me:20474: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20477: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19450: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20480: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_gcc_inline=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_gcc_inline=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS=$cf_save_CFLAGS fi -echo "$as_me:19462: result: $cf_cv_gcc_inline" >&5 +echo "$as_me:20492: result: $cf_cv_gcc_inline" >&5 echo "${ECHO_T}$cf_cv_gcc_inline" >&6 if test "$cf_cv_gcc_inline" = yes ; then @@ -19470,19 +20500,19 @@ cf_new_extra_cppflags= for cf_add_cflags in --param max-inline-insns-single=1200 do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -19501,7 +20531,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -19531,7 +20561,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -19565,7 +20595,7 @@ fi fi fi -echo "$as_me:19568: checking for signal global datatype" >&5 +echo "$as_me:20598: checking for signal global datatype" >&5 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 if test "${cf_cv_sig_atomic_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19576,8 +20606,8 @@ else "sig_atomic_t" \ "int" do - cat >conftest.$ac_ext <<_ACEOF -#line 19580 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 20610 "configure" #include "confdefs.h" #include @@ -19600,40 +20630,40 @@ signal(SIGINT, handler); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19604: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20634: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19607: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19610: \"$ac_try\"") >&5 + echo "$as_me:20637: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20640: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19613: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20643: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_sig_atomic_t=$cf_type else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_sig_atomic_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" test "$cf_cv_sig_atomic_t" != no && break done fi -echo "$as_me:19627: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:20657: result: $cf_cv_sig_atomic_t" >&5 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <&5 +echo "$as_me:20666: checking for type of chtype" >&5 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 if test "${cf_cv_typeof_chtype+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19642,8 +20672,8 @@ else if test "$cross_compiling" = yes; then cf_cv_typeof_chtype=long else - cat >conftest.$ac_ext <<_ACEOF -#line 19646 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 20676 "configure" #include "confdefs.h" #define WANT_BITS 31 @@ -19677,31 +20707,31 @@ int main(void) } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:19681: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:20711: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19684: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19686: \"$ac_try\"") >&5 + echo "$as_me:20714: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:20716: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19689: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20719: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_typeof_chtype=`cat cf_test.out` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_typeof_chtype=long fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f cf_test.out fi -echo "$as_me:19704: result: $cf_cv_typeof_chtype" >&5 +echo "$as_me:20734: result: $cf_cv_typeof_chtype" >&5 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 cat >>confdefs.h <&5 +echo "$as_me:20746: checking if unsigned literals are legal" >&5 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 if test "${cf_cv_unsigned_literals+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 19723 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 20753 "configure" #include "confdefs.h" int @@ -19731,36 +20761,36 @@ long x = 1L + 1UL + 1U + 1 return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19735: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20765: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19738: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19741: \"$ac_try\"") >&5 + echo "$as_me:20768: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20771: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19744: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20774: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_unsigned_literals=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_unsigned_literals=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19756: result: $cf_cv_unsigned_literals" >&5 +echo "$as_me:20786: result: $cf_cv_unsigned_literals" >&5 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 cf_cv_1UL="1" test ".$cf_cv_unsigned_literals" = .yes && cf_cv_1UL="${cf_cv_1UL}U" test ".$cf_cv_typeof_chtype" = .long && cf_cv_1UL="${cf_cv_1UL}L" -if test $NCURSES_MMASK_T = auto ; then +if test "$NCURSES_MMASK_T" = auto ; then cf_cv_typeof_mmask_t=long else cf_cv_typeof_mmask_t=$NCURSES_MMASK_T @@ -19769,14 +20799,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t="" ### Checks for external-data -echo "$as_me:19772: checking if external errno is declared" >&5 +echo "$as_me:20802: checking if external errno is declared" >&5 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 19779 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 20809 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -19793,28 +20823,28 @@ int x = (int) errno; (void)x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19797: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20827: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19800: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19803: \"$ac_try\"") >&5 + echo "$as_me:20830: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20833: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19806: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20836: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_dcl_errno=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_dcl_errno=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19817: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:20847: result: $cf_cv_dcl_errno" >&5 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then @@ -19829,14 +20859,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:19832: checking if external errno exists" >&5 +echo "$as_me:20862: checking if external errno exists" >&5 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 if test "${cf_cv_have_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 19839 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 20869 "configure" #include "confdefs.h" #undef errno @@ -19850,28 +20880,28 @@ errno = 2 return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19854: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:20884: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19857: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19860: \"$ac_try\"") >&5 + echo "$as_me:20887: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:20890: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19863: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20893: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_have_errno=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_have_errno=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19874: result: $cf_cv_have_errno" >&5 +echo "$as_me:20904: result: $cf_cv_have_errno" >&5 echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then @@ -19884,7 +20914,7 @@ EOF fi -echo "$as_me:19887: checking if data-only library module links" >&5 +echo "$as_me:20917: checking if data-only library module links" >&5 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 if test "${cf_cv_link_dataonly+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19892,20 +20922,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:20928: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19901: \$? = $ac_status" >&5 - (exit $ac_status); } ; then + echo "$as_me:20931: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then mv conftest.o data.o && \ ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null fi rm -f conftest.$ac_ext data.o cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:20951: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19924: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:20954: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null fi @@ -19933,8 +20963,8 @@ EOF if test "$cross_compiling" = yes; then cf_cv_link_dataonly=unknown else - cat >conftest.$ac_ext <<_ACEOF -#line 19937 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 20967 "configure" #include "confdefs.h" int main(void) @@ -19944,31 +20974,31 @@ else } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:19948: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:20978: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19951: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19953: \"$ac_try\"") >&5 + echo "$as_me:20981: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:20983: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19956: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20986: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_link_dataonly=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_link_dataonly=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi LIBS="$cf_saveLIBS" fi -echo "$as_me:19971: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:21001: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -19997,9 +21027,11 @@ select \ setbuf \ setbuffer \ setenv \ +setfsuid \ setvbuf \ sigaction \ sigvec \ +snprintf \ strdup \ strstr \ sysconf \ @@ -20010,13 +21042,13 @@ vsnprintf \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:20013: checking for $ac_func" >&5 +echo "$as_me:21045: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 20019 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21051 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -20046,29 +21078,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20050: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21082: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20053: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20056: \"$ac_try\"") >&5 + echo "$as_me:21085: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21088: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20059: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21091: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20069: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then +echo "$as_me:21101: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 +if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 + { { echo "$as_me:21113: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi @@ -20087,7 +21119,7 @@ if test "x$with_safe_sprintf" = xyes then if test "x$ac_cv_func_vsnprintf" = xyes then - { echo "$as_me:20090: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 + { echo "$as_me:21122: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;} else @@ -20100,14 +21132,14 @@ fi if test "x$with_getcap" = "xyes" ; then -echo "$as_me:20103: checking for terminal-capability database functions" >&5 +echo "$as_me:21135: checking for terminal-capability database functions" >&5 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 if test "${cf_cv_cgetent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 20110 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21142 "configure" #include "confdefs.h" #include @@ -20126,28 +21158,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20130: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21162: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20133: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20136: \"$ac_try\"") >&5 + echo "$as_me:21165: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21168: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20139: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21171: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_cgetent=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_cgetent=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20150: result: $cf_cv_cgetent" >&5 +echo "$as_me:21182: result: $cf_cv_cgetent" >&5 echo "${ECHO_T}$cf_cv_cgetent" >&6 if test "$cf_cv_cgetent" = yes @@ -20157,14 +21189,14 @@ cat >>confdefs.h <<\EOF #define HAVE_BSD_CGETENT 1 EOF -echo "$as_me:20160: checking if cgetent uses const parameter" >&5 +echo "$as_me:21192: checking if cgetent uses const parameter" >&5 echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6 if test "${cf_cv_cgetent_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 20167 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21199 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" @@ -20186,28 +21218,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20190: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21222: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20193: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20196: \"$ac_try\"") >&5 + echo "$as_me:21225: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21228: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20199: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21231: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_cgetent_const=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_cgetent_const=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20210: result: $cf_cv_cgetent_const" >&5 +echo "$as_me:21242: result: $cf_cv_cgetent_const" >&5 echo "${ECHO_T}$cf_cv_cgetent_const" >&6 if test "$cf_cv_cgetent_const" = yes then @@ -20221,14 +21253,14 @@ fi fi -echo "$as_me:20224: checking for isascii" >&5 +echo "$as_me:21256: checking for isascii" >&5 echo $ECHO_N "checking for isascii... $ECHO_C" >&6 if test "${cf_cv_have_isascii+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 20231 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21263 "configure" #include "confdefs.h" #include int @@ -20239,28 +21271,28 @@ int x = isascii(' ') return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20243: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21275: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20246: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20249: \"$ac_try\"") >&5 + echo "$as_me:21278: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21281: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20252: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21284: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_have_isascii=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_have_isascii=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20263: result: $cf_cv_have_isascii" >&5 +echo "$as_me:21295: result: $cf_cv_have_isascii" >&5 echo "${ECHO_T}$cf_cv_have_isascii" >&6 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF @@ -20268,10 +21300,10 @@ cat >>confdefs.h <<\EOF EOF if test "$ac_cv_func_sigaction" = yes; then -echo "$as_me:20271: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "$as_me:21303: checking whether sigaction needs _POSIX_SOURCE" >&5 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 20274 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21306 "configure" #include "confdefs.h" #include @@ -20284,25 +21316,25 @@ struct sigaction act return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:20288: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:21320: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20291: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20294: \"$ac_try\"") >&5 + echo "$as_me:21323: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:21326: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20297: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21329: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then sigact_bad=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 20305 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21337 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -20316,18 +21348,18 @@ struct sigaction act return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:20320: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:21352: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20323: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20326: \"$ac_try\"") >&5 + echo "$as_me:21355: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:21358: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20329: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21361: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then sigact_bad=yes cat >>confdefs.h <<\EOF @@ -20336,17 +21368,17 @@ EOF else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 sigact_bad=unknown fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:20345: result: $sigact_bad" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +echo "$as_me:21377: result: $sigact_bad" >&5 echo "${ECHO_T}$sigact_bad" >&6 fi -echo "$as_me:20349: checking if nanosleep really works" >&5 +echo "$as_me:21381: checking if nanosleep really works" >&5 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 if test "${cf_cv_func_nanosleep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20355,8 +21387,8 @@ else if test "$cross_compiling" = yes; then cf_cv_func_nanosleep=unknown else - cat >conftest.$ac_ext <<_ACEOF -#line 20359 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21391 "configure" #include "confdefs.h" #include @@ -20380,28 +21412,28 @@ int main(void) { } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:20384: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:21416: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20387: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:20389: \"$ac_try\"") >&5 + echo "$as_me:21419: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:21421: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20392: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21424: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_func_nanosleep=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_func_nanosleep=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:20404: result: $cf_cv_func_nanosleep" >&5 +echo "$as_me:21436: result: $cf_cv_func_nanosleep" >&5 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 test "$cf_cv_func_nanosleep" = "yes" && @@ -20418,24 +21450,24 @@ sys/termio.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:20421: checking for $ac_header" >&5 +echo "$as_me:21453: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 20427 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21459 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:20431: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:21463: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20437: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:21469: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -20448,14 +21480,14 @@ if test -z "$ac_cpp_err"; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:20456: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then +echo "$as_me:21488: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 + echo "$as_me:21505: checking whether termios.h needs _POSIX_SOURCE" >&5 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 20476 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21508 "configure" #include "confdefs.h" #include int @@ -20484,25 +21516,25 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:20488: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:21520: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20491: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20494: \"$ac_try\"") >&5 + echo "$as_me:21523: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:21526: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20497: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21529: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then termios_bad=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 - cat >conftest.$ac_ext <<_ACEOF -#line 20505 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21537 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -20515,45 +21547,45 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:20519: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:21551: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20522: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20525: \"$ac_try\"") >&5 + echo "$as_me:21554: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:21557: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20528: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21560: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then termios_bad=unknown else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 termios_bad=yes cat >>confdefs.h <<\EOF #define _POSIX_SOURCE 1 EOF fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:20544: result: $termios_bad" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + echo "$as_me:21576: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:20549: checking for tcgetattr" >&5 +echo "$as_me:21581: checking for tcgetattr" >&5 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 if test "${cf_cv_have_tcgetattr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 20556 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21588 "configure" #include "confdefs.h" #include @@ -20580,41 +21612,41 @@ tcgetattr(1, &foo); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20584: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21616: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20587: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20590: \"$ac_try\"") >&5 + echo "$as_me:21619: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21622: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20593: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21625: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_have_tcgetattr=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_have_tcgetattr=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20603: result: $cf_cv_have_tcgetattr" >&5 +echo "$as_me:21635: result: $cf_cv_have_tcgetattr" >&5 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF #define HAVE_TCGETATTR 1 EOF -echo "$as_me:20610: checking for vsscanf function or workaround" >&5 +echo "$as_me:21642: checking for vsscanf function or workaround" >&5 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 if test "${cf_cv_func_vsscanf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 20617 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21649 "configure" #include "confdefs.h" #include @@ -20629,25 +21661,25 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20633: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21665: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20636: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20639: \"$ac_try\"") >&5 + echo "$as_me:21668: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21671: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20642: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21674: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_func_vsscanf=vsscanf else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 20650 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21682 "configure" #include "confdefs.h" #include @@ -20668,25 +21700,25 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20672: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21704: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20675: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20678: \"$ac_try\"") >&5 + echo "$as_me:21707: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21710: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20681: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21713: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_func_vsscanf=vfscanf else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 20689 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21721 "configure" #include "confdefs.h" #include @@ -20707,35 +21739,35 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20711: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21743: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20714: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20717: \"$ac_try\"") >&5 + echo "$as_me:21746: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21749: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20720: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21752: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_func_vsscanf=_doscan else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_func_vsscanf=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20735: result: $cf_cv_func_vsscanf" >&5 +echo "$as_me:21767: result: $cf_cv_func_vsscanf" >&5 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 -case $cf_cv_func_vsscanf in +case "$cf_cv_func_vsscanf" in (vsscanf) cat >>confdefs.h <<\EOF #define HAVE_VSSCANF 1 @@ -20758,24 +21790,24 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:20761: checking for $ac_header" >&5 +echo "$as_me:21793: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 20767 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21799 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:20771: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:21803: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20777: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:21809: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -20788,14 +21820,14 @@ if test -z "$ac_cpp_err"; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:20796: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then +echo "$as_me:21828: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:21838: checking for working mkstemp" >&5 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 if test "${cf_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -rm -rf conftest* +rm -rf ./conftest* if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else - cat >conftest.$ac_ext <<_ACEOF -#line 20817 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21849 "configure" #include "confdefs.h" #include @@ -20854,40 +21886,40 @@ int main(void) } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:20858: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:21890: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20861: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:20863: \"$ac_try\"") >&5 + echo "$as_me:21893: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:21895: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20866: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21898: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_func_mkstemp=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_func_mkstemp=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:20881: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:21913: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "x$cf_cv_func_mkstemp" = xmaybe ; then - echo "$as_me:20884: checking for mkstemp" >&5 + echo "$as_me:21916: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 if test "${ac_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 20890 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21922 "configure" #include "confdefs.h" #define mkstemp autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -20917,27 +21949,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20921: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21953: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20924: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20927: \"$ac_try\"") >&5 + echo "$as_me:21956: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21959: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20930: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21962: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_mkstemp=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_mkstemp=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20940: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:21972: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -20958,21 +21990,21 @@ else fi if test "x$cross_compiling" = xyes ; then - { echo "$as_me:20961: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + { echo "$as_me:21993: WARNING: cross compiling: assume setvbuf params not reversed" >&5 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} else - echo "$as_me:20964: checking whether setvbuf arguments are reversed" >&5 + echo "$as_me:21996: checking whether setvbuf arguments are reversed" >&5 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { { echo "$as_me:20970: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:22002: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else - cat >conftest.$ac_ext <<_ACEOF -#line 20975 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 22007 "configure" #include "confdefs.h" #include /* If setvbuf has the reversed format, exit 0. */ @@ -20988,29 +22020,29 @@ main (void) $ac_main_return(0); /* Non-reversed systems segv here. */ } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:20992: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:22024: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20995: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:20997: \"$ac_try\"") >&5 + echo "$as_me:22027: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:22029: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21000: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22032: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_setvbuf_reversed=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_setvbuf_reversed=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi -rm -f core core.* *.core +rm -f core ./core.* ./*.core fi -echo "$as_me:21013: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "$as_me:22045: result: $ac_cv_func_setvbuf_reversed" >&5 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 if test $ac_cv_func_setvbuf_reversed = yes; then @@ -21021,13 +22053,13 @@ EOF fi fi -echo "$as_me:21024: checking for intptr_t" >&5 +echo "$as_me:22056: checking for intptr_t" >&5 echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6 if test "${ac_cv_type_intptr_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 21030 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 22062 "configure" #include "confdefs.h" $ac_includes_default int @@ -21041,29 +22073,29 @@ if (sizeof (intptr_t)) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:21045: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:22077: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21048: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21051: \"$ac_try\"") >&5 + echo "$as_me:22080: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:22083: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21054: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22086: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_type_intptr_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_type_intptr_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:21064: result: $ac_cv_type_intptr_t" >&5 +echo "$as_me:22096: result: $ac_cv_type_intptr_t" >&5 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6 -if test $ac_cv_type_intptr_t = yes; then +if test "$ac_cv_type_intptr_t" = yes; then : else @@ -21073,13 +22105,13 @@ EOF fi -echo "$as_me:21076: checking for ssize_t" >&5 +echo "$as_me:22108: checking for ssize_t" >&5 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 if test "${ac_cv_type_ssize_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 21082 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 22114 "configure" #include "confdefs.h" $ac_includes_default int @@ -21093,29 +22125,29 @@ if (sizeof (ssize_t)) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:21097: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:22129: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21100: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21103: \"$ac_try\"") >&5 + echo "$as_me:22132: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:22135: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21106: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22138: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_type_ssize_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_type_ssize_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:21116: result: $ac_cv_type_ssize_t" >&5 +echo "$as_me:22148: result: $ac_cv_type_ssize_t" >&5 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 -if test $ac_cv_type_ssize_t = yes; then +if test "$ac_cv_type_ssize_t" = yes; then : else @@ -21125,14 +22157,14 @@ EOF fi -echo "$as_me:21128: checking for type sigaction_t" >&5 +echo "$as_me:22160: checking for type sigaction_t" >&5 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 if test "${cf_cv_type_sigaction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 21135 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 22167 "configure" #include "confdefs.h" #include @@ -21144,35 +22176,35 @@ sigaction_t x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:21148: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:22180: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21151: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21154: \"$ac_try\"") >&5 + echo "$as_me:22183: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:22186: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21157: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22189: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_type_sigaction=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_type_sigaction=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:21168: result: $cf_cv_type_sigaction" >&5 +echo "$as_me:22200: result: $cf_cv_type_sigaction" >&5 echo "${ECHO_T}$cf_cv_type_sigaction" >&6 test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF #define HAVE_TYPE_SIGACTION 1 EOF -echo "$as_me:21175: checking declaration of size-change" >&5 +echo "$as_me:22207: checking declaration of size-change" >&5 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 if test "${cf_cv_sizechange+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21192,8 +22224,8 @@ do CPPFLAGS="${CPPFLAGS}-D$cf_opts" fi - cat >conftest.$ac_ext <<_ACEOF -#line 21196 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 22228 "configure" #include "confdefs.h" #include #ifdef HAVE_TERMIOS_H @@ -21242,25 +22274,25 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:21246: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:22278: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21249: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21252: \"$ac_try\"") >&5 + echo "$as_me:22281: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:22284: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21255: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22287: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_sizechange=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_sizechange=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save_CPPFLAGS" if test "$cf_cv_sizechange" = yes ; then @@ -21271,7 +22303,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:21274: result: $cf_cv_sizechange" >&5 +echo "$as_me:22306: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then @@ -21279,7 +22311,7 @@ cat >>confdefs.h <<\EOF #define HAVE_SIZECHANGE 1 EOF - case $cf_cv_sizechange in + case "$cf_cv_sizechange" in (NEED*) cat >>confdefs.h <&5 +echo "$as_me:22324: checking for memmove" >&5 echo $ECHO_N "checking for memmove... $ECHO_C" >&6 if test "${ac_cv_func_memmove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 21298 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 22330 "configure" #include "confdefs.h" #define memmove autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21325,39 +22357,39 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21329: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:22361: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21332: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21335: \"$ac_try\"") >&5 + echo "$as_me:22364: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:22367: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21338: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22370: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_memmove=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_memmove=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21348: result: $ac_cv_func_memmove" >&5 +echo "$as_me:22380: result: $ac_cv_func_memmove" >&5 echo "${ECHO_T}$ac_cv_func_memmove" >&6 -if test $ac_cv_func_memmove = yes; then +if test "$ac_cv_func_memmove" = yes; then : else -echo "$as_me:21354: checking for bcopy" >&5 +echo "$as_me:22386: checking for bcopy" >&5 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 if test "${ac_cv_func_bcopy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 21360 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 22392 "configure" #include "confdefs.h" #define bcopy autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21387,31 +22419,31 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21391: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:22423: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21394: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21397: \"$ac_try\"") >&5 + echo "$as_me:22426: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:22429: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21400: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22432: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_bcopy=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_bcopy=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21410: result: $ac_cv_func_bcopy" >&5 +echo "$as_me:22442: result: $ac_cv_func_bcopy" >&5 echo "${ECHO_T}$ac_cv_func_bcopy" >&6 -if test $ac_cv_func_bcopy = yes; then +if test "$ac_cv_func_bcopy" = yes; then - echo "$as_me:21414: checking if bcopy does overlapping moves" >&5 + echo "$as_me:22446: checking if bcopy does overlapping moves" >&5 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 if test "${cf_cv_good_bcopy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21420,8 +22452,8 @@ else if test "$cross_compiling" = yes; then cf_cv_good_bcopy=unknown else - cat >conftest.$ac_ext <<_ACEOF -#line 21424 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 22456 "configure" #include "confdefs.h" int main(void) { @@ -21434,29 +22466,29 @@ int main(void) { } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:21438: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:22470: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21441: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21443: \"$ac_try\"") >&5 + echo "$as_me:22473: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:22475: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21446: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22478: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_good_bcopy=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_good_bcopy=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:21459: result: $cf_cv_good_bcopy" >&5 +echo "$as_me:22491: result: $cf_cv_good_bcopy" >&5 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 else @@ -21479,17 +22511,17 @@ EOF fi -tty 2>&1 >/dev/null || { +tty >/dev/null 2>&1 || { for ac_func in posix_openpt do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:21486: checking for $ac_func" >&5 +echo "$as_me:22518: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 21492 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 22524 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21519,29 +22551,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21523: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:22555: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21526: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21529: \"$ac_try\"") >&5 + echo "$as_me:22558: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:22561: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21532: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22564: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21542: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then +echo "$as_me:22574: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 +if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:22584: checking if poll really works" >&5 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 if test "${cf_cv_working_poll+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21558,8 +22590,8 @@ else if test "$cross_compiling" = yes; then cf_cv_working_poll=unknown else - cat >conftest.$ac_ext <<_ACEOF -#line 21562 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 22594 "configure" #include "confdefs.h" #include @@ -21610,42 +22642,42 @@ int main(void) { ${cf_cv_main_return:-return}(ret < 0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:21614: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:22646: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21617: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21619: \"$ac_try\"") >&5 + echo "$as_me:22649: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:22651: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21622: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22654: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_working_poll=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_working_poll=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:21634: result: $cf_cv_working_poll" >&5 +echo "$as_me:22666: result: $cf_cv_working_poll" >&5 echo "${ECHO_T}$cf_cv_working_poll" >&6 test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF #define HAVE_WORKING_POLL 1 EOF -echo "$as_me:21641: checking for va_copy" >&5 +echo "$as_me:22673: checking for va_copy" >&5 echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 if test "${cf_cv_have_va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 21648 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 22680 "configure" #include "confdefs.h" #include @@ -21661,27 +22693,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21665: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:22697: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21668: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21671: \"$ac_try\"") >&5 + echo "$as_me:22700: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:22703: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21674: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22706: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_have_va_copy=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_have_va_copy=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21684: result: $cf_cv_have_va_copy" >&5 +echo "$as_me:22716: result: $cf_cv_have_va_copy" >&5 echo "${ECHO_T}$cf_cv_have_va_copy" >&6 if test "$cf_cv_have_va_copy" = yes; @@ -21693,14 +22725,14 @@ EOF else # !cf_cv_have_va_copy -echo "$as_me:21696: checking for __va_copy" >&5 +echo "$as_me:22728: checking for __va_copy" >&5 echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 if test "${cf_cv_have___va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 21703 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 22735 "configure" #include "confdefs.h" #include @@ -21716,27 +22748,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21720: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:22752: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21723: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21726: \"$ac_try\"") >&5 + echo "$as_me:22755: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:22758: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21729: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22761: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_have___va_copy=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_have___va_copy=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21739: result: $cf_cv_have___va_copy" >&5 +echo "$as_me:22771: result: $cf_cv_have___va_copy" >&5 echo "${ECHO_T}$cf_cv_have___va_copy" >&6 if test "$cf_cv_have___va_copy" = yes @@ -21748,14 +22780,14 @@ EOF else # !cf_cv_have___va_copy -echo "$as_me:21751: checking for __builtin_va_copy" >&5 +echo "$as_me:22783: checking for __builtin_va_copy" >&5 echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6 if test "${cf_cv_have___builtin_va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 21758 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 22790 "configure" #include "confdefs.h" #include @@ -21771,27 +22803,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21775: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:22807: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21778: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21781: \"$ac_try\"") >&5 + echo "$as_me:22810: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:22813: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21784: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22816: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_have___builtin_va_copy=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_have___builtin_va_copy=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21794: result: $cf_cv_have___builtin_va_copy" >&5 +echo "$as_me:22826: result: $cf_cv_have___builtin_va_copy" >&5 echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6 test "$cf_cv_have___builtin_va_copy" = yes && @@ -21809,14 +22841,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy ;; (*) - echo "$as_me:21812: checking if we can simply copy va_list" >&5 + echo "$as_me:22844: checking if we can simply copy va_list" >&5 echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6 if test "${cf_cv_pointer_va_list+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 21819 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 22851 "configure" #include "confdefs.h" #include @@ -21832,39 +22864,39 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21836: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:22868: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21839: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21842: \"$ac_try\"") >&5 + echo "$as_me:22871: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:22874: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21845: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22877: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_pointer_va_list=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_pointer_va_list=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21855: result: $cf_cv_pointer_va_list" >&5 +echo "$as_me:22887: result: $cf_cv_pointer_va_list" >&5 echo "${ECHO_T}$cf_cv_pointer_va_list" >&6 if test "$cf_cv_pointer_va_list" = no then - echo "$as_me:21860: checking if we can copy va_list indirectly" >&5 + echo "$as_me:22892: checking if we can copy va_list indirectly" >&5 echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6 if test "${cf_cv_array_va_list+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 21867 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 22899 "configure" #include "confdefs.h" #include @@ -21880,27 +22912,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21884: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:22916: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21887: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21890: \"$ac_try\"") >&5 + echo "$as_me:22919: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:22922: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21893: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22925: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_array_va_list=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_array_va_list=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21903: result: $cf_cv_array_va_list" >&5 +echo "$as_me:22935: result: $cf_cv_array_va_list" >&5 echo "${ECHO_T}$cf_cv_array_va_list" >&6 test "$cf_cv_array_va_list" = yes && cat >>confdefs.h <<\EOF @@ -21911,13 +22943,13 @@ EOF ;; esac -echo "$as_me:21914: checking for pid_t" >&5 +echo "$as_me:22946: checking for pid_t" >&5 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 21920 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 22952 "configure" #include "confdefs.h" $ac_includes_default int @@ -21931,29 +22963,29 @@ if (sizeof (pid_t)) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:21935: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:22967: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21938: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21941: \"$ac_try\"") >&5 + echo "$as_me:22970: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:22973: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21944: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22976: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_type_pid_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_type_pid_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:21954: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:22986: result: $ac_cv_type_pid_t" >&5 echo "${ECHO_T}$ac_cv_type_pid_t" >&6 -if test $ac_cv_type_pid_t = yes; then +if test "$ac_cv_type_pid_t" = yes; then : else @@ -21966,24 +22998,24 @@ fi for ac_header in unistd.h vfork.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:21969: checking for $ac_header" >&5 +echo "$as_me:23001: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 21975 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23007 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:21979: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:23011: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:21985: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:23017: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -21996,14 +23028,14 @@ if test -z "$ac_cpp_err"; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:22004: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then +echo "$as_me:23036: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:23049: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 22023 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23055 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -22050,29 +23082,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22054: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:23086: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22057: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22060: \"$ac_try\"") >&5 + echo "$as_me:23089: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:23092: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22063: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23095: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22073: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then +echo "$as_me:23105: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 +if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 + echo "$as_me:23117: checking for working fork" >&5 echo $ECHO_N "checking for working fork... $ECHO_C" >&6 if test "${ac_cv_func_fork_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22090,7 +23122,7 @@ else if test "$cross_compiling" = yes; then ac_cv_func_fork_works=cross else - cat >conftest.$ac_ext <<_ACEOF + cat >"conftest.$ac_ext" <<_ACEOF /* By Rüdiger Kuhlmann. */ #include #if HAVE_UNISTD_H @@ -22104,28 +23136,28 @@ else $ac_main_return (0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:22108: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:23140: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22111: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:22113: \"$ac_try\"") >&5 + echo "$as_me:23143: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:23145: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22116: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23148: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_fork_works=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_fork_works=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:22128: result: $ac_cv_func_fork_works" >&5 +echo "$as_me:23160: result: $ac_cv_func_fork_works" >&5 echo "${ECHO_T}$ac_cv_func_fork_works" >&6 fi @@ -22139,12 +23171,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:22142: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + { echo "$as_me:23174: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;} fi ac_cv_func_vfork_works=$ac_cv_func_vfork if test "x$ac_cv_func_vfork" = xyes; then - echo "$as_me:22147: checking for working vfork" >&5 + echo "$as_me:23179: checking for working vfork" >&5 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6 if test "${ac_cv_func_vfork_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22152,8 +23184,8 @@ else if test "$cross_compiling" = yes; then ac_cv_func_vfork_works=cross else - cat >conftest.$ac_ext <<_ACEOF -#line 22156 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23188 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include @@ -22249,34 +23281,34 @@ main (void) } } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:22253: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:23285: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22256: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:22258: \"$ac_try\"") >&5 + echo "$as_me:23288: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:23290: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22261: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23293: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_vfork_works=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_vfork_works=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:22273: result: $ac_cv_func_vfork_works" >&5 +echo "$as_me:23305: result: $ac_cv_func_vfork_works" >&5 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6 fi; if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_vfork_works=ac_cv_func_vfork - { echo "$as_me:22279: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + { echo "$as_me:23311: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;} fi @@ -22301,7 +23333,7 @@ EOF fi -echo "$as_me:22304: checking if fopen accepts explicit binary mode" >&5 +echo "$as_me:23336: checking if fopen accepts explicit binary mode" >&5 echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6 if test "${cf_cv_fopen_bin_r+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22310,8 +23342,8 @@ else if test "$cross_compiling" = yes; then cf_cv_fopen_bin_r=unknown else - cat >conftest.$ac_ext <<_ACEOF -#line 22314 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23346 "configure" #include "confdefs.h" #include @@ -22343,29 +23375,29 @@ int main(void) { } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:22347: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:23379: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22350: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:22352: \"$ac_try\"") >&5 + echo "$as_me:23382: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:23384: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22355: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23387: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_fopen_bin_r=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_fopen_bin_r=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:22368: result: $cf_cv_fopen_bin_r" >&5 +echo "$as_me:23400: result: $cf_cv_fopen_bin_r" >&5 echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6 test "x$cf_cv_fopen_bin_r" != xno && cat >>confdefs.h <<\EOF @@ -22374,15 +23406,15 @@ EOF # special check for test/ditto.c -echo "$as_me:22377: checking for openpty in -lutil" >&5 +echo "$as_me:23409: checking for openpty in -lutil" >&5 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 if test "${ac_cv_lib_util_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 22385 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 23417 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22400,43 +23432,43 @@ openpty (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22404: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:23436: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22407: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22410: \"$ac_try\"") >&5 + echo "$as_me:23439: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:23442: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22413: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23445: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_util_openpty=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_util_openpty=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22424: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:23456: result: $ac_cv_lib_util_openpty" >&5 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 -if test $ac_cv_lib_util_openpty = yes; then +if test "$ac_cv_lib_util_openpty" = yes; then cf_cv_lib_util=yes else cf_cv_lib_util=no fi -echo "$as_me:22432: checking for openpty header" >&5 +echo "$as_me:23464: checking for openpty header" >&5 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 if test "${cf_cv_func_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cf_save_LIBS="$LIBS" - test $cf_cv_lib_util = yes && { + test "$cf_cv_lib_util" = yes && { cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -22455,8 +23487,8 @@ LIBS="$cf_add_libs" } for cf_header in pty.h libutil.h util.h do - cat >conftest.$ac_ext <<_ACEOF -#line 22459 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23491 "configure" #include "confdefs.h" #include <$cf_header> @@ -22472,35 +23504,35 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22476: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:23508: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22479: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22482: \"$ac_try\"") >&5 + echo "$as_me:23511: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:23514: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22485: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23517: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_func_openpty=$cf_header break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_func_openpty=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done LIBS="$cf_save_LIBS" fi -echo "$as_me:22503: result: $cf_cv_func_openpty" >&5 +echo "$as_me:23535: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -22549,9 +23581,9 @@ case $with_hashed_db in if test -n "$with_hashed_db/include" ; then for cf_add_incdir in $with_hashed_db/include do - while test $cf_add_incdir != /usr/include + while test "$cf_add_incdir" != /usr/include do - if test -d $cf_add_incdir + if test -d "$cf_add_incdir" then cf_have_incdir=no if test -n "$CFLAGS$CPPFLAGS" ; then @@ -22572,8 +23604,8 @@ if test -n "$with_hashed_db/include" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 22576 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23608 "configure" #include "confdefs.h" #include int @@ -22584,25 +23616,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:22588: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:23620: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22591: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22594: \"$ac_try\"") >&5 + echo "$as_me:23623: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:23626: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22597: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23629: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -22611,11 +23643,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:22614: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:23646: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` test "$cf_top_incdir" = "$cf_add_incdir" && break cf_add_incdir="$cf_top_incdir" else @@ -22631,9 +23663,9 @@ fi if test -n "$with_hashed_db/lib" ; then for cf_add_libdir in $with_hashed_db/lib do - if test $cf_add_libdir = /usr/lib ; then + if test "$cf_add_libdir" = /usr/lib ; then : - elif test -d $cf_add_libdir + elif test -d "$cf_add_libdir" then cf_have_libdir=no if test -n "$LDFLAGS$LIBS" ; then @@ -22647,7 +23679,7 @@ if test -n "$with_hashed_db/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:22650: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:23682: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -22658,7 +23690,7 @@ fi else case "$with_hashed_db" in (./*|../*|/*) - { echo "$as_me:22661: WARNING: no such directory $with_hashed_db" >&5 + { echo "$as_me:23693: WARNING: no such directory $with_hashed_db" >&5 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} ;; (*) @@ -22669,11 +23701,11 @@ test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for include-directories under $prefix" - test -d $prefix/include && cf_search="$cf_search $prefix/include" - test -d $prefix/include/$with_hashed_db && cf_search="$cf_search $prefix/include/$with_hashed_db" - test -d $prefix/include/$with_hashed_db/include && cf_search="$cf_search $prefix/include/$with_hashed_db/include" - test -d $prefix/$with_hashed_db/include && cf_search="$cf_search $prefix/$with_hashed_db/include" - test -d $prefix/$with_hashed_db/include/$with_hashed_db && cf_search="$cf_search $prefix/$with_hashed_db/include/$with_hashed_db" + test -d "$prefix/include" && cf_search="$cf_search $prefix/include" + test -d "$prefix/include/$with_hashed_db" && cf_search="$cf_search $prefix/include/$with_hashed_db" + test -d "$prefix/include/$with_hashed_db/include" && cf_search="$cf_search $prefix/include/$with_hashed_db/include" + test -d "$prefix/$with_hashed_db/include" && cf_search="$cf_search $prefix/$with_hashed_db/include" + test -d "$prefix/$with_hashed_db/include/$with_hashed_db" && cf_search="$cf_search $prefix/$with_hashed_db/include/$with_hashed_db" } for cf_subdir_prefix in \ @@ -22687,28 +23719,28 @@ do test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ -(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { +{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" - test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include" - test -d $cf_subdir_prefix/include/$with_hashed_db && cf_search="$cf_search $cf_subdir_prefix/include/$with_hashed_db" - test -d $cf_subdir_prefix/include/$with_hashed_db/include && cf_search="$cf_search $cf_subdir_prefix/include/$with_hashed_db/include" - test -d $cf_subdir_prefix/$with_hashed_db/include && cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/include" - test -d $cf_subdir_prefix/$with_hashed_db/include/$with_hashed_db && cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/include/$with_hashed_db" + test -d "$cf_subdir_prefix/include" && cf_search="$cf_search $cf_subdir_prefix/include" + test -d "$cf_subdir_prefix/include/$with_hashed_db" && cf_search="$cf_search $cf_subdir_prefix/include/$with_hashed_db" + test -d "$cf_subdir_prefix/include/$with_hashed_db/include" && cf_search="$cf_search $cf_subdir_prefix/include/$with_hashed_db/include" + test -d "$cf_subdir_prefix/$with_hashed_db/include" && cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/include" + test -d "$cf_subdir_prefix/$with_hashed_db/include/$with_hashed_db" && cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/include/$with_hashed_db" } done for cf_item in $cf_search do - case $cf_item in + case "$cf_item" in (*/$with_hashed_db) if test -n "$cf_item" ; then for cf_add_incdir in $cf_item do - while test $cf_add_incdir != /usr/include + while test "$cf_add_incdir" != /usr/include do - if test -d $cf_add_incdir + if test -d "$cf_add_incdir" then cf_have_incdir=no if test -n "$CFLAGS$CPPFLAGS" ; then @@ -22729,8 +23761,8 @@ if test -n "$cf_item" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 22733 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23765 "configure" #include "confdefs.h" #include int @@ -22741,25 +23773,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:22745: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:23777: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22748: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22751: \"$ac_try\"") >&5 + echo "$as_me:23780: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:23783: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22754: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23786: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -22768,11 +23800,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:22771: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:23803: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` test "$cf_top_incdir" = "$cf_add_incdir" && break cf_add_incdir="$cf_top_incdir" else @@ -22795,11 +23827,11 @@ test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $prefix" - test -d $prefix/lib && cf_search="$cf_search $prefix/lib" - test -d $prefix/lib/$with_hashed_db && cf_search="$cf_search $prefix/lib/$with_hashed_db" - test -d $prefix/lib/$with_hashed_db/lib && cf_search="$cf_search $prefix/lib/$with_hashed_db/lib" - test -d $prefix/$with_hashed_db/lib && cf_search="$cf_search $prefix/$with_hashed_db/lib" - test -d $prefix/$with_hashed_db/lib/$with_hashed_db && cf_search="$cf_search $prefix/$with_hashed_db/lib/$with_hashed_db" + test -d "$prefix/lib" && cf_search="$cf_search $prefix/lib" + test -d "$prefix/lib/$with_hashed_db" && cf_search="$cf_search $prefix/lib/$with_hashed_db" + test -d "$prefix/lib/$with_hashed_db/lib" && cf_search="$cf_search $prefix/lib/$with_hashed_db/lib" + test -d "$prefix/$with_hashed_db/lib" && cf_search="$cf_search $prefix/$with_hashed_db/lib" + test -d "$prefix/$with_hashed_db/lib/$with_hashed_db" && cf_search="$cf_search $prefix/$with_hashed_db/lib/$with_hashed_db" } for cf_subdir_prefix in \ @@ -22813,28 +23845,28 @@ do test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ -(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { +{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" - test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib" - test -d $cf_subdir_prefix/lib/$with_hashed_db && cf_search="$cf_search $cf_subdir_prefix/lib/$with_hashed_db" - test -d $cf_subdir_prefix/lib/$with_hashed_db/lib && cf_search="$cf_search $cf_subdir_prefix/lib/$with_hashed_db/lib" - test -d $cf_subdir_prefix/$with_hashed_db/lib && cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/lib" - test -d $cf_subdir_prefix/$with_hashed_db/lib/$with_hashed_db && cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/lib/$with_hashed_db" + test -d "$cf_subdir_prefix/lib" && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d "$cf_subdir_prefix/lib/$with_hashed_db" && cf_search="$cf_search $cf_subdir_prefix/lib/$with_hashed_db" + test -d "$cf_subdir_prefix/lib/$with_hashed_db/lib" && cf_search="$cf_search $cf_subdir_prefix/lib/$with_hashed_db/lib" + test -d "$cf_subdir_prefix/$with_hashed_db/lib" && cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/lib" + test -d "$cf_subdir_prefix/$with_hashed_db/lib/$with_hashed_db" && cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/lib/$with_hashed_db" } done for cf_item in $cf_search do - case $cf_item in + case "$cf_item" in (*/$with_hashed_db) if test -n "$cf_item" ; then for cf_add_libdir in $cf_item do - if test $cf_add_libdir = /usr/lib ; then + if test "$cf_add_libdir" = /usr/lib ; then : - elif test -d $cf_add_libdir + elif test -d "$cf_add_libdir" then cf_have_libdir=no if test -n "$LDFLAGS$LIBS" ; then @@ -22848,7 +23880,7 @@ if test -n "$cf_item" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:22851: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:23883: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -22865,24 +23897,24 @@ fi fi esac -echo "$as_me:22868: checking for db.h" >&5 +echo "$as_me:23900: checking for db.h" >&5 echo $ECHO_N "checking for db.h... $ECHO_C" >&6 if test "${ac_cv_header_db_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 22874 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23906 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:22878: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:23910: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:22884: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:23916: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -22895,16 +23927,16 @@ if test -z "$ac_cpp_err"; then ac_cv_header_db_h=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 ac_cv_header_db_h=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:22903: result: $ac_cv_header_db_h" >&5 +echo "$as_me:23935: result: $ac_cv_header_db_h" >&5 echo "${ECHO_T}$ac_cv_header_db_h" >&6 -if test $ac_cv_header_db_h = yes; then +if test "$ac_cv_header_db_h" = yes; then -echo "$as_me:22907: checking for version of db" >&5 +echo "$as_me:23939: checking for version of db" >&5 echo $ECHO_N "checking for version of db... $ECHO_C" >&6 if test "${cf_cv_hashed_db_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22915,10 +23947,10 @@ cf_cv_hashed_db_version=unknown for cf_db_version in 1 2 3 4 5 6 do -echo "${as_me:-configure}:22918: testing checking for db version $cf_db_version ..." 1>&5 +echo "${as_me:-configure}:23950: testing checking for db version $cf_db_version ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 22921 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23953 "configure" #include "confdefs.h" $ac_includes_default @@ -22947,40 +23979,40 @@ DBT *foo = 0 return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:22951: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:23983: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22954: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22957: \"$ac_try\"") >&5 + echo "$as_me:23986: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:23989: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22960: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23992: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_hashed_db_version=$cf_db_version break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:22974: result: $cf_cv_hashed_db_version" >&5 +echo "$as_me:24006: result: $cf_cv_hashed_db_version" >&5 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 if test "$cf_cv_hashed_db_version" = unknown ; then - { { echo "$as_me:22978: error: Cannot determine version of db" >&5 + { { echo "$as_me:24010: error: Cannot determine version of db" >&5 echo "$as_me: error: Cannot determine version of db" >&2;} { (exit 1); exit 1; }; } else -echo "$as_me:22983: checking for db libraries" >&5 +echo "$as_me:24015: checking for db libraries" >&5 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 if test "${cf_cv_hashed_db_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23010,10 +24042,10 @@ LIBS="$cf_add_libs" fi -echo "${as_me:-configure}:23013: testing checking for library "$cf_db_libs" ..." 1>&5 +echo "${as_me:-configure}:24045: testing checking for library $cf_db_libs ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 23016 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24048 "configure" #include "confdefs.h" $ac_includes_default @@ -23067,18 +24099,18 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23071: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:24103: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23074: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23077: \"$ac_try\"") >&5 + echo "$as_me:24106: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:24109: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23080: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24112: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then if test -n "$cf_db_libs" ; then cf_cv_hashed_db_libs=$cf_db_libs @@ -23090,18 +24122,18 @@ if { (eval echo "$as_me:23071: \"$ac_link\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_libs" done fi -echo "$as_me:23100: result: $cf_cv_hashed_db_libs" >&5 +echo "$as_me:24132: result: $cf_cv_hashed_db_libs" >&5 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 if test "$cf_cv_hashed_db_libs" = unknown ; then - { { echo "$as_me:23104: error: Cannot determine library for db" >&5 + { { echo "$as_me:24136: error: Cannot determine library for db" >&5 echo "$as_me: error: Cannot determine library for db" >&2;} { (exit 1); exit 1; }; } elif test "$cf_cv_hashed_db_libs" != default ; then @@ -23127,7 +24159,7 @@ fi else - { { echo "$as_me:23130: error: Cannot find db.h" >&5 + { { echo "$as_me:24162: error: Cannot find db.h" >&5 echo "$as_me: error: Cannot find db.h" >&2;} { (exit 1); exit 1; }; } @@ -23135,22 +24167,22 @@ fi fi -if test -z "$cf_user_CFLAGS" && test "$with_no_leaks" = no ; then - CFLAGS=`echo ${CFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'` - CXXFLAGS=`echo ${CXXFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'` +if test -z "$cf_user_CFLAGS" && test "$enable_leaks" = yes ; then + CFLAGS=`echo "${CFLAGS}" | sed -e 's%-g %%' -e 's%-g$%%' -e 's%[ ]% %g' -e 's% [ ]*% %g' -e 's%^ %%' -e 's% $%%'` + CXXFLAGS=`echo "${CXXFLAGS}" | sed -e 's%-g %%' -e 's%-g$%%' -e 's%[ ]% %g' -e 's% [ ]*% %g' -e 's%^ %%' -e 's% $%%'` fi # Just in case, check if the C compiler has a bool type. -echo "$as_me:23145: checking if we should include stdbool.h" >&5 +echo "$as_me:24177: checking if we should include stdbool.h" >&5 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 if test "${cf_cv_header_stdbool_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 23153 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24185 "configure" #include "confdefs.h" int @@ -23161,24 +24193,24 @@ bool foo = false return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:23165: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:24197: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23168: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23171: \"$ac_try\"") >&5 + echo "$as_me:24200: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:24203: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23174: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24206: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_header_stdbool_h=0 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 23181 "configure" +cat "conftest.$ac_ext" >&5 +cat >"conftest.$ac_ext" <<_ACEOF +#line 24213 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -23193,45 +24225,45 @@ bool foo = false return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:23197: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:24229: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23200: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23203: \"$ac_try\"") >&5 + echo "$as_me:24232: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:24235: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23206: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24238: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_header_stdbool_h=1 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_header_stdbool_h=0 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:23220: result: yes" >&5 +then echo "$as_me:24252: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:23222: result: no" >&5 +else echo "$as_me:24254: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:23226: checking for builtin bool type" >&5 +echo "$as_me:24258: checking for builtin bool type" >&5 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 if test "${cf_cv_cc_bool_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 23234 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24266 "configure" #include "confdefs.h" #include @@ -23245,32 +24277,32 @@ bool x = false return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:23249: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:24281: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23252: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23255: \"$ac_try\"") >&5 + echo "$as_me:24284: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:24287: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23258: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24290: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_cc_bool_type=1 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_cc_bool_type=0 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi if test "$cf_cv_cc_bool_type" = 1 -then echo "$as_me:23271: result: yes" >&5 +then echo "$as_me:24303: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:23273: result: no" >&5 +else echo "$as_me:24305: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -23278,19 +24310,19 @@ fi if test -n "$CXX" ; then ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_main_return=return +ac_main_return="return" if test -n "$GXX" ; then cf_save="$LIBS" LIBS="$LIBS $CXXLIBS" - echo "$as_me:23290: checking if we already have C++ library" >&5 + echo "$as_me:24322: checking if we already have C++ library" >&5 echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 23293 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24325 "configure" #include "confdefs.h" #include @@ -23303,32 +24335,32 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23307: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:24339: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23310: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23313: \"$ac_try\"") >&5 + echo "$as_me:24342: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:24345: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23316: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24348: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_have_libstdcpp=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_libstdcpp=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:23325: result: $cf_have_libstdcpp" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:24357: result: $cf_have_libstdcpp" >&5 echo "${ECHO_T}$cf_have_libstdcpp" >&6 LIBS="$cf_save" - if test $cf_have_libstdcpp != yes + if test "$cf_have_libstdcpp" != yes then - case $cf_cv_system_name in + case "$cf_cv_system_name" in (os2*) if test -z "`g++ -dM -E - < /dev/null | grep __KLIBC__`"; then cf_stdcpp_libname=stdcpp @@ -23341,7 +24373,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6 ;; esac - echo "$as_me:23344: checking for library $cf_stdcpp_libname" >&5 + echo "$as_me:24376: checking for library $cf_stdcpp_libname" >&5 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 if test "${cf_cv_libstdcpp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23366,8 +24398,8 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 23370 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24402 "configure" #include "confdefs.h" #include @@ -23380,29 +24412,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23384: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:24416: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23387: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23390: \"$ac_try\"") >&5 + echo "$as_me:24419: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:24422: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23393: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24425: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_libstdcpp=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_libstdcpp=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save" fi -echo "$as_me:23405: result: $cf_cv_libstdcpp" >&5 +echo "$as_me:24437: result: $cf_cv_libstdcpp" >&5 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 test "$cf_cv_libstdcpp" = yes && { cf_add_libs="$CXXLIBS" @@ -23424,7 +24456,7 @@ CXXLIBS="$cf_add_libs" fi fi - echo "$as_me:23427: checking whether $CXX understands -c and -o together" >&5 + echo "$as_me:24459: checking whether $CXX understands -c and -o together" >&5 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 if test "${cf_cv_prog_CXX_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23439,40 +24471,40 @@ CF_EOF # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:23442: \"$ac_try\"") >&5 +if { (eval echo "$as_me:24474: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23445: \$? = $ac_status" >&5 - (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:23447: \"$ac_try\"") >&5 + echo "$as_me:24477: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + test -f conftest2.$ac_objext && { (eval echo "$as_me:24479: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23450: \$? = $ac_status" >&5 - (exit $ac_status); }; + echo "$as_me:24482: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then eval cf_cv_prog_CXX_c_o=yes else eval cf_cv_prog_CXX_c_o=no fi -rm -rf conftest* +rm -rf ./conftest* fi -if test $cf_cv_prog_CXX_c_o = yes; then - echo "$as_me:23461: result: yes" >&5 +if test "$cf_cv_prog_CXX_c_o" = yes; then + echo "$as_me:24493: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:23464: result: no" >&5 + echo "$as_me:24496: result: no" >&5 echo "${ECHO_T}no" >&6 fi - case $GXX_VERSION in - (1*|2.0-6*) + case "$GXX_VERSION" in + (1.*|2.[0-6]*|[1-9][0-9].*) cf_cxx_library=yes ;; (*-2.7*|2.7*) cf_cxx_library=unknown -case $cf_cv_system_name in +case "$cf_cv_system_name" in (os2*) cf_gpp_libname=gpp ;; @@ -23481,7 +24513,7 @@ case $cf_cv_system_name in ;; esac if test "$GXX" = yes; then - echo "$as_me:23484: checking for lib$cf_gpp_libname" >&5 + echo "$as_me:24516: checking for lib$cf_gpp_libname" >&5 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 cf_save="$LIBS" @@ -23501,8 +24533,8 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 23505 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24537 "configure" #include "confdefs.h" #include <$cf_gpp_libname/builtin.h> @@ -23515,18 +24547,18 @@ two_arg_error_handler_t foo2 = lib_error_handler return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23519: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:24551: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23522: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23525: \"$ac_try\"") >&5 + echo "$as_me:24554: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:24557: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23528: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24560: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cxx_library=yes cf_add_libs="$CXXLIBS" @@ -23560,9 +24592,9 @@ EOF fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 23565 "configure" +cat "conftest.$ac_ext" >&5 +cat >"conftest.$ac_ext" <<_ACEOF +#line 24597 "configure" #include "confdefs.h" #include @@ -23575,18 +24607,18 @@ two_arg_error_handler_t foo2 = lib_error_handler return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23579: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:24611: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23582: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23585: \"$ac_try\"") >&5 + echo "$as_me:24614: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:24617: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23588: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24620: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cxx_library=yes cf_add_libs="$CXXLIBS" @@ -23611,14 +24643,14 @@ EOF else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cxx_library=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save" - echo "$as_me:23621: result: $cf_cxx_library" >&5 + echo "$as_me:24653: result: $cf_cxx_library" >&5 echo "${ECHO_T}$cf_cxx_library" >&6 fi @@ -23630,11 +24662,11 @@ fi ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_main_return=return -echo "$as_me:23637: checking how to run the C++ preprocessor" >&5 +ac_main_return="return" +echo "$as_me:24669: checking how to run the C++ preprocessor" >&5 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then @@ -23650,20 +24682,20 @@ do # with a fresh cross-compiler works. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line 23654 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24686 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:23659: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:24691: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23665: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:24697: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag else @@ -23676,27 +24708,27 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line 23688 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24720 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:23692: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:24724: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23698: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:24730: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag else @@ -23710,16 +24742,16 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 # Passes both tests. ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then break fi @@ -23732,7 +24764,7 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:23735: result: $CXXCPP" >&5 +echo "$as_me:24767: result: $CXXCPP" >&5 echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -23741,20 +24773,20 @@ do # with a fresh cross-compiler works. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line 23745 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24777 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:23750: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:24782: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23756: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:24788: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag else @@ -23767,27 +24799,27 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line 23779 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24811 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:23783: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:24815: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23789: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:24821: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag else @@ -23801,52 +24833,52 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 # Passes both tests. ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then : else - { { echo "$as_me:23817: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + { { echo "$as_me:24849: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_main_return=return +ac_main_return="return" for ac_header in typeinfo do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:23832: checking for $ac_header" >&5 +echo "$as_me:24864: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 23838 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24870 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:23842: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:24874: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23848: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:24880: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag else @@ -23859,14 +24891,14 @@ if test -z "$ac_cpp_err"; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:23867: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then +echo "$as_me:24899: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:24912: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 23886 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24918 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:23890: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:24922: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23896: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:24928: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag else @@ -23907,14 +24939,14 @@ if test -z "$ac_cpp_err"; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:23915: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then +echo "$as_me:24947: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 + echo "$as_me:24958: checking if iostream uses std-namespace" >&5 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 23929 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24961 "configure" #include "confdefs.h" #include @@ -23942,26 +24974,26 @@ cerr << "testing" << endl; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:23946: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:24978: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23949: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23952: \"$ac_try\"") >&5 + echo "$as_me:24981: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:24984: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23955: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24987: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_iostream_namespace=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_iostream_namespace=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:23964: result: $cf_iostream_namespace" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + echo "$as_me:24996: result: $cf_iostream_namespace" >&5 echo "${ECHO_T}$cf_iostream_namespace" >&6 if test "$cf_iostream_namespace" = yes ; then @@ -23972,15 +25004,15 @@ EOF fi fi -echo "$as_me:23975: checking if we should include stdbool.h" >&5 +echo "$as_me:25007: checking if we should include stdbool.h" >&5 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 if test "${cf_cv_header_stdbool_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 23983 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 25015 "configure" #include "confdefs.h" int @@ -23991,24 +25023,24 @@ bool foo = false return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:23995: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25027: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23998: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24001: \"$ac_try\"") >&5 + echo "$as_me:25030: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25033: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24004: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:25036: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_header_stdbool_h=0 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 24011 "configure" +cat "conftest.$ac_ext" >&5 +cat >"conftest.$ac_ext" <<_ACEOF +#line 25043 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -24023,99 +25055,896 @@ bool foo = false return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:24027: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25059: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24030: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24033: \"$ac_try\"") >&5 + echo "$as_me:25062: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25065: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24036: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:25068: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_header_stdbool_h=1 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_header_stdbool_h=0 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:24050: result: yes" >&5 +then echo "$as_me:25082: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:24052: result: no" >&5 +else echo "$as_me:25084: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:24056: checking for builtin bool type" >&5 +echo "$as_me:25088: checking for builtin bool type" >&5 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 -if test "${cf_cv_builtin_bool+set}" = set; then +if test "${cf_cv_builtin_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >"conftest.$ac_ext" <<_ACEOF +#line 25096 "configure" +#include "confdefs.h" + +#include +#include + +int +main (void) +{ +bool x = false + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25111: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:25114: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25117: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25120: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_builtin_bool=1 +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_builtin_bool=0 +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + +fi + +if test "$cf_cv_builtin_bool" = 1 +then echo "$as_me:25133: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else echo "$as_me:25135: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +echo "$as_me:25139: checking for bool" >&5 +echo $ECHO_N "checking for bool... $ECHO_C" >&6 +if test "${ac_cv_type_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 25145 "configure" +#include "confdefs.h" + +#include +#include + +#if defined(__cplusplus) + +#ifdef HAVE_GXX_BUILTIN_H +#include +#elif HAVE_GPP_BUILTIN_H +#include +#elif HAVE_BUILTIN_H +#include +#endif + +#else + +#if $cf_cv_header_stdbool_h +#include +#endif + +#endif + +int +main (void) +{ +if ((bool *) 0) + return 0; +if (sizeof (bool)) + return 0; + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25181: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:25184: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25187: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25190: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_bool=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_type_bool=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +fi +echo "$as_me:25200: result: $ac_cv_type_bool" >&5 +echo "${ECHO_T}$ac_cv_type_bool" >&6 + +echo "$as_me:25203: checking size of bool" >&5 +echo $ECHO_N "checking size of bool... $ECHO_C" >&6 +if test "${ac_cv_sizeof_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_bool" = yes; then + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >"conftest.$ac_ext" <<_ACEOF +#line 25212 "configure" +#include "confdefs.h" + +#include +#include + +#if defined(__cplusplus) + +#ifdef HAVE_GXX_BUILTIN_H +#include +#elif HAVE_GPP_BUILTIN_H +#include +#elif HAVE_BUILTIN_H +#include +#endif + +#else + +#if $cf_cv_header_stdbool_h +#include +#endif + +#endif + +int +main (void) +{ +int _array_ [1 - 2 * !((sizeof (bool)) >= 0)] + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25245: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:25248: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25251: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25254: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +#line 25259 "configure" +#include "confdefs.h" + +#include +#include + +#if defined(__cplusplus) + +#ifdef HAVE_GXX_BUILTIN_H +#include +#elif HAVE_GPP_BUILTIN_H +#include +#elif HAVE_BUILTIN_H +#include +#endif + +#else + +#if $cf_cv_header_stdbool_h +#include +#endif + +#endif + +int +main (void) +{ +int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25292: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:25295: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25298: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25301: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_lo=`expr "$ac_mid" + 1`; ac_mid=`expr 2 '*' "$ac_mid" + 1` +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + done +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +#line 25317 "configure" +#include "confdefs.h" + +#include +#include + +#if defined(__cplusplus) + +#ifdef HAVE_GXX_BUILTIN_H +#include +#elif HAVE_GPP_BUILTIN_H +#include +#elif HAVE_BUILTIN_H +#include +#endif + +#else + +#if $cf_cv_header_stdbool_h +#include +#endif + +#endif + +int +main (void) +{ +int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25350: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:25353: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25356: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25359: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_hi=`expr "$ac_mid" - 1`; ac_mid=`expr 2 '*' "$ac_mid"` +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + done +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +#line 25375 "configure" +#include "confdefs.h" + +#include +#include + +#if defined(__cplusplus) + +#ifdef HAVE_GXX_BUILTIN_H +#include +#elif HAVE_GPP_BUILTIN_H +#include +#elif HAVE_BUILTIN_H +#include +#endif + +#else + +#if $cf_cv_header_stdbool_h +#include +#endif + +#endif + +int +main (void) +{ +int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25408: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:25411: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25414: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25417: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_lo=`expr "$ac_mid" + 1` +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +done +ac_cv_sizeof_bool=$ac_lo +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:25430: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 25435 "configure" +#include "confdefs.h" + +#include +#include + +#if defined(__cplusplus) + +#ifdef HAVE_GXX_BUILTIN_H +#include +#elif HAVE_GPP_BUILTIN_H +#include +#elif HAVE_BUILTIN_H +#include +#endif + +#else + +#if $cf_cv_header_stdbool_h +#include +#endif + +#endif + +int +main (void) +{ +FILE *f = fopen ("conftest.val", "w"); +if (!f) + $ac_main_return (1); +fprintf (f, "%ld", (long)(sizeof (bool))); +fclose (f); + ; + return 0; +} +_ACEOF +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:25472: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:25475: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:25477: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25480: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_bool=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" +fi +fi +rm -f conftest.val +else + ac_cv_sizeof_bool=0 +fi +fi +echo "$as_me:25496: result: $ac_cv_sizeof_bool" >&5 +echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 +cat >>confdefs.h <&5 +echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 +if test "${cf_cv_type_of_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + rm -f cf_test.out + if test "$cross_compiling" = yes; then + + case x$ac_cv_sizeof_bool in + (x1) cf_cv_type_of_bool="unsigned char";; + (x2) cf_cv_type_of_bool="unsigned short";; + (x4) cf_cv_type_of_bool="unsigned int";; + (x8) cf_cv_type_of_bool="unsigned long";; + (*) cf_cv_type_of_bool=unknown;; + esac + +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 25521 "configure" +#include "confdefs.h" + +#include +#include + +#if defined(__cplusplus) + +#ifdef HAVE_GXX_BUILTIN_H +#include +#elif HAVE_GPP_BUILTIN_H +#include +#elif HAVE_BUILTIN_H +#include +#endif + +#else + +#if $cf_cv_header_stdbool_h +#include +#endif + +#endif + +int main(void) +{ + FILE *fp = fopen("cf_test.out", "w"); + if (fp != 0) { + bool x = true; + if ((bool)(-x) >= 0) + fputs("unsigned ", fp); + if (sizeof(x) == sizeof(int)) fputs("int", fp); + else if (sizeof(x) == sizeof(char)) fputs("char", fp); + else if (sizeof(x) == sizeof(short))fputs("short",fp); + else if (sizeof(x) == sizeof(long)) fputs("long", fp); + fclose(fp); + } + ${cf_cv_main_return:-return}(0); +} + +_ACEOF +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:25563: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:25566: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:25568: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25571: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_of_bool=`cat cf_test.out` + if test -z "$cf_cv_type_of_bool"; then + cf_cv_type_of_bool=unknown + fi +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_type_of_bool=unknown +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" +fi + rm -f cf_test.out + +fi +echo "$as_me:25588: result: $cf_cv_type_of_bool" >&5 +echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + +if test "$cf_cv_type_of_bool" = unknown ; then + case .$NCURSES_BOOL in + (.auto|.) NCURSES_BOOL=unsigned;; + esac + { echo "$as_me:25595: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 +echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} + cf_cv_type_of_bool=$NCURSES_BOOL +fi + +echo "$as_me:25600: checking for special defines needed for etip.h" >&5 +echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 +cf_save_CXXFLAGS="$CXXFLAGS" +cf_result="none" + +# etip.h includes ncurses.h which includes ncurses_dll.h +# But ncurses_dll.h is generated - fix here. +test -d include || mkdir include +test -f include/ncurses_dll.h || sed -e 's/@NCURSES_WRAP_PREFIX@/'$NCURSES_WRAP_PREFIX'/g' "${srcdir}/include/ncurses_dll.h.in" >include/ncurses_dll.h + +for cf_math in "" MATH_H +do +for cf_excp in "" MATH_EXCEPTION +do + CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -Iinclude -I${srcdir}/include" + test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" + test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" +cat >"conftest.$ac_ext" <<_ACEOF +#line 25618 "configure" +#include "confdefs.h" + +#include + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25632: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:25635: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25638: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25641: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$cf_math" && cat >>confdefs.h <>confdefs.h <&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +done +done +echo "$as_me:25662: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 +CXXFLAGS="$cf_save_CXXFLAGS" + +if test -n "$CXX"; then +echo "$as_me:25667: checking if $CXX accepts parameter initialization" >&5 +echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 +if test "${cf_cv_cpp_param_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +ac_main_return="return" + + if test "$cross_compiling" = yes; then + cf_cv_cpp_param_init=unknown +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 25684 "configure" +#include "confdefs.h" + +class TEST { +private: + int value; +public: + TEST(int x = 1); + ~TEST(); +}; + +TEST::TEST(int x = 1) // some compilers do not like second initializer +{ + value = x; +} +int main(void) { } + +_ACEOF +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:25703: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:25706: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:25708: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25711: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cpp_param_init=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_cpp_param_init=no +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" +fi + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +ac_main_return="return" + +fi +echo "$as_me:25730: result: $cf_cv_cpp_param_init" >&5 +echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 +fi +test "$cf_cv_cpp_param_init" = yes && +cat >>confdefs.h <<\EOF +#define CPP_HAS_PARAM_INIT 1 +EOF + +if test -n "$CXX"; then + +echo "$as_me:25740: checking if $CXX accepts static_cast" >&5 +echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 +if test "${cf_cv_cpp_static_cast+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +ac_main_return="return" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 25754 "configure" +#include "confdefs.h" + +class NCursesPanel +{ +public: + NCursesPanel(int nlines, + int ncols, + int begin_y = 0, + int begin_x = 0) + { + } + NCursesPanel(); + ~NCursesPanel(); +}; + +template class NCursesUserPanel : public NCursesPanel +{ +public: + NCursesUserPanel (int nlines, + int ncols, + int begin_y = 0, + int begin_x = 0, + const T* p_UserData = static_cast(0)) + : NCursesPanel (nlines, ncols, begin_y, begin_x) + { + }; + NCursesUserPanel(const T* p_UserData = static_cast(0)) : NCursesPanel() + { + }; + + virtual ~NCursesUserPanel() {}; +}; + +int +main (void) +{ + + const char* p_UserData = static_cast(0) + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25798: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:25801: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25804: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25807: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cpp_static_cast=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_cpp_static_cast=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +ac_main_return="return" + +fi +echo "$as_me:25825: result: $cf_cv_cpp_static_cast" >&5 +echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 + +fi + +test "$cf_cv_cpp_static_cast" = yes && +cat >>confdefs.h <<\EOF +#define CPP_HAS_STATIC_CAST 1 +EOF + + CXX_AR='$(AR)' + CXX_ARFLAGS='$(ARFLAGS)' + case "$cf_cv_system_name" in + (irix*) + if test "$GXX" != yes ; then + CXX_AR='$(CXX)' + CXX_ARFLAGS='-ar -o' + fi + ;; + (sco3.2v5*) + CXXLDFLAGS="-u main" + ;; + (solaris2*) + if test "$GXX" != yes ; then + CXX_AR='$(CXX)' + CXX_ARFLAGS='-xar -o' + fi + ;; + esac + +else + cf_cxx_library=no + cf_cv_builtin_bool=1 + + # Just because we are not configuring against C++ right now does not + # mean that a user will not want to use C++. Some distributors disable + # the C++ portion of this configuration as a shortcut (or just to avoid + # compiling the demo in the c++ directory). So we need a reasonable + # default for the 'bool' type. + # + # Caveat: since the storage of the bool type is not standardized, it + # may change. + + if test "$NCURSES_BOOL" != auto ; then + cf_cv_type_of_bool=$NCURSES_BOOL + cf_cv_header_stdbool_h=0 + else + if test "$cf_cv_header_stdbool_h" = 1 ; then + +echo "$as_me:25874: checking for bool" >&5 +echo $ECHO_N "checking for bool... $ECHO_C" >&6 +if test "${ac_cv_type_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF -#line 24064 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 25880 "configure" #include "confdefs.h" +#include #include -#include + +#if defined(__cplusplus) + +#ifdef HAVE_GXX_BUILTIN_H +#include +#elif HAVE_GPP_BUILTIN_H +#include +#elif HAVE_BUILTIN_H +#include +#endif + +#else + +#if $cf_cv_header_stdbool_h +#include +#endif + +#endif int main (void) { -bool x = false +if ((bool *) 0) + return 0; +if (sizeof (bool)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:24079: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25916: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24082: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24085: \"$ac_try\"") >&5 + echo "$as_me:25919: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25922: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24088: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_builtin_bool=1 + echo "$as_me:25925: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_bool=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_builtin_bool=0 +cat "conftest.$ac_ext" >&5 +ac_cv_type_bool=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - -fi - -if test "$cf_cv_builtin_bool" = 1 -then echo "$as_me:24101: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else echo "$as_me:24103: result: no" >&5 -echo "${ECHO_T}no" >&6 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi +echo "$as_me:25935: result: $ac_cv_type_bool" >&5 +echo "${ECHO_T}$ac_cv_type_bool" >&6 -echo "$as_me:24107: checking for size of bool" >&5 -echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 -if test "${cf_cv_type_of_bool+set}" = set; then +echo "$as_me:25938: checking size of bool" >&5 +echo $ECHO_N "checking size of bool... $ECHO_C" >&6 +if test "${ac_cv_sizeof_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - rm -f cf_test.out - if test "$cross_compiling" = yes; then - cf_cv_type_of_bool=unknown -else - cat >conftest.$ac_ext <<_ACEOF -#line 24118 "configure" + if test "$ac_cv_type_bool" = yes; then + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >"conftest.$ac_ext" <<_ACEOF +#line 25947 "configure" #include "confdefs.h" #include @@ -24139,347 +25968,292 @@ else #endif -int main(void) +int +main (void) { - FILE *fp = fopen("cf_test.out", "w"); - if (fp != 0) { - bool x = true; - if ((bool)(-x) >= 0) - fputs("unsigned ", fp); - if (sizeof(x) == sizeof(int)) fputs("int", fp); - else if (sizeof(x) == sizeof(char)) fputs("char", fp); - else if (sizeof(x) == sizeof(short))fputs("short",fp); - else if (sizeof(x) == sizeof(long)) fputs("long", fp); - fclose(fp); - } - ${cf_cv_main_return:-return}(0); +int _array_ [1 - 2 * !((sizeof (bool)) >= 0)] + ; + return 0; } - _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:24160: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25980: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24163: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:24165: \"$ac_try\"") >&5 + echo "$as_me:25983: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25986: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24168: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_type_of_bool=`cat cf_test.out` - if test -z "$cf_cv_type_of_bool"; then - cf_cv_type_of_bool=unknown - fi -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_type_of_bool=unknown -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi + echo "$as_me:25989: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +#line 25994 "configure" +#include "confdefs.h" -fi +#include +#include - rm -f cf_test.out -echo "$as_me:24186: result: $cf_cv_type_of_bool" >&5 -echo "${ECHO_T}$cf_cv_type_of_bool" >&6 -if test "$cf_cv_type_of_bool" = unknown ; then - case .$NCURSES_BOOL in - (.auto|.) NCURSES_BOOL=unsigned;; - esac - { echo "$as_me:24192: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 -echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} - cf_cv_type_of_bool=$NCURSES_BOOL -fi +#if defined(__cplusplus) -echo "$as_me:24197: checking for special defines needed for etip.h" >&5 -echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 -cf_save_CXXFLAGS="$CXXFLAGS" -cf_result="none" +#ifdef HAVE_GXX_BUILTIN_H +#include +#elif HAVE_GPP_BUILTIN_H +#include +#elif HAVE_BUILTIN_H +#include +#endif -# etip.h includes ncurses.h which includes ncurses_dll.h -# But ncurses_dll.h is generated - fix here. -test -d include || mkdir include -test -f include/ncurses_dll.h || sed -e 's/@NCURSES_WRAP_PREFIX@/'$NCURSES_WRAP_PREFIX'/g' ${srcdir}/include/ncurses_dll.h.in >include/ncurses_dll.h +#else -for cf_math in "" MATH_H -do -for cf_excp in "" MATH_EXCEPTION -do - CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -Iinclude -I${srcdir}/include" - test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" - test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" -cat >conftest.$ac_ext <<_ACEOF -#line 24215 "configure" -#include "confdefs.h" +#if $cf_cv_header_stdbool_h +#include +#endif -#include +#endif int main (void) { - +int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)] ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:24229: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:26027: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24232: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24235: \"$ac_try\"") >&5 + echo "$as_me:26030: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:26033: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24238: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - test -n "$cf_math" && cat >>confdefs.h <>confdefs.h <&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 +ac_lo=`expr "$ac_mid" + 1`; ac_mid=`expr 2 '*' "$ac_mid" + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -done -echo "$as_me:24259: result: $cf_result" >&5 -echo "${ECHO_T}$cf_result" >&6 -CXXFLAGS="$cf_save_CXXFLAGS" - -if test -n "$CXX"; then -echo "$as_me:24264: checking if $CXX accepts parameter initialization" >&5 -echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 -if test "${cf_cv_cpp_param_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + done else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +#line 26052 "configure" +#include "confdefs.h" - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_main_return=return +#include +#include - if test "$cross_compiling" = yes; then - cf_cv_cpp_param_init=unknown -else - cat >conftest.$ac_ext <<_ACEOF -#line 24281 "configure" -#include "confdefs.h" +#if defined(__cplusplus) -class TEST { -private: - int value; -public: - TEST(int x = 1); - ~TEST(); -}; +#ifdef HAVE_GXX_BUILTIN_H +#include +#elif HAVE_GPP_BUILTIN_H +#include +#elif HAVE_BUILTIN_H +#include +#endif -TEST::TEST(int x = 1) // some compilers do not like second initializer +#else + +#if $cf_cv_header_stdbool_h +#include +#endif + +#endif + +int +main (void) { - value = x; +int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)] + ; + return 0; } -int main(void) { } - _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:24300: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:26085: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24303: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:24305: \"$ac_try\"") >&5 + echo "$as_me:26088: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:26091: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24308: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cpp_param_init=yes + echo "$as_me:26094: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_cpp_param_init=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_main_return=return - + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_hi=`expr "$ac_mid" - 1`; ac_mid=`expr 2 '*' "$ac_mid"` fi -echo "$as_me:24327: result: $cf_cv_cpp_param_init" >&5 -echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + done fi -test "$cf_cv_cpp_param_init" = yes && -cat >>confdefs.h <<\EOF -#define CPP_HAS_PARAM_INIT 1 -EOF - -if test -n "$CXX"; then - -echo "$as_me:24337: checking if $CXX accepts static_cast" >&5 -echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 -if test "${cf_cv_cpp_static_cast+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +#line 26110 "configure" +#include "confdefs.h" - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_main_return=return +#include +#include - cat >conftest.$ac_ext <<_ACEOF -#line 24351 "configure" -#include "confdefs.h" +#if defined(__cplusplus) -class NCursesPanel -{ -public: - NCursesPanel(int nlines, - int ncols, - int begin_y = 0, - int begin_x = 0) - { - } - NCursesPanel(); - ~NCursesPanel(); -}; +#ifdef HAVE_GXX_BUILTIN_H +#include +#elif HAVE_GPP_BUILTIN_H +#include +#elif HAVE_BUILTIN_H +#include +#endif -template class NCursesUserPanel : public NCursesPanel -{ -public: - NCursesUserPanel (int nlines, - int ncols, - int begin_y = 0, - int begin_x = 0, - const T* p_UserData = static_cast(0)) - : NCursesPanel (nlines, ncols, begin_y, begin_x) - { - }; - NCursesUserPanel(const T* p_UserData = static_cast(0)) : NCursesPanel() - { - }; +#else - virtual ~NCursesUserPanel() {}; -}; +#if $cf_cv_header_stdbool_h +#include +#endif + +#endif int main (void) { - - const char* p_UserData = static_cast(0) +int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)] ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:24395: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:26143: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24398: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24401: \"$ac_try\"") >&5 + echo "$as_me:26146: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:26149: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24404: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cpp_static_cast=yes + echo "$as_me:26152: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_cpp_static_cast=no +cat "conftest.$ac_ext" >&5 +ac_lo=`expr "$ac_mid" + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext - - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_main_return=return +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +done +ac_cv_sizeof_bool=$ac_lo +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:26165: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 26170 "configure" +#include "confdefs.h" -fi -echo "$as_me:24422: result: $cf_cv_cpp_static_cast" >&5 -echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 +#include +#include -fi +#if defined(__cplusplus) -test "$cf_cv_cpp_static_cast" = yes && -cat >>confdefs.h <<\EOF -#define CPP_HAS_STATIC_CAST 1 -EOF +#ifdef HAVE_GXX_BUILTIN_H +#include +#elif HAVE_GPP_BUILTIN_H +#include +#elif HAVE_BUILTIN_H +#include +#endif - CXX_AR='$(AR)' - CXX_ARFLAGS='$(ARFLAGS)' - case $cf_cv_system_name in - (irix*) - if test "$GXX" != yes ; then - CXX_AR='$(CXX)' - CXX_ARFLAGS='-ar -o' - fi - ;; - (sco3.2v5*) - CXXLDFLAGS="-u main" - ;; - (solaris2*) - if test "$GXX" != yes ; then - CXX_AR='$(CXX)' - CXX_ARFLAGS='-xar -o' - fi - ;; - esac +#else -else - cf_cxx_library=no - cf_cv_builtin_bool=1 +#if $cf_cv_header_stdbool_h +#include +#endif - # Just because we are not configuring against C++ right now does not - # mean that a user will not want to use C++. Some distributors disable - # the C++ portion of this configuration as a shortcut (or just to avoid - # compiling the demo in the c++ directory). So we need a reasonable - # default for the 'bool' type. - # - # Caveat: since the storage of the bool type is not standardized, it - # may change. +#endif - if test "$NCURSES_BOOL" != auto ; then - cf_cv_type_of_bool=$NCURSES_BOOL - cf_cv_header_stdbool_h=0 - else - if test "$cf_cv_header_stdbool_h" = 1 ; then +int +main (void) +{ +FILE *f = fopen ("conftest.val", "w"); +if (!f) + $ac_main_return (1); +fprintf (f, "%ld", (long)(sizeof (bool))); +fclose (f); + ; + return 0; +} +_ACEOF +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:26207: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:26210: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:26212: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:26215: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_bool=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" +fi +fi +rm -f conftest.val +else + ac_cv_sizeof_bool=0 +fi +fi +echo "$as_me:26231: result: $ac_cv_sizeof_bool" >&5 +echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 +cat >>confdefs.h <&5 -echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 +echo "$as_me:26237: checking for type of bool" >&5 +echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 if test "${cf_cv_type_of_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else rm -f cf_test.out if test "$cross_compiling" = yes; then - cf_cv_type_of_bool=unknown + + case x$ac_cv_sizeof_bool in + (x1) cf_cv_type_of_bool="unsigned char";; + (x2) cf_cv_type_of_bool="unsigned short";; + (x4) cf_cv_type_of_bool="unsigned int";; + (x8) cf_cv_type_of_bool="unsigned long";; + (*) cf_cv_type_of_bool=unknown;; + esac + else - cat >conftest.$ac_ext <<_ACEOF -#line 24482 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 26256 "configure" #include "confdefs.h" #include @@ -24520,17 +26294,17 @@ int main(void) } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:24524: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:26298: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24527: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:24529: \"$ac_try\"") >&5 + echo "$as_me:26301: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:26303: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24532: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:26306: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_type_of_bool=`cat cf_test.out` if test -z "$cf_cv_type_of_bool"; then cf_cv_type_of_bool=unknown @@ -24538,34 +26312,34 @@ if { (eval echo "$as_me:24524: \"$ac_link\"") >&5 else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_type_of_bool=unknown fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi + rm -f cf_test.out fi - - rm -f cf_test.out -echo "$as_me:24550: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:26323: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + if test "$cf_cv_type_of_bool" = unknown ; then case .$NCURSES_BOOL in (.auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:24556: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:26330: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} cf_cv_type_of_bool=$NCURSES_BOOL fi else - echo "$as_me:24562: checking for fallback type of bool" >&5 + echo "$as_me:26336: checking for fallback type of bool" >&5 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 case "$host_cpu" in (i?86) cf_cv_type_of_bool=char ;; (*) cf_cv_type_of_bool=int ;; esac - echo "$as_me:24568: result: $cf_cv_type_of_bool" >&5 + echo "$as_me:26342: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 fi fi @@ -24577,11 +26351,11 @@ fi # specify the type of bool in a configure-script option and postpone # integration with the C++ compiler provided that the types are compatible. USE_CXX_BOOL=1 -if test $cf_cv_cc_bool_type = 1 +if test "$cf_cv_cc_bool_type" = 1 then # oops: C has a bool. Unlikely, but C++ could differ. USE_CXX_BOOL=0 -elif test $cf_cv_builtin_bool = 0 +elif test "$cf_cv_builtin_bool" = 0 then # C++ has no bool USE_CXX_BOOL=0 @@ -24594,7 +26368,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then if test "$cf_with_ada" != "no" ; then if test "$with_libtool" != "no"; then - { echo "$as_me:24597: WARNING: libtool does not support Ada - disabling feature" >&5 + { echo "$as_me:26371: WARNING: libtool does not support Ada - disabling feature" >&5 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} cf_with_ada=no fi @@ -24611,7 +26385,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./- unset cf_TEMP_gnat # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. set dummy $cf_prog_gnat; ac_word=$2 -echo "$as_me:24614: checking for $ac_word" >&5 +echo "$as_me:26388: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24628,7 +26402,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" - echo "$as_me:24631: found $ac_dir/$ac_word" >&5 + echo "$as_me:26405: found $ac_dir/$ac_word" >&5 break fi done @@ -24640,20 +26414,20 @@ fi cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat if test -n "$cf_TEMP_gnat"; then - echo "$as_me:24643: result: $cf_TEMP_gnat" >&5 + echo "$as_me:26417: result: $cf_TEMP_gnat" >&5 echo "${ECHO_T}$cf_TEMP_gnat" >&6 else - echo "$as_me:24646: result: no" >&5 + echo "$as_me:26420: result: no" >&5 echo "${ECHO_T}no" >&6 fi - eval cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat + eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat" if test "x$cf_TEMP_gnat" != xno; then unset cf_cv_gnat_version unset cf_TEMP_gnat -echo "$as_me:24656: checking for $cf_prog_gnat version" >&5 +echo "$as_me:26430: checking for $cf_prog_gnat version" >&5 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 if test "${cf_cv_gnat_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24664,13 +26438,13 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` fi -echo "$as_me:24667: result: $cf_cv_gnat_version" >&5 +echo "$as_me:26441: result: $cf_cv_gnat_version" >&5 echo "${ECHO_T}$cf_cv_gnat_version" >&6 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version fi - eval cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat + eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat" unset cf_TEMP_gnat unset cf_cv_gnat_version @@ -24686,21 +26460,21 @@ else # gprconfig is newer than gnatmake; we can continue... cf_ada_config="##" else - rm -rf conftest* *~conftest* + rm -rf ./conftest* ./*~conftest* if mkdir conftest.src then cf_ada_config="" cd conftest.src for cf_gprconfig in Ada C do - echo "$as_me:24696: checking for gprconfig name for $cf_gprconfig" >&5 + echo "$as_me:26470: checking for gprconfig name for $cf_gprconfig" >&5 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 - if test $cf_gprconfig = C + if test "$cf_gprconfig" = C then for cf_gprconfig_param in \ - $cf_gprconfig,,,,GNATGCC \ - $cf_gprconfig,,,,GCC \ - $cf_gprconfig + "$cf_gprconfig,,,,GNATGCC" \ + "$cf_gprconfig,,,,GCC" \ + "$cf_gprconfig" do cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` test -n "$cf_gprconfig_value" && break @@ -24711,24 +26485,24 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 fi if test -n "$cf_gprconfig_value" then - eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value - echo "$as_me:24715: result: $cf_gprconfig_value" >&5 + eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" + echo "$as_me:26489: result: $cf_gprconfig_value" >&5 echo "${ECHO_T}$cf_gprconfig_value" >&6 else - echo "$as_me:24718: result: missing" >&5 + echo "$as_me:26492: result: missing" >&5 echo "${ECHO_T}missing" >&6 cf_ada_config="#" break fi done cd .. - rm -rf conftest* *~conftest* + rm -rf ./conftest* ./*~conftest* fi fi if test "x$cf_ada_config" != "x#" then -echo "$as_me:24731: checking for gnat version" >&5 +echo "$as_me:26505: checking for gnat version" >&5 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 if test "${cf_cv_gnat_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24739,16 +26513,16 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` fi -echo "$as_me:24742: result: $cf_cv_gnat_version" >&5 +echo "$as_me:26516: result: $cf_cv_gnat_version" >&5 echo "${ECHO_T}$cf_cv_gnat_version" >&6 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no -case $cf_cv_gnat_version in -(3.1[1-9]*|3.[2-9]*|[4-9].*|20[0-9][0-9]|[1-9][0-9].*) +case "$cf_cv_gnat_version" in +(3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) cf_cv_prog_gnat_correct=yes ;; (*) - { echo "$as_me:24751: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:26525: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} cf_cv_prog_gnat_correct=no ;; @@ -24756,7 +26530,7 @@ esac # Extract the first word of "m4", so it can be a program name with args. set dummy m4; ac_word=$2 -echo "$as_me:24759: checking for $ac_word" >&5 +echo "$as_me:26533: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_M4_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24771,7 +26545,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_M4_exists="yes" -echo "$as_me:24774: found $ac_dir/$ac_word" >&5 +echo "$as_me:26548: found $ac_dir/$ac_word" >&5 break done @@ -24780,23 +26554,23 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:24783: result: $M4_exists" >&5 + echo "$as_me:26557: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:24786: result: no" >&5 + echo "$as_me:26560: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$ac_cv_prog_M4_exists" = no; then cf_cv_prog_gnat_correct=no - { echo "$as_me:24792: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + { echo "$as_me:26566: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:24796: checking if GNAT works" >&5 + echo "$as_me:26570: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 -rm -rf conftest* *~conftest* +rm -rf ./conftest* ./*~conftest* cat >>conftest.ads <&5 2>&1 ) ; then +if ( "$cf_ada_make" $ADAFLAGS conftest 1>&5 2>&1 ) ; then if ( ./conftest 1>&5 2>&1 ) ; then cf_cv_prog_gnat_correct=yes else @@ -24819,9 +26593,9 @@ if ( $cf_ada_make $ADAFLAGS conftest 1>&5 2>&1 ) ; then else cf_cv_prog_gnat_correct=no fi -rm -rf conftest* *~conftest* +rm -rf ./conftest* ./*~conftest* - echo "$as_me:24824: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:26598: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi else @@ -24833,7 +26607,7 @@ fi ADAFLAGS="$ADAFLAGS -gnatpn" - echo "$as_me:24836: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:26610: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -24850,10 +26624,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:24853: result: $ADAFLAGS" >&5 + echo "$as_me:26627: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:24856: checking if GNATPREP supports -T option" >&5 +echo "$as_me:26630: checking if GNATPREP supports -T option" >&5 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 if test "${cf_cv_gnatprep_opt_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24863,21 +26637,21 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:24866: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:26640: result: $cf_cv_gnatprep_opt_t" >&5 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" -echo "$as_me:24870: checking if GNAT supports generics" >&5 +echo "$as_me:26644: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 -case $cf_cv_gnat_version in -(3.[1-9]*|[4-9].*) +case "$cf_cv_gnat_version" in +(3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) cf_gnat_generics=yes ;; (*) cf_gnat_generics=no ;; esac -echo "$as_me:24880: result: $cf_gnat_generics" >&5 +echo "$as_me:26654: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -24889,13 +26663,13 @@ else cf_generic_objects= fi -echo "$as_me:24892: checking if GNAT supports SIGINT" >&5 +echo "$as_me:26666: checking if GNAT supports SIGINT" >&5 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 if test "${cf_cv_gnat_sigint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -rm -rf conftest* *~conftest* +rm -rf ./conftest* ./*~conftest* cat >>conftest.ads <&5 2>&1 ) ; then +if ( "$cf_ada_make" $ADAFLAGS conftest 1>&5 2>&1 ) ; then cf_cv_gnat_sigint=yes else cf_cv_gnat_sigint=no fi -rm -rf conftest* *~conftest* +rm -rf ./conftest* ./*~conftest* fi -echo "$as_me:24940: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:26714: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 -if test $cf_cv_gnat_sigint = yes ; then +if test "$cf_cv_gnat_sigint" = yes ; then USE_GNAT_SIGINT="" else USE_GNAT_SIGINT="#" @@ -24950,21 +26724,21 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:24953: checking if GNAT supports project files" >&5 +echo "$as_me:26727: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 -case $cf_cv_gnat_version in +case "$cf_cv_gnat_version" in (3.[0-9]*) ;; (*) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (cygwin*|msys*) ;; (*) - rm -rf conftest* *~conftest* + rm -rf ./conftest* ./*~conftest* if mkdir conftest.src conftest.bin conftest.lib then cd conftest.src - rm -rf conftest* *~conftest* + rm -rf ./conftest* ./*~conftest* cat >>library.gpr <&5 2>&1 ) ; then cf_gnat_projects=yes @@ -25008,30 +26782,42 @@ CF_EOF then cf_gnat_libraries=yes fi - rm -rf conftest* *~conftest* + rm -rf ./conftest* ./*~conftest* ;; esac ;; esac -echo "$as_me:25016: result: $cf_gnat_projects" >&5 +echo "$as_me:26790: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 fi # enable_gnat_projects -if test $cf_gnat_projects = yes +if test "$cf_gnat_projects" = yes then - echo "$as_me:25022: checking if GNAT supports libraries" >&5 + echo "$as_me:26796: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:25024: result: $cf_gnat_libraries" >&5 + echo "$as_me:26798: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi +USE_OLD_MAKERULES="" +USE_GNAT_PROJECTS="#" +USE_GNAT_MAKE_GPR="#" +USE_GNAT_GPRBUILD="#" + if test "$cf_gnat_projects" = yes then USE_OLD_MAKERULES="#" USE_GNAT_PROJECTS="" -else - USE_OLD_MAKERULES="" - USE_GNAT_PROJECTS="#" + if test "$cf_cv_VERSION_GPRBUILD" != no + then + USE_GNAT_GPRBUILD="" + elif test "$cf_cv_VERSION_GNATMAKE" != no + then + USE_GNAT_MAKE_GPR="" + else + { echo "$as_me:26818: WARNING: use old makefile rules since tools are missing" >&5 +echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} + fi fi if test "$cf_gnat_libraries" = yes @@ -25041,7 +26827,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:25044: checking for ada-compiler" >&5 +echo "$as_me:26830: checking for ada-compiler" >&5 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 # Check whether --with-ada-compiler or --without-ada-compiler was given. @@ -25052,12 +26838,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:25055: result: $cf_ada_compiler" >&5 +echo "$as_me:26841: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:25060: checking for ada-include" >&5 +echo "$as_me:26846: checking for ada-include" >&5 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 # Check whether --with-ada-include or --without-ada-include was given. @@ -25081,19 +26867,19 @@ case ".$withval" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval withval="$withval" case ".$withval" in (.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:25096: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:26882: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -25102,10 +26888,10 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:25105: result: $ADA_INCLUDE" >&5 +echo "$as_me:26891: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:25108: checking for ada-objects" >&5 +echo "$as_me:26894: checking for ada-objects" >&5 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 # Check whether --with-ada-objects or --without-ada-objects was given. @@ -25129,19 +26915,19 @@ case ".$withval" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval withval="$withval" case ".$withval" in (.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:25144: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:26930: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -25150,10 +26936,10 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:25153: result: $ADA_OBJECTS" >&5 +echo "$as_me:26939: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:25156: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:26942: checking if an Ada95 shared-library should be built" >&5 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. @@ -25163,14 +26949,14 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:25166: result: $with_ada_sharedlib" >&5 +echo "$as_me:26952: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 if test "x$with_ada_sharedlib" != xno then if test "x$cf_gnat_projects" != xyes then - { echo "$as_me:25173: WARNING: disabling shared-library since GNAT projects are not supported" >&5 + { echo "$as_me:26959: WARNING: disabling shared-library since GNAT projects are not supported" >&5 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} with_ada_sharedlib=no fi @@ -25190,7 +26976,7 @@ fi # allow the Ada binding to be renamed -echo "$as_me:25193: checking for ada-libname" >&5 +echo "$as_me:26979: checking for ada-libname" >&5 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 # Check whether --with-ada-libname or --without-ada-libname was given. @@ -25206,7 +26992,7 @@ case "x$ADA_LIBNAME" in ;; esac -echo "$as_me:25209: result: $ADA_LIBNAME" >&5 +echo "$as_me:26995: result: $ADA_LIBNAME" >&5 echo "${ECHO_T}$ADA_LIBNAME" >&6 fi @@ -25217,13 +27003,13 @@ fi # do this "late" to avoid conflict with header-checks if test "x$with_widec" = xyes ; then - echo "$as_me:25220: checking for wchar_t" >&5 + echo "$as_me:27006: checking for wchar_t" >&5 echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 if test "${ac_cv_type_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 25226 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 27012 "configure" #include "confdefs.h" $ac_includes_default int @@ -25237,30 +27023,30 @@ if (sizeof (wchar_t)) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:25241: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:27027: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25244: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25247: \"$ac_try\"") >&5 + echo "$as_me:27030: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:27033: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25250: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:27036: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_type_wchar_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_type_wchar_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:25260: result: $ac_cv_type_wchar_t" >&5 +echo "$as_me:27046: result: $ac_cv_type_wchar_t" >&5 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 -echo "$as_me:25263: checking size of wchar_t" >&5 +echo "$as_me:27049: checking size of wchar_t" >&5 echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 if test "${ac_cv_sizeof_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -25268,8 +27054,8 @@ else if test "$ac_cv_type_wchar_t" = yes; then if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -#line 25272 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 27058 "configure" #include "confdefs.h" $ac_includes_default int @@ -25280,22 +27066,22 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)] return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:25284: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:27070: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25287: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25290: \"$ac_try\"") >&5 + echo "$as_me:27073: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:27076: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25293: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:27079: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 25298 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 27084 "configure" #include "confdefs.h" $ac_includes_default int @@ -25306,33 +27092,33 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:25310: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:27096: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25313: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25316: \"$ac_try\"") >&5 + echo "$as_me:27099: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:27102: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25319: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:27105: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` +cat "conftest.$ac_ext" >&5 +ac_lo=`expr "$ac_mid" + 1`; ac_mid=`expr 2 '*' "$ac_mid" + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 25335 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 27121 "configure" #include "confdefs.h" $ac_includes_default int @@ -25343,33 +27129,33 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)] return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:25347: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:27133: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25350: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25353: \"$ac_try\"") >&5 + echo "$as_me:27136: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:27139: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25356: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:27142: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` +cat "conftest.$ac_ext" >&5 +ac_hi=`expr "$ac_mid" - 1`; ac_mid=`expr 2 '*' "$ac_mid"` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -#line 25372 "configure" + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +#line 27158 "configure" #include "confdefs.h" $ac_includes_default int @@ -25380,35 +27166,35 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:25384: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:27170: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25387: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25390: \"$ac_try\"") >&5 + echo "$as_me:27173: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:27176: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25393: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:27179: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` +cat "conftest.$ac_ext" >&5 +ac_lo=`expr "$ac_mid" + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done ac_cv_sizeof_wchar_t=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:25406: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:27192: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else - cat >conftest.$ac_ext <<_ACEOF -#line 25411 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 27197 "configure" #include "confdefs.h" $ac_includes_default int @@ -25417,30 +27203,30 @@ main (void) FILE *f = fopen ("conftest.val", "w"); if (!f) $ac_main_return (1); -fprintf (f, "%d", (sizeof (wchar_t))); +fprintf (f, "%ld", (long)(sizeof (wchar_t))); fclose (f); ; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:25427: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:27213: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25430: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:25432: \"$ac_try\"") >&5 + echo "$as_me:27216: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:27218: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25435: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:27221: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_sizeof_wchar_t=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi rm -f conftest.val @@ -25448,7 +27234,7 @@ else ac_cv_sizeof_wchar_t=0 fi fi -echo "$as_me:25451: result: $ac_cv_sizeof_wchar_t" >&5 +echo "$as_me:27237: result: $ac_cv_sizeof_wchar_t" >&5 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 cat >>confdefs.h <&6 -echo "${as_me:-configure}:25464: testing test failed (assume 2) ..." 1>&5 +echo "${as_me:-configure}:27250: testing test failed (assume 2) ..." 1>&5 sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp mv confdefs.tmp confdefs.h @@ -25479,7 +27265,7 @@ fi ### chooses to split module lists into libraries. ### ### (see CF_LIB_RULES). -echo "$as_me:25482: checking for library subsets" >&5 +echo "$as_me:27268: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -25507,21 +27293,33 @@ LIB_SUBSETS="${LIB_SUBSETS}base" # base library (so it resides in base). if test "$with_term_driver" != no ; then LIB_SUBSETS="${LIB_SUBSETS}+port_drivers" - case $cf_cv_system_name in + case "$cf_cv_system_name" in (*mingw32*|*mingw64*) - LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32con" + if test "x$with_exp_win32" = xyes ; then + LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32" + else + LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32con" + fi CPPFLAGS="$CPPFLAGS -DUSE_WIN32CON_DRIVER" ;; (*) LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo" ;; esac +elif test "x$with_exp_win32" = xyes ; then + case "$cf_cv_system_name" in + (*mingw32*|*mingw64*) + LIB_SUBSETS="${LIB_SUBSETS}+port_win32" + ;; + (*) + ;; + esac fi test "x$with_widec" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" -echo "$as_me:25524: result: $LIB_SUBSETS" >&5 +echo "$as_me:27322: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -25552,7 +27350,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:25555: checking default library suffix" >&5 +echo "$as_me:27353: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -25563,10 +27361,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 (shared) DFT_ARG_SUFFIX='' ;; esac test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" -echo "$as_me:25566: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:27364: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:25569: checking default library-dependency suffix" >&5 +echo "$as_me:27367: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -25575,7 +27373,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; (Xdebug) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (*-msvc*) DFT_LIB_SUFFIX='_g.lib' ;; @@ -25586,7 +27384,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; (Xprofile) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (*-msvc*) DFT_LIB_SUFFIX='_p.lib' ;; @@ -25597,7 +27395,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; (Xshared) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (aix[5-7]*) DFT_LIB_SUFFIX='.so' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX @@ -25615,7 +27413,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; (hpux*) - case $target in + case "$target" in (ia64*) DFT_LIB_SUFFIX='.so' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX @@ -25633,7 +27431,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 esac ;; (*) - case $target in + case "$target" in (*-msvc*) DFT_LIB_SUFFIX='.lib' ;; @@ -25649,10 +27447,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" fi -echo "$as_me:25652: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:27450: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:25655: checking default object directory" >&5 +echo "$as_me:27453: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -25661,18 +27459,18 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 (debug) DFT_OBJ_SUBDIR='obj_g' ;; (profile) DFT_OBJ_SUBDIR='obj_p' ;; (shared) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (cygwin|msys) DFT_OBJ_SUBDIR='objects' ;; (*) DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:25671: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:27469: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 if test "x$cf_with_cxx" = xyes ; then -echo "$as_me:25675: checking c++ library-dependency suffix" >&5 +echo "$as_me:27473: checking c++ library-dependency suffix" >&5 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 if test "$with_libtool" != "no"; then # libtool thinks it can make c++ shared libraries (perhaps only g++) @@ -25689,7 +27487,7 @@ else CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; (Xdebug) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (*-msvc*) CXX_LIB_SUFFIX='_g.lib' ;; @@ -25700,7 +27498,7 @@ else CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; (Xprofile) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (*-msvc*) CXX_LIB_SUFFIX='_p.lib' ;; @@ -25711,7 +27509,7 @@ else CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; (Xshared) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (aix[5-7]*) CXX_LIB_SUFFIX='.so' CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX @@ -25729,7 +27527,7 @@ else CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; (hpux*) - case $target in + case "$target" in (ia64*) CXX_LIB_SUFFIX='.so' CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX @@ -25747,7 +27545,7 @@ else esac ;; (*) - case $target in + case "$target" in (*-msvc*) CXX_LIB_SUFFIX='.lib' ;; @@ -25765,15 +27563,15 @@ else fi fi -echo "$as_me:25768: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:27566: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi # do not want -ldl in build except as needed for -lncurses dependency if test "x$with_dlsym" = xyes ; then -if test $DFT_LWR_MODEL = shared || \ - test $DFT_LWR_MODEL = libtool ; then +if test "$DFT_LWR_MODEL" = shared || \ + test "$DFT_LWR_MODEL" = libtool ; then # remove dl library from $LIBS LIBS=`echo "$LIBS" | sed -e 's/-ldl[ ]//g' -e 's/-ldl$//'` @@ -25804,9 +27602,9 @@ if test "$with_ticlib" != no ; then if test "x$with_ticlib" != xyes ; then TICS_NAME=$with_ticlib - TICS_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${USE_LIB_SUFFIX}//"`" - TICS_ARG_SUFFIX="${with_ticlib}`echo ${USE_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`" - TICS_DEP_SUFFIX="${with_ticlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`" + TICS_SUFFIX="`echo "${DFT_LIB_SUFFIX}" |sed -e "s/^${USE_LIB_SUFFIX}//"`" + TICS_ARG_SUFFIX="${with_ticlib}`echo "${USE_ARG_SUFFIX}" |sed -e "s/^${LIB_SUFFIX}//"`" + TICS_DEP_SUFFIX="${with_ticlib}`echo "${DFT_DEP_SUFFIX}" |sed -e "s/^${LIB_SUFFIX}//"`" TICS_LIB_SUFFIX="${with_ticlib}" else TICS_SUFFIX=${DFT_LIB_SUFFIX} @@ -25826,9 +27624,9 @@ if test "$with_termlib" != no ; then if test "x$with_termlib" != xyes ; then TINFO_NAME=$with_termlib - TINFO_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${USE_LIB_SUFFIX}//"`" - TINFO_ARG_SUFFIX="${with_termlib}`echo ${USE_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`" - TINFO_DEP_SUFFIX="${with_termlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`" + TINFO_SUFFIX="`echo "${DFT_LIB_SUFFIX}" |sed -e "s/^${USE_LIB_SUFFIX}//"`" + TINFO_ARG_SUFFIX="${with_termlib}`echo "${USE_ARG_SUFFIX}" |sed -e "s/^${LIB_SUFFIX}//"`" + TINFO_DEP_SUFFIX="${with_termlib}`echo "${DFT_DEP_SUFFIX}" |sed -e "s/^${LIB_SUFFIX}//"`" TINFO_LIB_SUFFIX="${with_termlib}" else TINFO_SUFFIX=${DFT_LIB_SUFFIX} @@ -25876,7 +27674,7 @@ else fi if test "$DFT_LWR_MODEL" = shared ; then - case $cf_cv_system_name in + case "$cf_cv_system_name" in (cygwin*|msys*) # "lib" files have ".dll.a" suffix, "cyg"or "msys-" files have ".dll" TINFO_SUFFIX=.dll @@ -25898,11 +27696,11 @@ fi # needed for Ada95 TINFO_LDFLAGS2=`echo "$TINFO_LDFLAGS" | sed -e 's,-L\.\./,-L../../,'` -case $DFT_LWR_MODEL in +case "$DFT_LWR_MODEL" in (normal|debug|profile) if test "$GCC" = yes ; then - case $cf_cv_system_name in + case "$cf_cv_system_name" in (OS/2*|os2*|aix[4]*|solaris2.1[0-9]|darwin*) LDFLAGS_STATIC= LDFLAGS_SHARED= @@ -25913,7 +27711,7 @@ if test "$GCC" = yes ; then ;; esac else - case $cf_cv_system_name in + case "$cf_cv_system_name" in (aix[4-7]*) # from ld manpage LDFLAGS_STATIC=-bstatic LDFLAGS_SHARED=-bdynamic @@ -25941,20 +27739,20 @@ fi if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" then - echo "$as_me:25944: checking if linker supports switching between static/dynamic" >&5 + echo "$as_me:27742: checking if linker supports switching between static/dynamic" >&5 echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 rm -f libconftest.a cat >conftest.$ac_ext < int cf_ldflags_static(FILE *fp) { return fflush(fp); } EOF - if { (eval echo "$as_me:25953: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:27751: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25956: \$? = $ac_status" >&5 - (exit $ac_status); } ; then + echo "$as_me:27754: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null fi @@ -25963,11 +27761,11 @@ EOF cf_save_LIBS="$LIBS" LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 25967 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 27765 "configure" #include "confdefs.h" -#line 25970 "configure" +#line 27768 "configure" #include int cf_ldflags_static(FILE *fp); @@ -25981,21 +27779,21 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:25985: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:27783: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25988: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:25991: \"$ac_try\"") >&5 + echo "$as_me:27786: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:27789: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25994: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:27792: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then # some linkers simply ignore the -dynamic - case x`file conftest$ac_exeext 2>/dev/null` in + case x`file "conftest$ac_exeext" 2>/dev/null` in (*static*) cf_ldflags_static=no ;; @@ -26006,18 +27804,18 @@ if { (eval echo "$as_me:25985: \"$ac_link\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_ldflags_static=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" rm -f libconftest.* LIBS="$cf_save_LIBS" - echo "$as_me:26017: result: $cf_ldflags_static" >&5 + echo "$as_me:27815: result: $cf_ldflags_static" >&5 echo "${ECHO_T}$cf_ldflags_static" >&6 - if test $cf_ldflags_static != yes + if test "$cf_ldflags_static" != yes then LDFLAGS_STATIC= LDFLAGS_SHARED= @@ -26030,17 +27828,17 @@ fi ;; esac -echo "$as_me:26033: checking where we will install curses.h" >&5 +echo "$as_me:27831: checking where we will install curses.h" >&5 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 includesubdir= if test "$with_overwrite" = no && \ - ( test "x$includedir" = 'x${prefix}/include' || \ - test "x$includedir" = "x${prefix}/include" ) + { test "x$includedir" = 'x${prefix}/include' || \ + test "x$includedir" = "x${prefix}/include"; } then includesubdir="/ncurses${USE_LIB_SUFFIX}" fi -echo "$as_me:26043: result: ${includedir}${includesubdir}" >&5 +echo "$as_me:27841: result: ${includedir}${includesubdir}" >&5 echo "${ECHO_T}${includedir}${includesubdir}" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -26048,12 +27846,23 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6 if test "$with_overwrite" != no ; then if test "$NCURSES_LIBUTF8" = 1 ; then NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' - { echo "$as_me:26051: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:27849: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} fi fi WITH_OVERWRITE=$with_overwrite +### At least on MinGW a shared library build without libtool +### requires adding the additional libs to the link list. +case "$cf_cv_system_name" in +(*mingw32*|*mingw64*) + if test "$DFT_LWR_MODEL" != "libtool"; then + SHLIB_LIST="$SHLIB_LIST ${LIBS}" + fi + ;; +*) ;; +esac + # used to separate tack out of the tree NCURSES_TREE= @@ -26065,7 +27874,7 @@ EOF # pkgsrc uses these -echo "$as_me:26068: checking for desired basename for form library" >&5 +echo "$as_me:27877: checking for desired basename for form library" >&5 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6 # Check whether --with-form-libname or --without-form-libname was given. @@ -26085,10 +27894,10 @@ case "x$FORM_NAME" in ;; esac -echo "$as_me:26088: result: $FORM_NAME" >&5 +echo "$as_me:27897: result: $FORM_NAME" >&5 echo "${ECHO_T}$FORM_NAME" >&6 -echo "$as_me:26091: checking for desired basename for menu library" >&5 +echo "$as_me:27900: checking for desired basename for menu library" >&5 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6 # Check whether --with-menu-libname or --without-menu-libname was given. @@ -26108,10 +27917,10 @@ case "x$MENU_NAME" in ;; esac -echo "$as_me:26111: result: $MENU_NAME" >&5 +echo "$as_me:27920: result: $MENU_NAME" >&5 echo "${ECHO_T}$MENU_NAME" >&6 -echo "$as_me:26114: checking for desired basename for panel library" >&5 +echo "$as_me:27923: checking for desired basename for panel library" >&5 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6 # Check whether --with-panel-libname or --without-panel-libname was given. @@ -26131,10 +27940,10 @@ case "x$PANEL_NAME" in ;; esac -echo "$as_me:26134: result: $PANEL_NAME" >&5 +echo "$as_me:27943: result: $PANEL_NAME" >&5 echo "${ECHO_T}$PANEL_NAME" >&6 -echo "$as_me:26137: checking for desired basename for cxx library" >&5 +echo "$as_me:27946: checking for desired basename for cxx library" >&5 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6 # Check whether --with-cxx-libname or --without-cxx-libname was given. @@ -26154,13 +27963,13 @@ case "x$CXX_NAME" in ;; esac -echo "$as_me:26157: result: $CXX_NAME" >&5 +echo "$as_me:27966: result: $CXX_NAME" >&5 echo "${ECHO_T}$CXX_NAME" >&6 ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:26163: checking for src modules" >&5 +echo "$as_me:27972: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -26178,11 +27987,11 @@ PC_MODULES_TO_MAKE="ncurses${USE_ARG_SUFFIX}" cf_cv_src_modules= for cf_dir in $modules_to_build do - if test -f $srcdir/$cf_dir/modules; then + if test -f "$srcdir/$cf_dir/modules" ; then # We may/may not have tack in the distribution, though the # makefile is. - if test $cf_dir = tack ; then + if test "$cf_dir" = tack ; then if test "x$cf_with_tack" != "xyes"; then continue fi @@ -26198,9 +28007,9 @@ do # well. These are header files that are the same name as their # directory. Ncurses is the only library that does not follow # that pattern. - if test $cf_dir = tack ; then + if test "$cf_dir" = tack ; then continue - elif test -f $srcdir/${cf_dir}/${cf_dir}.h; then + elif test -f "$srcdir/${cf_dir}/${cf_dir}.h" ; then cf_have_include=`echo "$cf_dir" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -26214,7 +28023,7 @@ EOF cf_map_lib_basename=`echo "$cf_dir" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -eval TEST_ROOT=\$${cf_map_lib_basename}_NAME +eval TEST_ROOT="\$${cf_map_lib_basename}_NAME" TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${TEST_ROOT}${DFT_DEP_SUFFIX} $TEST_DEPS" TEST_DEP2="${LIB_2ND}/${LIB_PREFIX}${TEST_ROOT}${DFT_DEP_SUFFIX} $TEST_DEP2" @@ -26229,7 +28038,7 @@ eval TEST_ROOT=\$${cf_map_lib_basename}_NAME fi fi done -echo "$as_me:26232: result: $cf_cv_src_modules" >&5 +echo "$as_me:28041: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -26258,7 +28067,7 @@ test "x$with_termlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TINFO_A test "x$with_ticlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TICS_ARG_SUFFIX" ADA_SUBDIRS= -if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = xyes && test -f $srcdir/Ada95/Makefile.in; then +if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = xyes && test -f "$srcdir/Ada95/Makefile.in" ; then SRC_SUBDIRS="$SRC_SUBDIRS Ada95" ADA_SUBDIRS="gen src" if test "x$cf_with_tests" != "xno" ; then @@ -26296,7 +28105,7 @@ do (debug) cf_subdir='obj_g' ;; (profile) cf_subdir='obj_p' ;; (shared) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (cygwin|msys) cf_subdir='objects' ;; (*) @@ -26306,13 +28115,13 @@ do for cf_item2 in $DIRS_TO_MAKE do - test $cf_item2 = $cf_subdir && break + test "$cf_item2" = "$cf_subdir" && break done test ".$cf_item2" != ".$cf_subdir" && DIRS_TO_MAKE="$DIRS_TO_MAKE $cf_subdir" done for cf_dir in $DIRS_TO_MAKE do - test ! -d $cf_dir && mkdir $cf_dir + test ! -d "$cf_dir" && mkdir "$cf_dir" done # symbols that differ when compiling Ada95 by itself. @@ -26328,106 +28137,6 @@ cat >>confdefs.h <&6 -echo "${as_me:-configure}:26493: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 +echo "${as_me:-configure}:28202: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` @@ -26501,7 +28210,7 @@ esac # Help to automatically enable the extended curses features when using either # the *-config or the ".pc" files by adding defines. -echo "$as_me:26504: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 +echo "$as_me:28213: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6 PKG_CFLAGS= for cf_loop1 in $CPPFLAGS_after_XOPEN @@ -26517,7 +28226,7 @@ do done test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" done -echo "$as_me:26520: result: $PKG_CFLAGS" >&5 +echo "$as_me:28229: result: $PKG_CFLAGS" >&5 echo "${ECHO_T}$PKG_CFLAGS" >&6 # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. @@ -26578,7 +28287,7 @@ then cf_filter_syms=$cf_dft_filter_syms test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_version" 1>&6 -echo "${as_me:-configure}:26581: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 +echo "${as_me:-configure}:28290: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 fi @@ -26590,7 +28299,7 @@ fi test "x$cf_with_trace" = xyes && NCURSES_INLINE= UNALTERED_SYMS=`echo "$RESULTING_SYMS" | sed -e 's/\\$/\\\\$/g'` -if test $cf_filter_syms = yes +if test "$cf_filter_syms" = yes then RESULTING_SYMS=resulting.map fi @@ -26605,7 +28314,7 @@ fi # This is used for the *-config script and *.pc data files. -echo "$as_me:26608: checking for linker search path" >&5 +echo "$as_me:28317: checking for linker search path" >&5 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6 if test "${cf_cv_ld_searchpath+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26619,14 +28328,14 @@ cf_pathlist=`ld --verbose 2>/dev/null | grep SEARCH_DIR | sed -e 's,SEARCH_DIR[( # The -NX options tell newer versions of Linux ldconfig to not attempt to # update the cache, which makes it run faster. test -z "$cf_pathlist" && \ - cf_pathlist=`ldconfig -NX -v 2>/dev/null | sed -e '/^[ ]/d' -e 's/:$//' | sort -u` + cf_pathlist=`(ldconfig -NX -v) 2>/dev/null | sed -e '/^[ ]/d' -e 's/:$//' | sort -u` test -z "$cf_pathlist" && - cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e '/^[ ]/d' -e 's/:$//p' | sort -u` + cf_pathlist=`(ldconfig -v) 2>/dev/null | sed -n -e '/^[ ]/d' -e 's/:$//p' | sort -u` # This works with OpenBSD 6.5, which lists only filenames test -z "$cf_pathlist" && - cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e 's,^Adding \(.*\)/.*$,\1,p' | sort -u` + cf_pathlist=`(ldconfig -v) 2>/dev/null | sed -n -e 's,^Adding \(.*\)/.*$,\1,p' | sort -u` if test -z "$cf_pathlist" then @@ -26641,13 +28350,38 @@ fi if test -z "$cf_pathlist" then - # Solaris is hardcoded - if test -d /opt/SUNWspro/lib + # Solaris is "SunOS" + if test -f /usr/bin/isainfo && test "x`uname -s`" = xSunOS then - cf_pathlist="/opt/SUNWspro/lib /usr/ccs/lib /usr/lib" - elif test -d /usr/ccs/lib + case x`(isainfo -b)` in + (x64) + cf_pathlist="$cf_pathlist /lib/64 /usr/lib/64" + ;; + (x32) + test -d /usr/ccs/lib && cf_pathlist="$cf_pathlist /usr/ccs/lib" + cf_pathlist="$cf_pathlist /lib /usr/lib" + ;; + (*) + { echo "$as_me:28365: WARNING: problem with Solaris architecture" >&5 +echo "$as_me: WARNING: problem with Solaris architecture" >&2;} + ;; + esac + fi +fi + +if test -z "$cf_pathlist" +then + # HP-UX + if test x"`uname -s`" = xHP-UX then - cf_pathlist="/usr/ccs/lib /usr/lib" + case x`getconf LONG_BIT` in + (x64) + cf_pathlist="/usr/lib/hpux64" + ;; + (x*) + cf_pathlist="/usr/lib/hpux32" + ;; + esac fi fi @@ -26669,7 +28403,7 @@ done test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib fi -echo "$as_me:26672: result: $cf_cv_ld_searchpath" >&5 +echo "$as_me:28406: result: $cf_cv_ld_searchpath" >&5 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'` @@ -26756,12 +28490,12 @@ fi DEFS=-DHAVE_CONFIG_H -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:26762: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:28496: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL # Generated automatically by configure. # Run this file to recreate the current configuration. @@ -26772,9 +28506,11 @@ debug=false SHELL=\${CONFIG_SHELL-$SHELL} ac_cs_invocation="\$0 \$@" +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>"$CONFIG_STATUS" <<\_ACEOF # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh @@ -26814,9 +28550,9 @@ as_executable_p="test -f" # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset + as_unset="unset" else - as_unset=false + as_unset="false" fi # NLS nuisances. @@ -26844,22 +28580,22 @@ _ACEOF # Files that config.status was made for. if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS + echo "config_files=\"$ac_config_files\"" >>"$CONFIG_STATUS" fi if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS + echo "config_headers=\"$ac_config_headers\"" >>"$CONFIG_STATUS" fi if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS + echo "config_links=\"$ac_config_links\"" >>"$CONFIG_STATUS" fi if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS + echo "config_commands=\"$ac_config_commands\"" >>"$CONFIG_STATUS" fi -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the @@ -26888,21 +28624,22 @@ $config_commands Report bugs to ." EOF -cat >>$CONFIG_STATUS <>"$CONFIG_STATUS" <>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. ac_need_defaults=: @@ -26925,17 +28662,17 @@ do case $1 in # Handling of the options. EOF -cat >>$CONFIG_STATUS <>"$CONFIG_STATUS" <>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:26938: error: ambiguous option: $1 + { { echo "$as_me:28675: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -26954,7 +28691,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:26957: error: unrecognized option: $1 + -*) { { echo "$as_me:28694: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -26973,18 +28710,18 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20200111, executed with +This file was extended by $as_me 2.52.20210509, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS CONFIG_COMMANDS = $CONFIG_COMMANDS - > $ac_cs_invocation + > "$ac_cs_invocation" on `(hostname || uname -n) 2>/dev/null | sed 1q` _ACEOF EOF -cat >>$CONFIG_STATUS <>"$CONFIG_STATUS" <>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in @@ -27077,7 +28816,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; - *) { { echo "$as_me:27080: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:28819: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -27087,7 +28826,7 @@ done # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then +if "$ac_need_defaults"; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands @@ -27117,7 +28856,7 @@ $debug || EOF -cat >>$CONFIG_STATUS <>"$CONFIG_STATUS" <>$CONFIG_STATUS <<\EOF + cat >>"$CONFIG_STATUS" <<\EOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. ac_max_sed_lines=48 @@ -27456,8 +29207,8 @@ EOF ac_end=$ac_max_sed_lines # Line after last line for current file. ac_more_lines=: ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then + while "$ac_more_lines"; do + if test "$ac_beg" -gt 1; then sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag else sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag @@ -27474,15 +29225,15 @@ EOF # It is possible to make a multiline substitution using escaped newlines. # Ensure that we do not split the substitution between script fragments. ac_BEG=$ac_end - ac_END=`expr $ac_end + $ac_max_sed_lines` + ac_END=`expr "$ac_end" + "$ac_max_sed_lines"` sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next if test -s $tmp/subs.next; then grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit if test ! -s $tmp/subs.edit; then grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit if test ! -s $tmp/subs.edit; then - if test $ac_beg -gt 1; then - ac_end=`expr $ac_end - 1` + if test "$ac_beg" -gt 1; then + ac_end=`expr "$ac_end" - 1` continue fi fi @@ -27494,9 +29245,9 @@ EOF else ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" fi - ac_sed_frag=`expr $ac_sed_frag + 1` + ac_sed_frag=`expr "$ac_sed_frag" + 1` ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` + ac_end=`expr "$ac_end" + "$ac_max_sed_lines"` fi done if test -z "$ac_sed_cmds"; then @@ -27505,10 +29256,10 @@ EOF fi # test -n "$CONFIG_FILES" EOF -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in + case "$ac_file" in - | *:- | *:-:* ) # input from stdin cat >$tmp/stdin ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` @@ -27554,19 +29305,19 @@ done; } ac_dir_suffix= ac_dots= fi - case $srcdir in + case "$srcdir" in .) ac_srcdir=. if test -z "$ac_dots"; then ac_top_srcdir=. else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` + ac_top_srcdir=`echo "$ac_dots" | sed 's,/$,,'` fi ;; [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; + ac_srcdir="$srcdir$ac_dir_suffix"; + ac_top_srcdir="$srcdir" ;; *) # Relative path. - ac_srcdir=$ac_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; + ac_srcdir="$ac_dots$srcdir$ac_dir_suffix" + ac_top_srcdir="$ac_dots$srcdir" ;; esac case $INSTALL in @@ -27575,7 +29326,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:27578: creating $ac_file" >&5 + { echo "$as_me:29329: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -27593,7 +29344,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:27596: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:29347: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -27603,35 +29354,35 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $f elif test -f "$srcdir/$f"; then # Source tree - echo $srcdir/$f + echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:27609: error: cannot find input file: $f" >&5 + { { echo "$as_me:29360: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } EOF -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF ac_warn_datarootdir=no if test x"$ac_file" != x-; then for ac_item in $ac_file_inputs do - ac_seen=`grep '@\(datadir\|mandir\|infodir\)@' $ac_item` + ac_seen=`grep '@\(datadir\|mandir\|infodir\)@' "$ac_item"` if test -n "$ac_seen"; then - ac_used=`grep '@datarootdir@' $ac_item` + ac_used=`grep '@datarootdir@' "$ac_item"` if test -z "$ac_used"; then - { echo "$as_me:27625: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:29376: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} ac_warn_datarootdir=yes fi fi - ac_seen=`grep '${datarootdir}' $ac_item` + ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:27634: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:29385: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -27645,11 +29396,11 @@ if test "x$ac_warn_datarootdir" = xyes; then fi EOF -cat >>$CONFIG_STATUS <>"$CONFIG_STATUS" <>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;t t @@ -27659,27 +29410,27 @@ s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin if test x"$ac_file" != x-; then - cp $tmp/out $ac_file + cp "$tmp/out" "$ac_file" for ac_name in prefix exec_prefix datarootdir do - ac_seen=`fgrep -n '${'$ac_name'[:=].*}' $ac_file` + ac_seen=`${FGREP-fgrep} -n '${'$ac_name'[:=].*}' "$ac_file"` if test -n "$ac_seen"; then - ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` + ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:27671: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:29422: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} fi fi done - egrep -n '@[a-z_][a-z_0-9]+@' $ac_file >$tmp/out - egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out + ${EGREP-egrep} -n '@[a-z_][a-z_0-9]+@' "$ac_file" >$tmp/out + ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:27682: WARNING: Some variables may not be substituted: + { echo "$as_me:29433: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -27691,7 +29442,7 @@ $ac_seen" >&2;} done EOF -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF # # CONFIG_HEADER section. @@ -27718,7 +29469,7 @@ ac_uD=',;t' for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in + case "$ac_file" in - | *:- | *:-:* ) # input from stdin cat >$tmp/stdin ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` @@ -27728,7 +29479,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:27731: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:29482: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -27739,7 +29490,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:27742: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:29493: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -27749,10 +29500,10 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $f elif test -f "$srcdir/$f"; then # Source tree - echo $srcdir/$f + echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:27755: error: cannot find input file: $f" >&5 + { { echo "$as_me:29506: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -27772,14 +29523,14 @@ cat confdefs.h | uniq >conftest.vals # the size of here documents, and old seds have small limits too. rm -f conftest.tail -echo ' rm -f conftest.frag' >> $CONFIG_STATUS +echo ' rm -f conftest.frag' >> "$CONFIG_STATUS" while grep . conftest.vals >/dev/null do # Write chunks of a limited-size here document to conftest.frag. - echo ' cat >> conftest.frag <> $CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.vals | sed -e 's/#ifdef.*/#if 0/' >> $CONFIG_STATUS - echo 'CEOF' >> $CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail + echo ' cat >> conftest.frag <> "$CONFIG_STATUS" + sed "${ac_max_here_lines}q" conftest.vals | sed -e 's/#ifdef.*/#if 0/' >> "$CONFIG_STATUS" + echo 'CEOF' >> "$CONFIG_STATUS" + sed "1,${ac_max_here_lines}d" conftest.vals > conftest.tail rm -f conftest.vals mv conftest.tail conftest.vals done @@ -27795,9 +29546,9 @@ sed -f conftest.edit $tmp/in > $tmp/out rm -f $tmp/in mv $tmp/out $tmp/in rm -f conftest.edit conftest.frag -' >> $CONFIG_STATUS +' >> "$CONFIG_STATUS" -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated automatically by config.status. */ @@ -27809,8 +29560,8 @@ cat >>$CONFIG_STATUS <<\EOF cat $tmp/in >>$tmp/config.h rm -f $tmp/in if test x"$ac_file" != x-; then - if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:27813: $ac_file is unchanged" >&5 + if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then + { echo "$as_me:29564: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -27842,8 +29593,8 @@ for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do done; } fi - rm -f $ac_file - mv $tmp/config.h $ac_file + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" fi else cat $tmp/config.h @@ -27851,7 +29602,7 @@ done; } fi done EOF -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF # # CONFIG_COMMANDS section. # @@ -27859,16 +29610,16 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue ac_dest=`echo "$ac_file" | sed 's,:.*,,'` ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - case $ac_dest in + case "$ac_dest" in default ) if test "x$cf_with_tests" != xno ; then for cf_dir in test do - if test ! -d $srcdir/$cf_dir; then + if test ! -d "$srcdir/$cf_dir" ; then continue - elif test -f $srcdir/$cf_dir/programs; then - $AWK -f $srcdir/test/mk-test.awk INSTALL=no ECHO_LINK="$ECHO_LD" $srcdir/$cf_dir/programs >>$cf_dir/Makefile + elif test -f "$srcdir/$cf_dir/programs" ; then + $AWK -f "$srcdir/test/mk-test.awk" INSTALL=no ECHO_LINK="$ECHO_LD" "$srcdir/$cf_dir/programs" >>$cf_dir/Makefile fi done @@ -27876,7 +29627,7 @@ fi cf_prefix=$LIB_PREFIX -case $cf_cv_shlib_version in +case "$cf_cv_shlib_version" in (cygdll|msysdll|mingw|msvcdll) TINFO_NAME=$TINFO_ARG_SUFFIX TINFO_SUFFIX=.dll @@ -27884,27 +29635,27 @@ case $cf_cv_shlib_version in esac if test -n "$TINFO_SUFFIX" ; then - case $TINFO_SUFFIX in + case "$TINFO_SUFFIX" in (tw*) TINFO_NAME="${TINFO_NAME}tw${EXTRA_SUFFIX}" - TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^tw'$EXTRA_SUFFIX'//'` + TINFO_SUFFIX=`echo "$TINFO_SUFFIX" | sed 's/^tw'$EXTRA_SUFFIX'//'` ;; (t*) TINFO_NAME="${TINFO_NAME}t${EXTRA_SUFFIX}" - TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^t'$EXTRA_SUFFIX'//'` + TINFO_SUFFIX=`echo "$TINFO_SUFFIX" | sed 's/^t'$EXTRA_SUFFIX'//'` ;; (w*) TINFO_NAME="${TINFO_NAME}w${EXTRA_SUFFIX}" - TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^w'$EXTRA_SUFFIX'//'` + TINFO_SUFFIX=`echo "$TINFO_SUFFIX" | sed 's/^w'$EXTRA_SUFFIX'//'` ;; esac fi for cf_dir in $SRC_SUBDIRS do - if test ! -d $srcdir/$cf_dir ; then + if test ! -d "$srcdir/$cf_dir" ; then continue - elif test -f $srcdir/$cf_dir/modules; then + elif test -f "$srcdir/$cf_dir/modules" ; then SHARED_LIB= Libs_To_Make= @@ -27934,7 +29685,7 @@ resulting.map: $UNALTERED_SYMS $cf_awk_program \ { if ( last != "" && ( skip == 0 || \$\$0 !~ /}/ ) ) { print last; }\ skip = 0; last = \$\$0; } \ -END { print last; }' < $UNALTERED_SYMS >\$@ +END { print last; }' < "$UNALTERED_SYMS" >\$@ distclean:: rm -f resulting.map @@ -27950,7 +29701,7 @@ CF_EOF cf_depsuf=$cf_suffix ;; (Xdebug) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (*-msvc*) cf_suffix='_g.lib' ;; @@ -27961,7 +29712,7 @@ CF_EOF cf_depsuf=$cf_suffix ;; (Xprofile) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (*-msvc*) cf_suffix='_p.lib' ;; @@ -27972,7 +29723,7 @@ CF_EOF cf_depsuf=$cf_suffix ;; (Xshared) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (aix[5-7]*) cf_suffix='.so' cf_depsuf=$cf_suffix @@ -27990,7 +29741,7 @@ CF_EOF cf_depsuf=$cf_suffix ;; (hpux*) - case $target in + case "$target" in (ia64*) cf_suffix='.so' cf_depsuf=$cf_suffix @@ -28008,7 +29759,7 @@ CF_EOF esac ;; (*) - case $target in + case "$target" in (*-msvc*) cf_suffix='.lib' ;; @@ -28030,17 +29781,17 @@ CF_EOF cf_map_lib_basename=`echo "cxx" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -eval cf_libname=\$${cf_map_lib_basename}_NAME +eval cf_libname="\$${cf_map_lib_basename}_NAME" else cf_map_lib_basename=`echo "$cf_dir" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -eval cf_libname=\$${cf_map_lib_basename}_NAME +eval cf_libname="\$${cf_map_lib_basename}_NAME" fi test -z "$cf_libname" && cf_libname="$cf_dir" - if test $cf_item = shared ; then + if test "$cf_item" = shared ; then if test -n "${LIB_SUFFIX}" then cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${USE_LIB_SUFFIX}"'//'` @@ -28081,7 +29832,7 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME # cygwin needs import library, and has unique naming convention # use autodetected ${cf_prefix} for import lib and static lib, but # use 'cyg' prefix for shared lib. - case $cf_cv_shlib_version in + case "$cf_cv_shlib_version" in (cygdll) cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` cf_add_lib="../lib/cyg${cf_libname}${cf_cygsuf}" @@ -28112,7 +29863,7 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME Libs_To_Make="$Libs_To_Make $cf_add_lib" done - if test $cf_dir = ncurses ; then + if test "$cf_dir" = ncurses ; then cf_subsets="$LIB_SUBSETS" cf_r_parts="$cf_subsets" cf_liblist="$Libs_To_Make" @@ -28123,12 +29874,12 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME cf_r_parts=`echo "$cf_r_parts" |sed -e 's/^[^ ]* //'` if test "$cf_l_parts" != "$cf_r_parts" ; then cf_add_lib= - case $cf_l_parts in + case "$cf_l_parts" in (*termlib*) - cf_add_lib=`echo $cf_liblist |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g` + cf_add_lib=`echo "$cf_liblist" |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g` ;; (*ticlib*) - cf_add_lib=`echo $cf_liblist |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g` + cf_add_lib=`echo "$cf_liblist" |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g` ;; (*) break @@ -28145,12 +29896,12 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib.* //'` fi - if test $cf_dir = c++; then + if test "$cf_dir" = c++; then if test "x$with_shared_cxx" != xyes && test -n "$cf_shared_suffix"; then cf_list= for cf_item in $Libs_To_Make do - case $cf_item in + case "$cf_item" in (*.a) ;; (*) @@ -28174,12 +29925,12 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME sed -e "s%@Libs_To_Make@%$Libs_To_Make%" \ -e "s%@SHARED_LIB@%$SHARED_LIB%" \ - $cf_dir/Makefile >$cf_dir/Makefile.out - mv $cf_dir/Makefile.out $cf_dir/Makefile + "$cf_dir/Makefile" >$cf_dir/Makefile.out + mv "$cf_dir/Makefile.out" "$cf_dir/Makefile" - $AWK -f $srcdir/mk-0th.awk \ + $AWK -f "$srcdir/mk-0th.awk" \ libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" ticlib="$TICS_LIB_SUFFIX" termlib="$TINFO_LIB_SUFFIX" \ - $srcdir/$cf_dir/modules >>$cf_dir/Makefile + "$srcdir/$cf_dir/modules" >>$cf_dir/Makefile for cf_subset in $cf_subsets do @@ -28193,11 +29944,11 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ CXX_MODEL=$cf_ITEM if test "$CXX_MODEL" = SHARED; then - case $cf_cv_shlib_version in + case "$cf_cv_shlib_version" in (cygdll|msysdll|mingw|msvcdll) test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 -echo "${as_me:-configure}:28200: testing overriding CXX_MODEL to SHARED ..." 1>&5 +echo "${as_me:-configure}:29951: testing overriding CXX_MODEL to SHARED ..." 1>&5 with_shared_cxx=yes ;; @@ -28213,7 +29964,7 @@ echo "${as_me:-configure}:28200: testing overriding CXX_MODEL to SHARED ..." 1>& cf_depsuf=$cf_suffix ;; (Xdebug) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (*-msvc*) cf_suffix='_g.lib' ;; @@ -28224,7 +29975,7 @@ echo "${as_me:-configure}:28200: testing overriding CXX_MODEL to SHARED ..." 1>& cf_depsuf=$cf_suffix ;; (Xprofile) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (*-msvc*) cf_suffix='_p.lib' ;; @@ -28235,7 +29986,7 @@ echo "${as_me:-configure}:28200: testing overriding CXX_MODEL to SHARED ..." 1>& cf_depsuf=$cf_suffix ;; (Xshared) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (aix[5-7]*) cf_suffix='.so' cf_depsuf=$cf_suffix @@ -28253,7 +30004,7 @@ echo "${as_me:-configure}:28200: testing overriding CXX_MODEL to SHARED ..." 1>& cf_depsuf=$cf_suffix ;; (hpux*) - case $target in + case "$target" in (ia64*) cf_suffix='.so' cf_depsuf=$cf_suffix @@ -28271,7 +30022,7 @@ echo "${as_me:-configure}:28200: testing overriding CXX_MODEL to SHARED ..." 1>& esac ;; (*) - case $target in + case "$target" in (*-msvc*) cf_suffix='.lib' ;; @@ -28294,7 +30045,7 @@ echo "${as_me:-configure}:28200: testing overriding CXX_MODEL to SHARED ..." 1>& (debug) cf_subdir='obj_g' ;; (profile) cf_subdir='obj_p' ;; (shared) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (cygwin|msys) cf_subdir='objects' ;; (*) @@ -28304,8 +30055,8 @@ echo "${as_me:-configure}:28200: testing overriding CXX_MODEL to SHARED ..." 1>& # Test for case where we build libtinfo with a different name. cf_libname=$cf_dir - if test $cf_dir = ncurses ; then - case $cf_subset in + if test "$cf_dir" = ncurses ; then + case "$cf_subset" in (*base*) cf_libname=${cf_libname}$USE_LIB_SUFFIX ;; @@ -28316,24 +30067,24 @@ echo "${as_me:-configure}:28200: testing overriding CXX_MODEL to SHARED ..." 1>& cf_libname=$TICS_LIB_SUFFIX ;; esac - elif test $cf_dir = c++ ; then + elif test "$cf_dir" = c++ ; then cf_map_lib_basename=`echo "cxx" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -eval cf_libname=\$${cf_map_lib_basename}_NAME +eval cf_libname="\$${cf_map_lib_basename}_NAME" cf_libname=${cf_libname}$USE_LIB_SUFFIX else cf_map_lib_basename=`echo "$cf_dir" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -eval cf_libname=\$${cf_map_lib_basename}_NAME +eval cf_libname="\$${cf_map_lib_basename}_NAME" cf_libname=${cf_libname}$USE_LIB_SUFFIX fi if test -n "${USE_ARG_SUFFIX}" ; then # undo $USE_LIB_SUFFIX add-on in CF_LIB_SUFFIX - cf_suffix=`echo $cf_suffix |sed -e "s%^${USE_LIB_SUFFIX}%%"` + cf_suffix=`echo "$cf_suffix" |sed -e "s%^${USE_LIB_SUFFIX}%%"` fi # These dependencies really are for development, not @@ -28345,9 +30096,9 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME cf_reldir="\${srcdir}" fi - if test -f $srcdir/$cf_dir/$cf_dir.priv.h; then + if test -f "$srcdir/$cf_dir/$cf_dir.priv.h" ; then cf_depend="$cf_depend $cf_reldir/$cf_dir.priv.h" - elif test -f $srcdir/$cf_dir/curses.priv.h; then + elif test -f "$srcdir/$cf_dir/curses.priv.h" ; then cf_depend="$cf_depend $cf_reldir/curses.priv.h" fi @@ -28355,32 +30106,32 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME old_cf_suffix="$cf_suffix" if test "$cf_cv_shlib_version_infix" = yes ; then if test -n "$USE_LIB_SUFFIX" ; then - case $USE_LIB_SUFFIX in + case "$USE_LIB_SUFFIX" in (tw*) - cf_libname=`echo $cf_libname | sed 's/tw'$EXTRA_SUFFIX'$//'` - cf_suffix=`echo $cf_suffix | sed 's/^tw'$EXTRA_SUFFIX'//'` + cf_libname=`echo "$cf_libname" | sed 's/tw'$EXTRA_SUFFIX'$//'` + cf_suffix=`echo "$cf_suffix" | sed 's/^tw'$EXTRA_SUFFIX'//'` cf_dir_suffix=tw$EXTRA_SUFFIX ;; (t*) - cf_libname=`echo $cf_libname | sed 's/t'$EXTRA_SUFFIX'$//'` - cf_suffix=`echo $cf_suffix | sed 's/^t'$EXTRA_SUFFIX'//'` + cf_libname=`echo "$cf_libname" | sed 's/t'$EXTRA_SUFFIX'$//'` + cf_suffix=`echo "$cf_suffix" | sed 's/^t'$EXTRA_SUFFIX'//'` cf_dir_suffix=t$EXTRA_SUFFIX ;; (w*) - cf_libname=`echo $cf_libname | sed 's/w'$EXTRA_SUFFIX'$//'` - cf_suffix=`echo $cf_suffix | sed 's/^w'$EXTRA_SUFFIX'//'` + cf_libname=`echo "$cf_libname" | sed 's/w'$EXTRA_SUFFIX'$//'` + cf_suffix=`echo "$cf_suffix" | sed 's/^w'$EXTRA_SUFFIX'//'` cf_dir_suffix=w$EXTRA_SUFFIX ;; (*) - cf_libname=`echo $cf_libname | sed 's/'$EXTRA_SUFFIX'$//'` - cf_suffix=`echo $cf_suffix | sed 's/^'$EXTRA_SUFFIX'//'` + cf_libname=`echo "$cf_libname" | sed 's/'$EXTRA_SUFFIX'$//'` + cf_suffix=`echo "$cf_suffix" | sed 's/^'$EXTRA_SUFFIX'//'` cf_dir_suffix=$EXTRA_SUFFIX ;; esac fi fi - $AWK -f $srcdir/mk-1st.awk \ + $AWK -f "$srcdir/mk-1st.awk" \ name=${cf_libname}${cf_dir_suffix} \ traces=$LIB_TRACING \ MODEL=$cf_ITEM \ @@ -28404,16 +30155,16 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME depend="$cf_depend" \ host="$host" \ libtool_version="$LIBTOOL_VERSION" \ - $srcdir/$cf_dir/modules >>$cf_dir/Makefile + "$srcdir/$cf_dir/modules" >>$cf_dir/Makefile cf_suffix="$old_cf_suffix" for cf_subdir2 in $cf_subdirs lib do - test $cf_subdir = $cf_subdir2 && break + test "$cf_subdir" = "$cf_subdir2" && break done test "${cf_subset}.${cf_subdir2}" != "${cf_subset}.${cf_subdir}" && \ - $AWK -f $srcdir/mk-2nd.awk \ + $AWK -f "$srcdir/mk-2nd.awk" \ name=$cf_dir \ traces=$LIB_TRACING \ MODEL=$cf_ITEM \ @@ -28423,43 +30174,43 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME echo=$WITH_ECHO \ crenames=$cf_cv_prog_CC_c_o \ cxxrenames=$cf_cv_prog_CXX_c_o \ - $srcdir/$cf_dir/modules >>$cf_dir/Makefile + "$srcdir/$cf_dir/modules" >>$cf_dir/Makefile cf_subdirs="$cf_subdirs $cf_subdir" done done fi - echo ' cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} $@' >>Makefile + echo ' ( cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} $@ )' >>Makefile done for cf_dir in $SRC_SUBDIRS do - if test ! -d $srcdir/$cf_dir ; then + if test ! -d "$srcdir/$cf_dir" ; then continue fi - if test -f $cf_dir/Makefile ; then + if test -f "$cf_dir/Makefile" ; then case "$cf_dir" in (Ada95) echo 'libs \' >> Makefile echo 'install.libs \' >> Makefile echo 'uninstall.libs ::' >> Makefile - echo ' cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} $@' >> Makefile + echo ' ( cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} $@ )' >> Makefile ;; esac fi - if test -f $srcdir/$cf_dir/modules; then + if test -f "$srcdir/$cf_dir/modules" ; then echo >> Makefile - if test -f $srcdir/$cf_dir/headers; then + if test -f "$srcdir/$cf_dir/headers" ; then cat >> Makefile <> Makefile -fi + cat >> Makefile <> Makefile <> Makefile <> Makefile <> Makefile <> Makefile <>headers.sh </<\$END\/\$NAME>/" >> \$TMPSED @@ -28571,7 +30322,7 @@ else case \$DST in (/*/include/*) END=\`basename \$DST\` - for i in \`cat \$REF/../*/headers |fgrep -v "#"\` + for i in \`cat \$REF/../*/headers |${FGREP-fgrep} -v "#"\` do NAME=\`basename \$i\` if test "\$NAME" = "curses.h" @@ -28593,7 +30344,7 @@ rm -f \$TMPSRC sed -f \$TMPSED \$SRC > \$TMPSRC NAME=\`basename \$SRC\` CF_EOF -if test $WITH_CURSES_H != yes; then +if test "$WITH_CURSES_H" != yes; then cat >>headers.sh <>$cf_dir/Makefile + "$srcdir/$cf_dir/headers" >>$cf_dir/Makefile fi - if test -f $srcdir/$cf_dir/modules; then + if test -f "$srcdir/$cf_dir/modules" ; then if test "$cf_dir" != "c++" ; then cat >>$cf_dir/Makefile <<"CF_EOF" depend : ${AUTO_SRC} @@ -28635,7 +30386,7 @@ done if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then if test -z "$USE_OLD_MAKERULES" ; then - $AWK -f $srcdir/Ada95/mk-1st.awk <$srcdir/Ada95/src/modules >>Ada95/src/Makefile + $AWK -f "$srcdir/Ada95/mk-1st.awk" <"$srcdir/Ada95/src/modules" >>Ada95/src/Makefile fi fi ;; @@ -28643,11 +30394,11 @@ fi done EOF -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF { (exit 0); exit 0; } EOF -chmod +x $CONFIG_STATUS +chmod +x "$CONFIG_STATUS" ac_clean_files=$ac_clean_files_save # configure is writing to config.log, and then calls config.status. @@ -28661,10 +30412,10 @@ ac_clean_files=$ac_clean_files_save if test "$no_create" != yes; then ac_cs_success=: exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL "$CONFIG_STATUS" || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + "$ac_cs_success" || { (exit 1); exit 1; } fi ${MAKE:-make} preinstall