X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=configure;h=a28bff7b49846ead4aec8a994af1e3f966a08b75;hp=d30acbfe7a65fce5bf5704b61e95b4a08cb315f4;hb=0dc2639645b2cc67271247405709161df24a771f;hpb=85b1a478852e6473f6f698af5f6fca055f43f21c diff --git a/configure b/configure index d30acbfe..a28bff7b 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Revision: 1.547 . +# From configure.in Revision: 1.582 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20120310. +# Generated by Autoconf 2.52.20121002. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -171,15 +171,16 @@ x_libraries=NONE bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +infodir='${datarootdir}/info' +mandir='${datarootdir}/man' # Identity of this package. PACKAGE_NAME= @@ -230,6 +231,13 @@ do | --da=*) datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. @@ -505,7 +513,7 @@ do done # Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ +for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \ localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` @@ -654,15 +662,16 @@ Fine tuning of the installation directories: --bindir=DIR user executables [EPREFIX/bin] --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] + --datarootdir=DIR read-only architecture-independent data [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] + --infodir=DIR info documentation [DATAROOTDIR/info] + --mandir=DIR man documentation [DATAROOTDIR/man] EOF cat <<\EOF @@ -694,12 +703,13 @@ Optional Features: --with-rel-version=XXX override derived release version --with-abi-version=XXX override derived ABI version --with-system-type=XXX test: override derived host system-type + --without-ada suppress check for Ada95, don't build demo --without-cxx do not adjust ncurses bool to match C++ --without-cxx-binding do not build C++ binding and demo - --without-ada suppress check for Ada95, don't build demo + --disable-db-install suppress install of terminal database --without-manpages suppress install of manpages - --without-progs suppress build with programs (e.g., tic) - --without-tests suppress build with test-programs + --without-progs suppress build/install with programs (e.g., tic) + --without-tests suppress build/install with test-programs --without-curses-h install curses.h as ncurses.h only --with-pkg-config{=path} enable/disable use of pkg-config --with-pkg-config-libdir=XXX use given directory for installing pc-files @@ -720,6 +730,7 @@ Options to Specify the Libraries Built/Used: --with-normal generate normal-libraries (default) --with-debug generate debug-libraries (default) --with-profile generate profile-libraries + --with-cxx-shared generate C++ shared-libraries --with-lib-prefix override library-prefix --with-termlib generate separate terminfo library --with-ticlib generate separate tic library @@ -729,6 +740,7 @@ Options to Specify the Libraries Built/Used: --enable-rpath use rpath option when generating shared libraries --disable-relink relink shared libraries during install --with-shlib-version=X Specify rel or abi version for shared libs + --disable-lib-suffixes disable library suffixes --disable-rpath-hack don't add rpath options for additional libraries Fine-Tuning Your Configuration: --disable-overwrite leave out the link to -lcurses @@ -737,7 +749,7 @@ Fine-Tuning Your Configuration: --with-hashed-db specify hashed-database library --with-fallbacks=XXX specify list of fallback terminal descriptions --without-xterm-new specify if xterm terminfo should be old version - --with-xterm-kbs=XXX specify if xterm backspace sends BS or DEL + --with-xterm-kbs=XXX specify if xterm backspace sends BS or DEL --with-terminfo-dirs=XXX specify list of terminfo directories (default: DATADIR/terminfo) --with-default-terminfo-dir=DIR default terminfo directory (default: DATADIR/terminfo) --disable-big-core assume machine has little memory @@ -800,9 +812,9 @@ Experimental Code: --disable-scroll-hints compile without scroll-hints code --enable-wgetch-events compile with experimental wgetch-events code Testing/development Options: - --disable-echo display "compiling" commands + --disable-echo do not display "compiling" commands --enable-warnings build: turn on GCC compiler warnings - --enable-string-hacks work around bogus compiler/loader warnings + --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 --with-dbmalloc test: use Conor Cahill's dbmalloc library @@ -811,11 +823,12 @@ Testing/development Options: --enable-expanded test: generate functions for certain macros --disable-macros test: use functions rather than macros --with-trace test: add trace() function to all models of ncurses + --disable-gnat-projects test: disable GNAT projects even if usable Ada95 Binding Options: --with-ada-compiler=CMD specify Ada95 compiler command (default gnatmake) --with-ada-include=DIR Ada includes are in DIR (default: PREFIX/share/ada/adainclude) --with-ada-objects=DIR Ada objects are in DIR (default: PREFIX/lib/ada/adalib) - --with-ada-sharedlib=XX build Ada95 shared-library + --with-ada-sharedlib=soname build shared-library (requires GNAT projects) Some influential environment variables: CC C compiler command @@ -888,7 +901,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.20120310. Invocation command line was +generated by GNU Autoconf 2.52.20121002. Invocation command line was $ $0 $@ @@ -1012,7 +1025,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:1015: loading site script $ac_site_file" >&5 + { echo "$as_me:1028: 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" @@ -1023,7 +1036,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:1026: loading cache $cache_file" >&5 + { echo "$as_me:1039: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1031,7 +1044,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:1034: creating cache $cache_file" >&5 + { echo "$as_me:1047: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1047,21 +1060,21 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:1050: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:1063: 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:1054: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:1067: 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:1060: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:1073: 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:1062: former value: $ac_old_val" >&5 + { echo "$as_me:1075: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:1064: current value: $ac_new_val" >&5 + { echo "$as_me:1077: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -1080,9 +1093,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if $ac_cache_corrupted; then - { echo "$as_me:1083: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1096: 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:1085: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1098: 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 @@ -1103,10 +1116,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1106: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1119: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1109: \$? = $ac_status" >&5 + echo "$as_me:1122: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -1119,7 +1132,7 @@ ac_config_headers="$ac_config_headers include/ncurses_cfg.h:include/ncurses_cfg. top_builddir=`pwd` -echo "$as_me:1122: checking for egrep" >&5 +echo "$as_me:1135: 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 @@ -1129,11 +1142,11 @@ else else ac_cv_prog_egrep='egrep' fi fi -echo "$as_me:1132: result: $ac_cv_prog_egrep" >&5 +echo "$as_me:1145: 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:1136: error: No egrep program found" >&5 +test -z "$EGREP" && { { echo "$as_me:1149: error: No egrep program found" >&5 echo "$as_me: error: No egrep program found" >&2;} { (exit 1); exit 1; }; } @@ -1143,7 +1156,7 @@ NCURSES_PATCH="`$ac_cv_prog_egrep '^NCURSES_PATCH[ ]*=' $srcdir/dist.mk | sed - cf_cv_abi_version=${NCURSES_MAJOR} cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} cf_cv_timestamp=`date` -echo "$as_me:1146: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 +echo "$as_me:1159: 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 test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0 @@ -1151,7 +1164,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:1154: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 + { echo "$as_me:1167: 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; @@ -1164,13 +1177,13 @@ if test -n "$NCURSES_MAJOR" ; then [0-9]*) #(vi ;; *) - { { echo "$as_me:1167: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 + { { echo "$as_me:1180: 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:1173: error: Release major-version value is empty" >&5 + { { echo "$as_me:1186: error: Release major-version value is empty" >&5 echo "$as_me: error: Release major-version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -1180,13 +1193,13 @@ if test -n "$NCURSES_MINOR" ; then [0-9]*) #(vi ;; *) - { { echo "$as_me:1183: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 + { { echo "$as_me:1196: 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:1189: error: Release minor-version value is empty" >&5 + { { echo "$as_me:1202: error: Release minor-version value is empty" >&5 echo "$as_me: error: Release minor-version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -1196,7 +1209,7 @@ test -z "$cf_cv_abi_version" && cf_cv_abi_version=0 # Check whether --with-abi-version or --without-abi-version was given. if test "${with_abi_version+set}" = set; then withval="$with_abi_version" - { echo "$as_me:1199: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 + { echo "$as_me:1212: 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;} cf_cv_abi_version=$withval fi; @@ -1206,13 +1219,13 @@ if test -n "$cf_cv_abi_version" ; then [0-9]*) #(vi ;; *) - { { echo "$as_me:1209: error: ABI version is not a number: $cf_cv_abi_version" >&5 + { { echo "$as_me:1222: 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:1215: error: ABI version value is empty" >&5 + { { echo "$as_me:1228: error: ABI version value is empty" >&5 echo "$as_me: error: ABI version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -1234,7 +1247,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1237: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1250: 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 @@ -1244,11 +1257,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:1247: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1260: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1251: checking build system type" >&5 +echo "$as_me:1264: 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 @@ -1257,23 +1270,23 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1260: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1273: 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:1264: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1277: 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:1269: result: $ac_cv_build" >&5 +echo "$as_me:1282: 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/'` -echo "$as_me:1276: checking host system type" >&5 +echo "$as_me:1289: 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 @@ -1282,12 +1295,12 @@ else 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:1285: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1298: 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:1290: result: $ac_cv_host" >&5 +echo "$as_me:1303: 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/'` @@ -1295,7 +1308,7 @@ 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:1298: checking target system type" >&5 + echo "$as_me:1311: 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 @@ -1304,12 +1317,12 @@ else 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:1307: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + { { echo "$as_me:1320: 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:1312: result: $ac_cv_target" >&5 +echo "$as_me:1325: 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/'` @@ -1329,7 +1342,8 @@ else system_name="`(hostname) 2>/dev/null`" fi fi -test -n "$system_name" && cat >>confdefs.h <>confdefs.h <&5 +test -n "$cf_cv_system_name" && echo "$as_me:1357: 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:1347: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1361: 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:1349: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1363: 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 @@ -1354,9 +1368,11 @@ 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:1357: WARNING: overriding system type to $withval" >&5 + { echo "$as_me:1371: WARNING: overriding system type to $withval" >&5 echo "$as_me: WARNING: overriding system type to $withval" >&2;} - cf_cv_system_name=$withval + cf_cv_system_name=$withval + host_os=$withval + fi; ### Save the given $CFLAGS to allow user-override. @@ -1364,23 +1380,23 @@ cf_user_CFLAGS="$CFLAGS" ### Default install-location -echo "$as_me:1367: checking for prefix" >&5 +echo "$as_me:1383: 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 # non-vendor systems don't have a conflict - openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu) + openbsd*|freebsd*|mirbsd*|linux*|cygwin*|msys*|k*bsd*-gnu|mingw*) prefix=/usr ;; *) prefix=$ac_default_prefix ;; esac fi -echo "$as_me:1379: result: $prefix" >&5 +echo "$as_me:1395: result: $prefix" >&5 echo "${ECHO_T}$prefix" >&6 if test "x$prefix" = "xNONE" ; then -echo "$as_me:1383: checking for default include-directory" >&5 +echo "$as_me:1399: 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 \ @@ -1403,11 +1419,26 @@ do fi test -n "$verbose" && echo " tested $cf_dir" 1>&6 done -echo "$as_me:1406: result: $includedir" >&5 +echo "$as_me:1422: result: $includedir" >&5 echo "${ECHO_T}$includedir" >&6 fi ### Checks for programs. + +# Check whether --with-ada or --without-ada was given. +if test "${with_ada+set}" = set; then + withval="$with_ada" + cf_with_ada=$withval +else + cf_with_ada=yes +fi; +if test "x$cf_with_ada" = xyes +then + cf_PROG_CC="gnatgcc gcc cc" +else + cf_PROG_CC="gcc cc" +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -1415,213 +1446,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1420: 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 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}gcc" -echo "$as_me:1435: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:1443: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:1446: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo "$as_me:1455: 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 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="gcc" -echo "$as_me:1470: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:1478: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:1481: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1494: 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 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc" -echo "$as_me:1509: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:1517: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:1520: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:1529: 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 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="cc" -echo "$as_me:1544: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:1552: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:1555: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:1568: 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 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no - 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 -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:1588: found $ac_dir/$ac_word" >&5 -break -done - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - set dummy "$ac_dir/$ac_word" ${1+"$@"} - shift - ac_cv_prog_CC="$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:1610: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:1613: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl + 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:1624: checking for $ac_word" >&5 +echo "$as_me:1453: 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 @@ -1636,7 +1465,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:1639: found $ac_dir/$ac_word" >&5 +echo "$as_me:1468: found $ac_dir/$ac_word" >&5 break done @@ -1644,10 +1473,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1647: result: $CC" >&5 + echo "$as_me:1476: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1650: result: no" >&5 + echo "$as_me:1479: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1656,11 +1485,11 @@ fi fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl + for ac_prog in $cf_PROG_CC 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:1663: checking for $ac_word" >&5 +echo "$as_me:1492: 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 @@ -1675,7 +1504,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:1678: found $ac_dir/$ac_word" >&5 +echo "$as_me:1507: found $ac_dir/$ac_word" >&5 break done @@ -1683,10 +1512,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1686: result: $ac_ct_CC" >&5 + echo "$as_me:1515: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1689: result: no" >&5 + echo "$as_me:1518: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1696,34 +1525,32 @@ done CC=$ac_ct_CC fi -fi - -test -z "$CC" && { { echo "$as_me:1701: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1528: 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:1533:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1709: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1536: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1712: \$? = $ac_status" >&5 + echo "$as_me:1539: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1714: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1541: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1717: \$? = $ac_status" >&5 + echo "$as_me:1544: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1719: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1546: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1722: \$? = $ac_status" >&5 + echo "$as_me:1549: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1726 "configure" +#line 1553 "configure" #include "confdefs.h" int @@ -1739,13 +1566,13 @@ 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:1569: 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 +if { (eval echo "$as_me:1572: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1748: \$? = $ac_status" >&5 + echo "$as_me:1575: \$? = $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 @@ -1768,34 +1595,34 @@ 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 +{ { echo "$as_me:1598: 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:1604: 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:1609: 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:1615: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1791: \$? = $ac_status" >&5 + echo "$as_me:1618: \$? = $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:1625: 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,24 +1630,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1806: result: yes" >&5 +echo "$as_me:1633: result: yes" >&5 echo "${ECHO_T}yes" >&6 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:1640: 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:1642: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1818: checking for executable suffix" >&5 +echo "$as_me:1645: 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:1647: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1823: \$? = $ac_status" >&5 + echo "$as_me:1650: \$? = $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 @@ -1836,25 +1663,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:1666: 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 +echo "$as_me:1672: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1851: checking for object suffix" >&5 +echo "$as_me:1678: 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" +#line 1684 "configure" #include "confdefs.h" int @@ -1866,10 +1693,10 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1869: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1696: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1872: \$? = $ac_status" >&5 + echo "$as_me:1699: \$? = $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 @@ -1881,24 +1708,24 @@ 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 +{ { echo "$as_me:1711: 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 fi -echo "$as_me:1891: result: $ac_cv_objext" >&5 +echo "$as_me:1718: 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:1722: 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" +#line 1728 "configure" #include "confdefs.h" int @@ -1913,16 +1740,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1916: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1743: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1919: \$? = $ac_status" >&5 + echo "$as_me:1746: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1922: \"$ac_try\"") >&5 + { (eval echo "$as_me:1749: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1925: \$? = $ac_status" >&5 + echo "$as_me:1752: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1934,19 +1761,19 @@ 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:1764: 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:1770: 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" +#line 1776 "configure" #include "confdefs.h" int @@ -1958,16 +1785,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1961: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1788: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1964: \$? = $ac_status" >&5 + echo "$as_me:1791: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1967: \"$ac_try\"") >&5 + { (eval echo "$as_me:1794: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1970: \$? = $ac_status" >&5 + echo "$as_me:1797: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1977,7 +1804,7 @@ ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1980: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1807: 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 @@ -2004,16 +1831,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2007: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1834: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2010: \$? = $ac_status" >&5 + echo "$as_me:1837: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2013: \"$ac_try\"") >&5 + { (eval echo "$as_me:1840: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2016: \$? = $ac_status" >&5 + echo "$as_me:1843: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -2025,7 +1852,7 @@ if { (eval echo "$as_me:2007: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 2028 "configure" +#line 1855 "configure" #include "confdefs.h" #include $ac_declaration @@ -2038,16 +1865,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2041: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1868: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2044: \$? = $ac_status" >&5 + echo "$as_me:1871: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2047: \"$ac_try\"") >&5 + { (eval echo "$as_me:1874: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2050: \$? = $ac_status" >&5 + echo "$as_me:1877: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2057,7 +1884,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2060 "configure" +#line 1887 "configure" #include "confdefs.h" $ac_declaration int @@ -2069,16 +1896,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2072: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1899: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2075: \$? = $ac_status" >&5 + echo "$as_me:1902: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2078: \"$ac_try\"") >&5 + { (eval echo "$as_me:1905: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2081: \$? = $ac_status" >&5 + echo "$as_me:1908: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -2108,338 +1935,115 @@ ac_main_return=return GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:2111: checking version of $CC" >&5 + echo "$as_me:1938: 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/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + 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:1942: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 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_compiler_gnu=$ac_cv_c_compiler_gnu -ac_main_return=return -echo "$as_me:2125: 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 - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then +echo "$as_me:1946: 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 - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # 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 2146 "configure" + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line 1954 "configure" #include "confdefs.h" -#include - Syntax error +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:2151: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +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:2003: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:2157: \$? = $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 - : -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue -fi -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 2180 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:2184: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + echo "$as_me:2006: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2009: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:2190: \$? = $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 - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: + echo "$as_me:2012: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg break -fi -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 -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -echo "$as_me:2227: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # 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 2237 "configure" -#include "confdefs.h" -#include - Syntax error -_ACEOF -if { (eval echo "$as_me:2242: \"$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:2248: \$? = $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 - : -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue -fi -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 2271 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:2275: \"$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:2281: \$? = $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 - # Broken: success on invalid input. -continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break +cat conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_ext - +rm -f conftest.$ac_objext done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:2309: 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_compiler_gnu=$ac_cv_c_compiler_gnu -ac_main_return=return - -if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:2322: 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 2329 "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 - ac_cv_prog_gcc_traditional=yes -else - ac_cv_prog_gcc_traditional=no -fi -rm -rf conftest* - - if test $ac_cv_prog_gcc_traditional = no; then - cat >conftest.$ac_ext <<_ACEOF -#line 2344 "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 - ac_cv_prog_gcc_traditional=yes -fi -rm -rf conftest* - - fi -fi -echo "$as_me:2357: 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:2364: 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 -else - -cat > conftest.$ac_ext < -int main() -{ - ${cf_cv_main_return:-return}(0); -} -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 -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:2380: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2383: \$? = $ac_status" >&5 - (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:2385: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2388: \$? = $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 -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC fi -if test $cf_cv_prog_CC_c_o = yes; then - echo "$as_me:2399: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - echo "$as_me:2402: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -echo "$as_me:2406: checking for POSIXized ISC" >&5 -echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 -if test -d /etc/conf/kconfig.d && - grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 -then - echo "$as_me:2411: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - ISC=yes # If later tests want to check for ISC. -cat >>confdefs.h <<\EOF -#define _POSIX_SOURCE 1 -EOF - - if test "$GCC" = yes; then - CC="$CC -posix" - else - CC="$CC -Xp" - fi -else - echo "$as_me:2425: result: no" >&5 -echo "${ECHO_T}no" >&6 - ISC= -fi +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:2029: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:2032: 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} -# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content -# into CC. This will not help with broken scripts that wrap the compiler with -# options, but eliminates a more common category of user confusion. -echo "$as_me:2436: checking \$CC variable" >&5 +echo "$as_me:2040: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in #(vi *[\ \ ]-[IUD]*) - echo "$as_me:2440: result: broken" >&5 + echo "$as_me:2044: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2442: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2046: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_flags=`echo "$CC" | sed -e 's/^[^ ]*[ ]//'` @@ -2525,280 +2129,297 @@ fi ;; *) - echo "$as_me:2528: result: ok" >&5 + echo "$as_me:2132: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2533: checking for ${CC:-cc} option to accept ANSI C" >&5 -echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6 -if test "${cf_cv_ansi_cc+set}" = set; then +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_compiler_gnu=$ac_cv_c_compiler_gnu +ac_main_return=return +echo "$as_me:2143: 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 + CPP= +fi +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cf_cv_ansi_cc=no -cf_save_CFLAGS="$CFLAGS" -cf_save_CPPFLAGS="$CPPFLAGS" -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX -Aa -D_HPUX_SOURCE -# SVR4 -Xc -# UnixWare 1.2 (cannot use -Xc, since ANSI/POSIX clashes) -for cf_arg in "-DCC_HAS_PROTOS" \ - "" \ - -qlanglvl=ansi \ - -std1 \ - -Ae \ - "-Aa -D_HPUX_SOURCE" \ - -Xc -do - -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= - -for cf_add_cflags in $cf_arg + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes do -case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi - case $cf_add_cflags in - -D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - - if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - continue - elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - continue - fi - ;; - esac - case "$CPPFLAGS" in - *$cf_add_cflags) #(vi - ;; - *) #(vi - case $cf_add_cflags in #(vi - -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 - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" - ;; - esac - ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" - ;; - esac - ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + # Use a header file that comes with gcc, so configuring glibc + # 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 2164 "configure" +#include "confdefs.h" +#include + Syntax error +_ACEOF +if { (eval echo "$as_me:2169: \"$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:2175: \$? = $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 + : +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +#line 2198 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:2202: \"$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:2208: \$? = $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 + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac done - -if test -n "$cf_new_cflags" ; then - - CFLAGS="$CFLAGS $cf_new_cflags" +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break fi -if test -n "$cf_new_cppflags" ; then + done + ac_cv_prog_CPP=$CPP - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" fi - -if test -n "$cf_new_extra_cppflags" ; then - - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +echo "$as_me:2245: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6 +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # 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 2255 "configure" +#include "confdefs.h" +#include + Syntax error +_ACEOF +if { (eval echo "$as_me:2260: \"$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:2266: \$? = $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 + : +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + # Broken: fails on valid input. +continue fi +rm -f conftest.err conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 2637 "configure" + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +#line 2289 "configure" #include "confdefs.h" - -#ifndef CC_HAS_PROTOS -#if !defined(__STDC__) || (__STDC__ != 1) -choke me -#endif -#endif - -int -main () -{ - - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; - ; - return 0; -} +#include _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2658: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2661: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2664: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (eval echo "$as_me:2293: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:2667: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ansi_cc="$cf_arg"; break + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:2299: \$? = $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 - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + ac_cpp_err=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -CFLAGS="$cf_save_CFLAGS" -CPPFLAGS="$cf_save_CPPFLAGS" - +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + # Passes both tests. +ac_preproc_ok=: +break fi -echo "$as_me:2680: result: $cf_cv_ansi_cc" >&5 -echo "${ECHO_T}$cf_cv_ansi_cc" >&6 - -if test "$cf_cv_ansi_cc" != "no"; then -if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then - -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= - -for cf_add_cflags in $cf_cv_ansi_cc -do -case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi - case $cf_add_cflags in - -D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - - if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - continue - elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - continue - fi - ;; - esac - case "$CPPFLAGS" in - *$cf_add_cflags) #(vi - ;; - *) #(vi - case $cf_add_cflags in #(vi - -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 - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" - ;; - esac - ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" - ;; - esac - ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` +rm -f conftest.err conftest.$ac_ext - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac done - -if test -n "$cf_new_cflags" ; then - - CFLAGS="$CFLAGS $cf_new_cflags" +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:2327: error: C preprocessor \"$CPP\" fails sanity check" >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } fi -if test -n "$cf_new_cppflags" ; then +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_compiler_gnu=$ac_cv_c_compiler_gnu +ac_main_return=return - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" +if test $ac_cv_c_compiler_gnu = yes; then + echo "$as_me:2340: 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 2347 "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 + ac_cv_prog_gcc_traditional=yes +else + ac_cv_prog_gcc_traditional=no fi +rm -rf conftest* -if test -n "$cf_new_extra_cppflags" ; then + if test $ac_cv_prog_gcc_traditional = no; then + cat >conftest.$ac_ext <<_ACEOF +#line 2362 "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 + ac_cv_prog_gcc_traditional=yes +fi +rm -rf conftest* - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + fi +fi +echo "$as_me:2375: 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:2382: 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 else - cat >>confdefs.h <<\EOF -#define CC_HAS_PROTOS 1 -EOF +cat > conftest.$ac_ext < +int main() +{ + ${cf_cv_main_return:-return}(0); +} +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 -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +if { (eval echo "$as_me:2398: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2401: \$? = $ac_status" >&5 + (exit $ac_status); } && + test -f conftest2.$ac_objext && { (eval echo "$as_me:2403: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2406: \$? = $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 -fi +rm -rf conftest* -if test "$cf_cv_ansi_cc" = "no"; then - { { echo "$as_me:2773: error: Your compiler does not appear to recognize prototypes. -You have the following choices: - a. adjust your compiler options - b. get an up-to-date compiler - c. use a wrapper such as unproto" >&5 -echo "$as_me: error: Your compiler does not appear to recognize prototypes. -You have the following choices: - a. adjust your compiler options - b. get an up-to-date compiler - c. use a wrapper such as unproto" >&2;} - { (exit 1); exit 1; }; } fi - -case $cf_cv_system_name in -os2*) - CFLAGS="$CFLAGS -Zmt" - CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__" - CXXFLAGS="$CXXFLAGS -Zmt" - # autoconf's macro sets -Zexe and suffix both, which conflict:w - LDFLAGS="$LDFLAGS -Zmt -Zcrtdll" - ac_cv_exeext=.exe - ;; -esac - -PROG_EXT="$EXEEXT" - -test -n "$PROG_EXT" && cat >>confdefs.h <&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me:2420: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi if test "$cross_compiling" = yes ; then LDCONFIG=: @@ -2810,7 +2431,7 @@ dragonfly*|mirbsd*|freebsd*) #(vi *) 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:2813: checking for $ac_word" >&5 +echo "$as_me:2434: 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 @@ -2827,7 +2448,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:2830: found $ac_dir/$ac_word" >&5 + echo "$as_me:2451: found $ac_dir/$ac_word" >&5 break fi done @@ -2838,10 +2459,10 @@ fi LDCONFIG=$ac_cv_path_LDCONFIG if test -n "$LDCONFIG"; then - echo "$as_me:2841: result: $LDCONFIG" >&5 + echo "$as_me:2462: result: $LDCONFIG" >&5 echo "${ECHO_T}$LDCONFIG" >&6 else - echo "$as_me:2844: result: no" >&5 + echo "$as_me:2465: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2849,7 +2470,7 @@ fi esac fi -echo "$as_me:2852: checking if you want to ensure bool is consistent with C++" >&5 +echo "$as_me:2473: 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. @@ -2859,7 +2480,7 @@ if test "${with_cxx+set}" = set; then else cf_with_cxx=yes fi; -echo "$as_me:2862: result: $cf_with_cxx" >&5 +echo "$as_me:2483: result: $cf_with_cxx" >&5 echo "${ECHO_T}$cf_with_cxx" >&6 if test "X$cf_with_cxx" = Xno ; then CXX="" @@ -2877,7 +2498,7 @@ if test -n "$ac_tool_prefix"; then 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:2880: checking for $ac_word" >&5 +echo "$as_me:2501: 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 @@ -2892,7 +2513,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:2895: found $ac_dir/$ac_word" >&5 +echo "$as_me:2516: found $ac_dir/$ac_word" >&5 break done @@ -2900,10 +2521,10 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:2903: result: $CXX" >&5 + echo "$as_me:2524: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:2906: result: no" >&5 + echo "$as_me:2527: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2916,7 +2537,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:2919: checking for $ac_word" >&5 +echo "$as_me:2540: 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 @@ -2931,7 +2552,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:2934: found $ac_dir/$ac_word" >&5 +echo "$as_me:2555: found $ac_dir/$ac_word" >&5 break done @@ -2939,10 +2560,10 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:2942: result: $ac_ct_CXX" >&5 + echo "$as_me:2563: result: $ac_ct_CXX" >&5 echo "${ECHO_T}$ac_ct_CXX" >&6 else - echo "$as_me:2945: result: no" >&5 + echo "$as_me:2566: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2954,32 +2575,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++" fi # Provide some information about the compiler. -echo "$as_me:2957:" \ +echo "$as_me:2578:" \ "checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:2960: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:2581: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:2963: \$? = $ac_status" >&5 + echo "$as_me:2584: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:2965: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:2586: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:2968: \$? = $ac_status" >&5 + echo "$as_me:2589: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:2970: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:2591: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:2973: \$? = $ac_status" >&5 + echo "$as_me:2594: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:2976: checking whether we are using the GNU C++ compiler" >&5 +echo "$as_me:2597: 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 2982 "configure" +#line 2603 "configure" #include "confdefs.h" int @@ -2994,16 +2615,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2997: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2618: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3000: \$? = $ac_status" >&5 + echo "$as_me:2621: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3003: \"$ac_try\"") >&5 + { (eval echo "$as_me:2624: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3006: \$? = $ac_status" >&5 + echo "$as_me:2627: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -3015,19 +2636,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:3018: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "$as_me:2639: 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:3024: checking whether $CXX accepts -g" >&5 +echo "$as_me:2645: 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 3030 "configure" +#line 2651 "configure" #include "confdefs.h" int @@ -3039,16 +2660,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3042: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2663: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3045: \$? = $ac_status" >&5 + echo "$as_me:2666: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3048: \"$ac_try\"") >&5 + { (eval echo "$as_me:2669: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3051: \$? = $ac_status" >&5 + echo "$as_me:2672: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else @@ -3058,7 +2679,7 @@ ac_cv_prog_cxx_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3061: result: $ac_cv_prog_cxx_g" >&5 +echo "$as_me:2682: 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 @@ -3085,7 +2706,7 @@ for ac_declaration in \ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 3088 "configure" +#line 2709 "configure" #include "confdefs.h" #include $ac_declaration @@ -3098,16 +2719,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3101: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2722: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3104: \$? = $ac_status" >&5 + echo "$as_me:2725: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3107: \"$ac_try\"") >&5 + { (eval echo "$as_me:2728: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3110: \$? = $ac_status" >&5 + echo "$as_me:2731: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3117,7 +2738,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 3120 "configure" +#line 2741 "configure" #include "confdefs.h" $ac_declaration int @@ -3129,16 +2750,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3132: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2753: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3135: \$? = $ac_status" >&5 + echo "$as_me:2756: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3138: \"$ac_try\"") >&5 + { (eval echo "$as_me:2759: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3141: \$? = $ac_status" >&5 + echo "$as_me:2762: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -3165,7 +2786,7 @@ ac_main_return=return 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:3168: checking for $ac_word" >&5 +echo "$as_me:2789: 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 @@ -3182,7 +2803,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:3185: found $ac_dir/$ac_word" >&5 + echo "$as_me:2806: found $ac_dir/$ac_word" >&5 break fi done @@ -3193,17 +2814,17 @@ fi CXX=$ac_cv_path_CXX if test -n "$CXX"; then - echo "$as_me:3196: result: $CXX" >&5 + echo "$as_me:2817: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:3199: result: no" >&5 + echo "$as_me:2820: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi case "x$CXX" in #(vi x|xg++) - { echo "$as_me:3206: WARNING: You don't have any C++ compiler, too bad" >&5 + { echo "$as_me:2827: 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=""; ;; @@ -3212,11 +2833,11 @@ fi GXX_VERSION=none if test "$GXX" = yes; then - echo "$as_me:3215: checking version of g++" >&5 -echo $ECHO_N "checking version of g++... $ECHO_C" >&6 + echo "$as_me:2836: 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.].*//'`" test -z "$GXX_VERSION" && GXX_VERSION=unknown - echo "$as_me:3219: result: $GXX_VERSION" >&5 + echo "$as_me:2840: result: $GXX_VERSION" >&5 echo "${ECHO_T}$GXX_VERSION" >&6 fi @@ -3224,12 +2845,12 @@ case $GXX_VERSION in 1*|2.[0-6]*) # GXX=""; CXX=""; ac_cv_prog_gxx=no # cf_cxx_library=no - { echo "$as_me:3227: WARNING: templates do not work" >&5 + { echo "$as_me:2848: WARNING: templates do not work" >&5 echo "$as_me: WARNING: templates do not work" >&2;} ;; esac -echo "$as_me:3232: checking if you want to build C++ binding and demo" >&5 +echo "$as_me:2853: 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. @@ -3239,23 +2860,28 @@ if test "${with_cxx_binding+set}" = set; then else cf_with_cxx_binding=$cf_with_cxx fi; -echo "$as_me:3242: result: $cf_with_cxx_binding" >&5 +echo "$as_me:2863: result: $cf_with_cxx_binding" >&5 echo "${ECHO_T}$cf_with_cxx_binding" >&6 -echo "$as_me:3245: checking if you want to build with Ada95" >&5 +echo "$as_me:2866: checking if you want to build with Ada95" >&5 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6 +echo "$as_me:2868: result: $cf_with_ada" >&5 +echo "${ECHO_T}$cf_with_ada" >&6 -# Check whether --with-ada or --without-ada was given. -if test "${with_ada+set}" = set; then - withval="$with_ada" - cf_with_ada=$withval +echo "$as_me:2871: 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. +if test "${enable_db_install+set}" = set; then + enableval="$enable_db_install" + cf_with_db_install=$enableval else - cf_with_ada=yes + cf_with_db_install=yes fi; -echo "$as_me:3255: result: $cf_with_ada" >&5 -echo "${ECHO_T}$cf_with_ada" >&6 +echo "$as_me:2881: result: $cf_with_db_install" >&5 +echo "${ECHO_T}$cf_with_db_install" >&6 -echo "$as_me:3258: checking if you want to install manpages" >&5 +echo "$as_me:2884: 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. @@ -3265,10 +2891,10 @@ if test "${with_manpages+set}" = set; then else cf_with_manpages=yes fi; -echo "$as_me:3268: result: $cf_with_manpages" >&5 +echo "$as_me:2894: result: $cf_with_manpages" >&5 echo "${ECHO_T}$cf_with_manpages" >&6 -echo "$as_me:3271: checking if you want to build programs such as tic" >&5 +echo "$as_me:2897: 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. @@ -3278,10 +2904,10 @@ if test "${with_progs+set}" = set; then else cf_with_progs=yes fi; -echo "$as_me:3281: result: $cf_with_progs" >&5 +echo "$as_me:2907: result: $cf_with_progs" >&5 echo "${ECHO_T}$cf_with_progs" >&6 -echo "$as_me:3284: checking if you want to build test-programs" >&5 +echo "$as_me:2910: 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. @@ -3291,10 +2917,10 @@ if test "${with_tests+set}" = set; then else cf_with_tests=yes fi; -echo "$as_me:3294: result: $cf_with_tests" >&5 +echo "$as_me:2920: result: $cf_with_tests" >&5 echo "${ECHO_T}$cf_with_tests" >&6 -echo "$as_me:3297: checking if you wish to install curses.h" >&5 +echo "$as_me:2923: 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. @@ -3304,7 +2930,7 @@ if test "${with_curses_h+set}" = set; then else with_curses_h=yes fi; -echo "$as_me:3307: result: $with_curses_h" >&5 +echo "$as_me:2933: result: $with_curses_h" >&5 echo "${ECHO_T}$with_curses_h" >&6 modules_to_build="ncurses" @@ -3330,7 +2956,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:3333: checking for $ac_word" >&5 +echo "$as_me:2959: 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 @@ -3345,7 +2971,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:3348: found $ac_dir/$ac_word" >&5 +echo "$as_me:2974: found $ac_dir/$ac_word" >&5 break done @@ -3353,21 +2979,21 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:3356: result: $AWK" >&5 + echo "$as_me:2982: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:3359: result: no" >&5 + echo "$as_me:2985: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -test -z "$AWK" && { { echo "$as_me:3366: error: No awk program found" >&5 +test -z "$AWK" && { { echo "$as_me:2992: error: No awk program found" >&5 echo "$as_me: error: No awk program found" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:3370: checking for egrep" >&5 +echo "$as_me:2996: 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 @@ -3377,11 +3003,11 @@ else else ac_cv_prog_egrep='egrep' fi fi -echo "$as_me:3380: result: $ac_cv_prog_egrep" >&5 +echo "$as_me:3006: 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:3384: error: No egrep program found" >&5 +test -z "$EGREP" && { { echo "$as_me:3010: error: No egrep program found" >&5 echo "$as_me: error: No egrep program found" >&2;} { (exit 1); exit 1; }; } @@ -3397,7 +3023,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:3400: checking for a BSD compatible install" >&5 +echo "$as_me:3026: 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 @@ -3446,7 +3072,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:3449: result: $INSTALL" >&5 +echo "$as_me:3075: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -3471,7 +3097,7 @@ for ac_prog in tdlint lint alint splint lclint 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:3474: checking for $ac_word" >&5 +echo "$as_me:3100: 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 @@ -3486,7 +3112,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:3489: found $ac_dir/$ac_word" >&5 +echo "$as_me:3115: found $ac_dir/$ac_word" >&5 break done @@ -3494,28 +3120,28 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:3497: result: $LINT" >&5 + echo "$as_me:3123: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:3500: result: no" >&5 + echo "$as_me:3126: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$LINT" && break done -echo "$as_me:3507: checking whether ln -s works" >&5 +echo "$as_me:3133: 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:3511: result: yes" >&5 + echo "$as_me:3137: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:3514: result: no, using $LN_S" >&5 + echo "$as_me:3140: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:3518: checking if $LN_S -f options work" >&5 +echo "$as_me:3144: 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 @@ -3527,12 +3153,12 @@ else cf_prog_ln_sf=no fi rm -f conf$$.dst conf$$src -echo "$as_me:3530: result: $cf_prog_ln_sf" >&5 +echo "$as_me:3156: 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:3535: checking for long file names" >&5 +echo "$as_me:3161: 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 @@ -3571,7 +3197,7 @@ for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do rm -rf $ac_xdir 2>/dev/null done fi -echo "$as_me:3574: result: $ac_cv_sys_long_file_names" >&5 +echo "$as_me:3200: 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 @@ -3583,7 +3209,7 @@ fi # if we find pkg-config, check if we should install the ".pc" files. -echo "$as_me:3586: checking if you want to use pkg-config" >&5 +echo "$as_me:3212: 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. @@ -3593,7 +3219,7 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:3596: result: $cf_pkg_config" >&5 +echo "$as_me:3222: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 case $cf_pkg_config in #(vi @@ -3605,7 +3231,7 @@ yes) #(vi 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:3608: checking for $ac_word" >&5 +echo "$as_me:3234: 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 @@ -3622,7 +3248,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:3625: found $ac_dir/$ac_word" >&5 + echo "$as_me:3251: found $ac_dir/$ac_word" >&5 break fi done @@ -3633,10 +3259,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:3636: result: $PKG_CONFIG" >&5 + echo "$as_me:3262: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:3639: result: no" >&5 + echo "$as_me:3265: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3645,7 +3271,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:3648: checking for $ac_word" >&5 +echo "$as_me:3274: 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 @@ -3662,7 +3288,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:3665: found $ac_dir/$ac_word" >&5 + echo "$as_me:3291: found $ac_dir/$ac_word" >&5 break fi done @@ -3674,10 +3300,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:3677: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:3303: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:3680: result: no" >&5 + echo "$as_me:3306: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3708,7 +3334,7 @@ case ".$PKG_CONFIG" in #(vi ;; .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ;; -.\${*prefix}*) #(vi +.\${*prefix}*|.\${*dir}*) #(vi eval PKG_CONFIG="$PKG_CONFIG" case ".$PKG_CONFIG" in #(vi .NONE/*) @@ -3720,7 +3346,7 @@ case ".$PKG_CONFIG" in #(vi PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:3723: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:3349: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -3729,7 +3355,7 @@ esac fi if test "$PKG_CONFIG" != none ; then - echo "$as_me:3732: checking for $PKG_CONFIG library directory" >&5 + echo "$as_me:3358: checking for $PKG_CONFIG library directory" >&5 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 # Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given. @@ -3766,13 +3392,12 @@ fi; ;; esac - echo "$as_me:3769: result: $PKG_CONFIG_LIBDIR" >&5 + echo "$as_me:3395: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 fi if test "$PKG_CONFIG" != none ; then - if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then - echo "$as_me:3775: checking if we should install .pc files for $PKG_CONFIG" >&5 + echo "$as_me:3400: 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 # Check whether --enable-pc-files or --disable-pc-files was given. @@ -3782,18 +3407,48 @@ if test "${enable_pc_files+set}" = set; then else enable_pc_files=no fi; - echo "$as_me:3785: result: $enable_pc_files" >&5 + echo "$as_me:3410: result: $enable_pc_files" >&5 echo "${ECHO_T}$enable_pc_files" >&6 - elif test -z "$PKG_CONFIG_LIBDIR" || test "$PKG_CONFIG_LIBDIR" != no; then - enable_pc_files=no - { echo "$as_me:3789: WARNING: did not find $PKG_CONFIG library" >&5 -echo "$as_me: WARNING: did not find $PKG_CONFIG library" >&2;} + if test "$enable_pc_files" != no + then + +if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" +else + cf_path_syntax="$ac_default_prefix" +fi + +case ".$PKG_CONFIG_LIBDIR" in #(vi +.\$\(*\)*|.\'*\'*) #(vi + ;; +..|./*|.\\*) #(vi + ;; +.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +.\${*prefix}*|.\${*dir}*) #(vi + eval PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" + case ".$PKG_CONFIG_LIBDIR" in #(vi + .NONE/*) + PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; #(vi +.no|.NONE/*) + PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%` + ;; +*) + { { echo "$as_me:3440: 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; }; } + ;; +esac + fi else enable_pc_files=no fi -echo "$as_me:3796: checking if we should assume mixed-case filenames" >&5 +echo "$as_me:3451: 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. @@ -3803,11 +3458,11 @@ if test "${enable_mixed_case+set}" = set; then else enable_mixedcase=auto fi; -echo "$as_me:3806: result: $enable_mixedcase" >&5 +echo "$as_me:3461: result: $enable_mixedcase" >&5 echo "${ECHO_T}$enable_mixedcase" >&6 if test "$enable_mixedcase" = "auto" ; then -echo "$as_me:3810: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:3465: 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 @@ -3815,7 +3470,7 @@ else if test "$cross_compiling" = yes ; then case $target_alias in #(vi - *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi + *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) #(vi cf_cv_mixedcase=no ;; *) @@ -3834,16 +3489,18 @@ else fi fi -echo "$as_me:3837: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3492: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 -test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF +test "$cf_cv_mixedcase" = yes && +cat >>confdefs.h <<\EOF #define MIXEDCASE_FILENAMES 1 EOF else cf_cv_mixedcase=$enable_mixedcase - if test "$enable_mixedcase" = "yes" ; then - cat >>confdefs.h <<\EOF + if test "x$enable_mixedcase" = "xyes" ; then + +cat >>confdefs.h <<\EOF #define MIXEDCASE_FILENAMES 1 EOF @@ -3851,7 +3508,7 @@ EOF fi # do this after mixed-case option (tags/TAGS is not as important as tic). -echo "$as_me:3854: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:3511: 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 @@ -3871,11 +3528,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:3874: result: yes" >&5 + echo "$as_me:3531: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:3878: result: no" >&5 + echo "$as_me:3535: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -3884,7 +3541,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:3887: checking for $ac_word" >&5 +echo "$as_me:3544: 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 @@ -3899,7 +3556,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:3902: found $ac_dir/$ac_word" >&5 +echo "$as_me:3559: found $ac_dir/$ac_word" >&5 break done @@ -3907,10 +3564,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:3910: result: $CTAGS" >&5 + echo "$as_me:3567: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:3913: result: no" >&5 + echo "$as_me:3570: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3921,7 +3578,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:3924: checking for $ac_word" >&5 +echo "$as_me:3581: 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 @@ -3936,7 +3593,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:3939: found $ac_dir/$ac_word" >&5 +echo "$as_me:3596: found $ac_dir/$ac_word" >&5 break done @@ -3944,10 +3601,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:3947: result: $ETAGS" >&5 + echo "$as_me:3604: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:3950: result: no" >&5 + echo "$as_me:3607: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3956,7 +3613,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:3959: checking for $ac_word" >&5 +echo "$as_me:3616: 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 @@ -3971,7 +3628,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:3974: found $ac_dir/$ac_word" >&5 +echo "$as_me:3631: found $ac_dir/$ac_word" >&5 break done @@ -3980,17 +3637,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:3983: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:3640: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:3986: result: no" >&5 + echo "$as_me:3643: 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:3993: checking for $ac_word" >&5 +echo "$as_me:3650: 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 @@ -4005,7 +3662,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:4008: found $ac_dir/$ac_word" >&5 +echo "$as_me:3665: found $ac_dir/$ac_word" >&5 break done @@ -4014,10 +3671,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:4017: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:3674: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:4020: result: no" >&5 + echo "$as_me:3677: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4037,7 +3694,7 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:4040: checking for makeflags variable" >&5 +echo "$as_me:3697: 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 @@ -4053,7 +3710,7 @@ all : CF_EOF cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[ ]*$,,'` case "$cf_result" in - .*k) + .*k|.*kw) cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` case "$cf_result" in .*CC=*) cf_cv_makeflags= @@ -4071,13 +3728,13 @@ CF_EOF rm -f cf_makeflags.tmp fi -echo "$as_me:4074: result: $cf_cv_makeflags" >&5 +echo "$as_me:3731: 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:4080: checking for $ac_word" >&5 +echo "$as_me:3737: 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 @@ -4092,7 +3749,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:4095: found $ac_dir/$ac_word" >&5 +echo "$as_me:3752: found $ac_dir/$ac_word" >&5 break done @@ -4100,10 +3757,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:4103: result: $RANLIB" >&5 + echo "$as_me:3760: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:4106: result: no" >&5 + echo "$as_me:3763: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4112,7 +3769,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:4115: checking for $ac_word" >&5 +echo "$as_me:3772: 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 @@ -4127,7 +3784,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:4130: found $ac_dir/$ac_word" >&5 +echo "$as_me:3787: found $ac_dir/$ac_word" >&5 break done @@ -4136,10 +3793,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:4139: result: $ac_ct_RANLIB" >&5 + echo "$as_me:3796: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:4142: result: no" >&5 + echo "$as_me:3799: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4151,7 +3808,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:4154: checking for $ac_word" >&5 +echo "$as_me:3811: 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 @@ -4166,7 +3823,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:4169: found $ac_dir/$ac_word" >&5 +echo "$as_me:3826: found $ac_dir/$ac_word" >&5 break done @@ -4174,10 +3831,10 @@ fi fi LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$as_me:4177: result: $LD" >&5 + echo "$as_me:3834: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:4180: result: no" >&5 + echo "$as_me:3837: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4186,7 +3843,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:4189: checking for $ac_word" >&5 +echo "$as_me:3846: 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 @@ -4201,7 +3858,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:4204: found $ac_dir/$ac_word" >&5 +echo "$as_me:3861: found $ac_dir/$ac_word" >&5 break done @@ -4210,10 +3867,10 @@ fi fi ac_ct_LD=$ac_cv_prog_ac_ct_LD if test -n "$ac_ct_LD"; then - echo "$as_me:4213: result: $ac_ct_LD" >&5 + echo "$as_me:3870: result: $ac_ct_LD" >&5 echo "${ECHO_T}$ac_ct_LD" >&6 else - echo "$as_me:4216: result: no" >&5 + echo "$as_me:3873: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4225,7 +3882,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:4228: checking for $ac_word" >&5 +echo "$as_me:3885: 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 @@ -4240,7 +3897,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:4243: found $ac_dir/$ac_word" >&5 +echo "$as_me:3900: found $ac_dir/$ac_word" >&5 break done @@ -4248,10 +3905,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:4251: result: $AR" >&5 + echo "$as_me:3908: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:4254: result: no" >&5 + echo "$as_me:3911: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4260,7 +3917,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:4263: checking for $ac_word" >&5 +echo "$as_me:3920: 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 @@ -4275,7 +3932,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:4278: found $ac_dir/$ac_word" >&5 +echo "$as_me:3935: found $ac_dir/$ac_word" >&5 break done @@ -4284,10 +3941,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:4287: result: $ac_ct_AR" >&5 + echo "$as_me:3944: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4290: result: no" >&5 + echo "$as_me:3947: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4296,10 +3953,84 @@ else AR="$ac_cv_prog_AR" 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:3959: 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 +else + if test -n "$NM"; then + ac_cv_prog_NM="$NM" # 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_NM="${ac_tool_prefix}nm" +echo "$as_me:3974: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +NM=$ac_cv_prog_NM +if test -n "$NM"; then + echo "$as_me:3982: result: $NM" >&5 +echo "${ECHO_T}$NM" >&6 +else + echo "$as_me:3985: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +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:3994: 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 +else + if test -n "$ac_ct_NM"; then + ac_cv_prog_ac_ct_NM="$ac_ct_NM" # 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_NM="nm" +echo "$as_me:4009: found $ac_dir/$ac_word" >&5 +break +done + + test -z "$ac_cv_prog_ac_ct_NM" && ac_cv_prog_ac_ct_NM="nm" +fi +fi +ac_ct_NM=$ac_cv_prog_ac_ct_NM +if test -n "$ac_ct_NM"; then + echo "$as_me:4018: result: $ac_ct_NM" >&5 +echo "${ECHO_T}$ac_ct_NM" >&6 +else + echo "$as_me:4021: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + NM=$ac_ct_NM +else + NM="$ac_cv_prog_NM" +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:4302: checking for $ac_word" >&5 +echo "$as_me:4033: 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 @@ -4314,7 +4045,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:4317: found $ac_dir/$ac_word" >&5 +echo "$as_me:4048: found $ac_dir/$ac_word" >&5 break done @@ -4322,10 +4053,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:4325: result: $AR" >&5 + echo "$as_me:4056: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:4328: result: no" >&5 + echo "$as_me:4059: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4334,7 +4065,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:4337: checking for $ac_word" >&5 +echo "$as_me:4068: 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 @@ -4349,7 +4080,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:4352: found $ac_dir/$ac_word" >&5 +echo "$as_me:4083: found $ac_dir/$ac_word" >&5 break done @@ -4358,10 +4089,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:4361: result: $ac_ct_AR" >&5 + echo "$as_me:4092: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4364: result: no" >&5 + echo "$as_me:4095: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4370,7 +4101,7 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:4373: checking for options to update archives" >&5 +echo "$as_me:4104: 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 @@ -4393,13 +4124,13 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:4130: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4402: \$? = $ac_status" >&5 + echo "$as_me:4133: \$? = $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 @@ -4410,7 +4141,7 @@ EOF else test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me:-configure}:4413: testing cannot compile test-program ..." 1>&5 +echo "${as_me:-configure}:4144: testing cannot compile test-program ..." 1>&5 break fi @@ -4418,7 +4149,7 @@ echo "${as_me:-configure}:4413: testing cannot compile test-program ..." 1>&5 rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext fi -echo "$as_me:4421: result: $cf_cv_ar_flags" >&5 +echo "$as_me:4152: result: $cf_cv_ar_flags" >&5 echo "${ECHO_T}$cf_cv_ar_flags" >&6 if test -n "$ARFLAGS" ; then @@ -4429,20 +4160,20 @@ else ARFLAGS=$cf_cv_ar_flags fi -echo "$as_me:4432: checking if you have specified an install-prefix" >&5 +echo "$as_me:4163: 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. if test "${with_install_prefix+set}" = set; then withval="$with_install_prefix" - case "$withval" in #(vi - yes|no) #(vi + case "x$withval" in #(vi + xyes|xno) #(vi ;; *) DESTDIR="$withval" ;; esac fi; -echo "$as_me:4445: result: $DESTDIR" >&5 +echo "$as_me:4176: result: $DESTDIR" >&5 echo "${ECHO_T}$DESTDIR" >&6 ############################################################################### @@ -4470,7 +4201,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:4473: checking for $ac_word" >&5 +echo "$as_me:4204: 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 @@ -4485,7 +4216,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:4488: found $ac_dir/$ac_word" >&5 +echo "$as_me:4219: found $ac_dir/$ac_word" >&5 break done @@ -4493,10 +4224,10 @@ fi fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - echo "$as_me:4496: result: $BUILD_CC" >&5 + echo "$as_me:4227: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 else - echo "$as_me:4499: result: no" >&5 + echo "$as_me:4230: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4504,12 +4235,12 @@ fi done fi; - echo "$as_me:4507: checking for native build C compiler" >&5 + echo "$as_me:4238: checking for native build C compiler" >&5 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 - echo "$as_me:4509: result: $BUILD_CC" >&5 + echo "$as_me:4240: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 - echo "$as_me:4512: checking for native build C preprocessor" >&5 + echo "$as_me:4243: 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. @@ -4519,10 +4250,10 @@ if test "${with_build_cpp+set}" = set; then else BUILD_CPP='${BUILD_CC} -E' fi; - echo "$as_me:4522: result: $BUILD_CPP" >&5 + echo "$as_me:4253: result: $BUILD_CPP" >&5 echo "${ECHO_T}$BUILD_CPP" >&6 - echo "$as_me:4525: checking for native build C flags" >&5 + echo "$as_me:4256: 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. @@ -4530,10 +4261,10 @@ if test "${with_build_cflags+set}" = set; then withval="$with_build_cflags" BUILD_CFLAGS="$withval" fi; - echo "$as_me:4533: result: $BUILD_CFLAGS" >&5 + echo "$as_me:4264: result: $BUILD_CFLAGS" >&5 echo "${ECHO_T}$BUILD_CFLAGS" >&6 - echo "$as_me:4536: checking for native build C preprocessor-flags" >&5 + echo "$as_me:4267: 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. @@ -4541,10 +4272,10 @@ if test "${with_build_cppflags+set}" = set; then withval="$with_build_cppflags" BUILD_CPPFLAGS="$withval" fi; - echo "$as_me:4544: result: $BUILD_CPPFLAGS" >&5 + echo "$as_me:4275: result: $BUILD_CPPFLAGS" >&5 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - echo "$as_me:4547: checking for native build linker-flags" >&5 + echo "$as_me:4278: 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. @@ -4552,10 +4283,10 @@ if test "${with_build_ldflags+set}" = set; then withval="$with_build_ldflags" BUILD_LDFLAGS="$withval" fi; - echo "$as_me:4555: result: $BUILD_LDFLAGS" >&5 + echo "$as_me:4286: result: $BUILD_LDFLAGS" >&5 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - echo "$as_me:4558: checking for native build linker-libraries" >&5 + echo "$as_me:4289: 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. @@ -4563,7 +4294,7 @@ if test "${with_build_libs+set}" = set; then withval="$with_build_libs" BUILD_LIBS="$withval" fi; - echo "$as_me:4566: result: $BUILD_LIBS" >&5 + echo "$as_me:4297: result: $BUILD_LIBS" >&5 echo "${ECHO_T}$BUILD_LIBS" >&6 # this assumes we're on Unix. @@ -4573,7 +4304,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6 : ${BUILD_CC:='${CC}'} if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then - { { echo "$as_me:4576: error: Cross-build requires two compilers. + { { echo "$as_me:4307: 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;} @@ -4598,7 +4329,7 @@ fi ### shared, for example. cf_list_models="" -echo "$as_me:4601: checking if libtool -version-number should be used" >&5 +echo "$as_me:4332: 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. @@ -4615,7 +4346,7 @@ else cf_libtool_version=yes fi; -echo "$as_me:4618: result: $cf_libtool_version" >&5 +echo "$as_me:4349: result: $cf_libtool_version" >&5 echo "${ECHO_T}$cf_libtool_version" >&6 if test "$cf_libtool_version" = yes ; then @@ -4640,7 +4371,7 @@ LIB_LINK='${CC}' LIB_INSTALL= LIB_UNINSTALL= -echo "$as_me:4643: checking if you want to build libraries with libtool" >&5 +echo "$as_me:4374: 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. @@ -4650,7 +4381,7 @@ if test "${with_libtool+set}" = set; then else with_libtool=no fi; -echo "$as_me:4653: result: $with_libtool" >&5 +echo "$as_me:4384: result: $with_libtool" >&5 echo "${ECHO_T}$with_libtool" >&6 if test "$with_libtool" != "no"; then @@ -4669,7 +4400,7 @@ case ".$with_libtool" in #(vi ;; .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ;; -.\${*prefix}*) #(vi +.\${*prefix}*|.\${*dir}*) #(vi eval with_libtool="$with_libtool" case ".$with_libtool" in #(vi .NONE/*) @@ -4681,7 +4412,7 @@ case ".$with_libtool" in #(vi with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:4684: error: expected a pathname, not \"$with_libtool\"" >&5 + { { echo "$as_me:4415: error: expected a pathname, not \"$with_libtool\"" >&5 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -4689,46 +4420,195 @@ esac LIBTOOL=$with_libtool else - # Extract the first word of "libtool", so it can be a program name with args. -set dummy libtool; ac_word=$2 -echo "$as_me:4694: checking for $ac_word" >&5 + if test -n "$ac_tool_prefix"; then + for ac_prog in libtool glibtool + 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:4428: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_LIBTOOL+set}" = set; then +if test "${ac_cv_prog_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $LIBTOOL in - [\\/]* | ?:[\\/]*) - ac_cv_path_LIBTOOL="$LIBTOOL" # Let the user override the test with a path. - ;; - *) + if test -n "$LIBTOOL"; then + ac_cv_prog_LIBTOOL="$LIBTOOL" # 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=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_LIBTOOL="$ac_dir/$ac_word" - echo "$as_me:4711: found $ac_dir/$ac_word" >&5 - break + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog" +echo "$as_me:4443: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +LIBTOOL=$ac_cv_prog_LIBTOOL +if test -n "$LIBTOOL"; then + echo "$as_me:4451: result: $LIBTOOL" >&5 +echo "${ECHO_T}$LIBTOOL" >&6 +else + echo "$as_me:4454: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$LIBTOOL" && break + done fi +if test -z "$LIBTOOL"; then + ac_ct_LIBTOOL=$LIBTOOL + for ac_prog in libtool glibtool +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:4467: 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 +else + if test -n "$ac_ct_LIBTOOL"; then + ac_cv_prog_ac_ct_LIBTOOL="$ac_ct_LIBTOOL" # 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_LIBTOOL="$ac_prog" +echo "$as_me:4482: found $ac_dir/$ac_word" >&5 +break done - ;; -esac fi -LIBTOOL=$ac_cv_path_LIBTOOL +fi +ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL +if test -n "$ac_ct_LIBTOOL"; then + echo "$as_me:4490: result: $ac_ct_LIBTOOL" >&5 +echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 +else + echo "$as_me:4493: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$ac_ct_LIBTOOL" && break +done +test -n "$ac_ct_LIBTOOL" || ac_ct_LIBTOOL="none" + + LIBTOOL=$ac_ct_LIBTOOL +fi + +if test -n "$LIBTOOL" && test "$LIBTOOL" != none +then + cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'` +else + cf_cv_libtool_version= +fi +test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version + + if test -z "$cf_cv_libtool_version" && test "$LIBTOOL" = libtool + then + +unset ac_cv_prog_ac_ct_LIBTOOL +unset ac_ct_LIBTOOL +unset LIBTOOL + + if test -n "$ac_tool_prefix"; then + for ac_prog in glibtool + 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:4524: 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 +else + if test -n "$LIBTOOL"; then + ac_cv_prog_LIBTOOL="$LIBTOOL" # 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_LIBTOOL="$ac_tool_prefix$ac_prog" +echo "$as_me:4539: found $ac_dir/$ac_word" >&5 +break +done +fi +fi +LIBTOOL=$ac_cv_prog_LIBTOOL if test -n "$LIBTOOL"; then - echo "$as_me:4722: result: $LIBTOOL" >&5 + echo "$as_me:4547: result: $LIBTOOL" >&5 echo "${ECHO_T}$LIBTOOL" >&6 else - echo "$as_me:4725: result: no" >&5 + echo "$as_me:4550: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$LIBTOOL" && break + done +fi +if test -z "$LIBTOOL"; then + ac_ct_LIBTOOL=$LIBTOOL + for ac_prog in glibtool +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:4563: 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 +else + if test -n "$ac_ct_LIBTOOL"; then + ac_cv_prog_ac_ct_LIBTOOL="$ac_ct_LIBTOOL" # 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_LIBTOOL="$ac_prog" +echo "$as_me:4578: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL +if test -n "$ac_ct_LIBTOOL"; then + echo "$as_me:4586: result: $ac_ct_LIBTOOL" >&5 +echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 +else + echo "$as_me:4589: result: no" >&5 echo "${ECHO_T}no" >&6 fi + test -n "$ac_ct_LIBTOOL" && break +done +test -n "$ac_ct_LIBTOOL" || ac_ct_LIBTOOL="none" + + LIBTOOL=$ac_ct_LIBTOOL +fi + +if test -n "$LIBTOOL" && test "$LIBTOOL" != none +then + cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'` +else + cf_cv_libtool_version= +fi +test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version + + fi fi if test -z "$LIBTOOL" ; then - { { echo "$as_me:4731: error: Cannot find libtool" >&5 + { { echo "$as_me:4611: error: Cannot find libtool" >&5 echo "$as_me: error: Cannot find libtool" >&2;} { (exit 1); exit 1; }; } fi @@ -4742,26 +4622,36 @@ echo "$as_me: error: Cannot find libtool" >&2;} LIB_UNINSTALL='${LIBTOOL} --mode=uninstall' LIB_PREP=: - # Show the version of libtool - echo "$as_me:4746: checking version of libtool" >&5 -echo $ECHO_N "checking version of libtool... $ECHO_C" >&6 +if test -n "$LIBTOOL" && test "$LIBTOOL" != none +then + echo "$as_me:4627: checking version of $LIBTOOL" >&5 +echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6 - # Save the version in a cache variable - this is not entirely a good - # thing, but the version string from libtool is very ugly, and for - # bug reports it might be useful to have the original string. "(" +if test -n "$LIBTOOL" && test "$LIBTOOL" != none +then cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'` - echo "$as_me:4753: result: $cf_cv_libtool_version" >&5 +else + cf_cv_libtool_version= +fi +test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version + + echo "$as_me:4638: 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:4756: error: This is not GNU libtool" >&5 + { { echo "$as_me:4641: error: This is not GNU libtool" >&5 echo "$as_me: error: This is not GNU libtool" >&2;} { (exit 1); exit 1; }; } fi +else + { { echo "$as_me:4646: error: GNU libtool has not been found" >&5 +echo "$as_me: error: GNU libtool has not been found" >&2;} + { (exit 1); exit 1; }; } +fi # special hack to add -no-undefined (which libtool should do for itself) LT_UNDEF= case "$cf_cv_system_name" in #(vi - cygwin*|mingw32*|uwin*|aix[4-7]) #(vi + cygwin*|msys*|mingw32*|uwin*|aix[4-7]) #(vi LT_UNDEF=-no-undefined ;; esac @@ -4789,7 +4679,7 @@ cf_list_models="$cf_list_models libtool" else -echo "$as_me:4792: checking if you want to build shared libraries" >&5 +echo "$as_me:4682: 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. @@ -4799,11 +4689,11 @@ if test "${with_shared+set}" = set; then else with_shared=no fi; -echo "$as_me:4802: result: $with_shared" >&5 +echo "$as_me:4692: result: $with_shared" >&5 echo "${ECHO_T}$with_shared" >&6 -test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" +test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared" -echo "$as_me:4806: checking if you want to build static libraries" >&5 +echo "$as_me:4696: 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. @@ -4813,11 +4703,11 @@ if test "${with_normal+set}" = set; then else with_normal=yes fi; -echo "$as_me:4816: result: $with_normal" >&5 +echo "$as_me:4706: result: $with_normal" >&5 echo "${ECHO_T}$with_normal" >&6 -test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal" +test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal" -echo "$as_me:4820: checking if you want to build debug libraries" >&5 +echo "$as_me:4710: 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. @@ -4827,11 +4717,11 @@ if test "${with_debug+set}" = set; then else with_debug=yes fi; -echo "$as_me:4830: result: $with_debug" >&5 +echo "$as_me:4720: result: $with_debug" >&5 echo "${ECHO_T}$with_debug" >&6 -test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug" +test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug" -echo "$as_me:4834: checking if you want to build profiling libraries" >&5 +echo "$as_me:4724: 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. @@ -4841,27 +4731,44 @@ if test "${with_profile+set}" = set; then else with_profile=no fi; -echo "$as_me:4844: result: $with_profile" >&5 +echo "$as_me:4734: result: $with_profile" >&5 echo "${ECHO_T}$with_profile" >&6 -test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile" +test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile" + +fi + +if test "X$cf_with_cxx_binding" != Xno; then +if test "x$with_shared" = "xyes"; then +echo "$as_me:4742: 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. +if test "${with_cxx_shared+set}" = set; then + withval="$with_cxx_shared" + with_shared_cxx=$withval +else + with_shared_cxx=no +fi; +echo "$as_me:4752: result: $with_shared_cxx" >&5 +echo "${ECHO_T}$with_shared_cxx" >&6 +fi fi ############################################################################### -echo "$as_me:4852: checking for specified models" >&5 +echo "$as_me:4759: 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:4856: result: $cf_list_models" >&5 +echo "$as_me:4763: 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:4861: checking for default model" >&5 +echo "$as_me:4768: 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:4864: result: $DFT_LWR_MODEL" >&5 +echo "$as_me:4771: result: $DFT_LWR_MODEL" >&5 echo "${ECHO_T}$DFT_LWR_MODEL" >&6 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -4875,7 +4782,7 @@ LIB_NAME=ncurses LIB_DIR=../lib LIB_2ND=../../lib -echo "$as_me:4878: checking if you want to have a library-prefix" >&5 +echo "$as_me:4785: 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. @@ -4885,7 +4792,7 @@ if test "${with_lib_prefix+set}" = set; then else with_lib_prefix=auto fi; -echo "$as_me:4888: result: $with_lib_prefix" >&5 +echo "$as_me:4795: result: $with_lib_prefix" >&5 echo "${ECHO_T}$with_lib_prefix" >&6 if test $with_lib_prefix = auto @@ -4909,9 +4816,19 @@ fi LIB_SUFFIX= + echo "$as_me:4819: checking for PATH separator" >&5 +echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 + case $cf_cv_system_name in + os2*) PATH_SEPARATOR=';' ;; + *) ${PATH_SEPARATOR:=':'} ;; + esac + + echo "$as_me:4826: result: $PATH_SEPARATOR" >&5 +echo "${ECHO_T}$PATH_SEPARATOR" >&6 + ############################################################################### -echo "$as_me:4914: checking if you want to build a separate terminfo library" >&5 +echo "$as_me:4831: 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. @@ -4921,10 +4838,10 @@ if test "${with_termlib+set}" = set; then else with_termlib=no fi; -echo "$as_me:4924: result: $with_termlib" >&5 +echo "$as_me:4841: result: $with_termlib" >&5 echo "${ECHO_T}$with_termlib" >&6 -echo "$as_me:4927: checking if you want to build a separate tic library" >&5 +echo "$as_me:4844: 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. @@ -4934,13 +4851,13 @@ if test "${with_ticlib+set}" = set; then else with_ticlib=no fi; -echo "$as_me:4937: result: $with_ticlib" >&5 +echo "$as_me:4854: result: $with_ticlib" >&5 echo "${ECHO_T}$with_ticlib" >&6 ### Checks for special libraries, must be done up-front. SHLIB_LIST="" -echo "$as_me:4943: checking if you want to link with the GPM mouse library" >&5 +echo "$as_me:4860: 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. @@ -4950,27 +4867,27 @@ if test "${with_gpm+set}" = set; then else with_gpm=maybe fi; -echo "$as_me:4953: result: $with_gpm" >&5 +echo "$as_me:4870: result: $with_gpm" >&5 echo "${ECHO_T}$with_gpm" >&6 if test "$with_gpm" != no ; then - echo "$as_me:4957: checking for gpm.h" >&5 + echo "$as_me:4874: 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 4963 "configure" +#line 4880 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:4967: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4884: \"$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:4973: \$? = $ac_status" >&5 + echo "$as_me:4890: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4989,25 +4906,25 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4992: result: $ac_cv_header_gpm_h" >&5 +echo "$as_me:4909: 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 - cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define HAVE_GPM_H 1 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}:5003: testing assuming we really have GPM library ..." 1>&5 +echo "${as_me:-configure}:4920: testing assuming we really have GPM library ..." 1>&5 - cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define HAVE_LIBGPM 1 EOF else - echo "$as_me:5010: checking for Gpm_Open in -lgpm" >&5 + echo "$as_me:4927: 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 @@ -5015,7 +4932,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5018 "configure" +#line 4935 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5034,16 +4951,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5037: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4954: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5040: \$? = $ac_status" >&5 + echo "$as_me:4957: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5043: \"$ac_try\"") >&5 + { (eval echo "$as_me:4960: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5046: \$? = $ac_status" >&5 + echo "$as_me:4963: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -5054,13 +4971,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5057: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:4974: 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 : else - { { echo "$as_me:5063: error: Cannot link with GPM library" >&5 + { { echo "$as_me:4980: error: Cannot link with GPM library" >&5 echo "$as_me: error: Cannot link with GPM library" >&2;} { (exit 1); exit 1; }; } fi @@ -5070,7 +4987,7 @@ fi else - test "$with_gpm" != maybe && { echo "$as_me:5073: WARNING: Cannot find GPM header" >&5 + test "$with_gpm" != maybe && { echo "$as_me:4990: WARNING: Cannot find GPM header" >&5 echo "$as_me: WARNING: Cannot find GPM header" >&2;} with_gpm=no @@ -5079,7 +4996,7 @@ fi fi if test "$with_gpm" != no ; then - echo "$as_me:5082: checking if you want to load GPM dynamically" >&5 + echo "$as_me:4999: 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. @@ -5089,18 +5006,18 @@ if test "${with_dlsym+set}" = set; then else with_dlsym=yes fi; - echo "$as_me:5092: result: $with_dlsym" >&5 + echo "$as_me:5009: result: $with_dlsym" >&5 echo "${ECHO_T}$with_dlsym" >&6 - if test "$with_dlsym" = yes ; then + if test "x$with_dlsym" = xyes ; then cf_have_dlsym=no -echo "$as_me:5097: checking for dlsym" >&5 +echo "$as_me:5014: 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 5103 "configure" +#line 5020 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlsym (); below. */ @@ -5131,16 +5048,16 @@ f = dlsym; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5134: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5051: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5137: \$? = $ac_status" >&5 + echo "$as_me:5054: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5140: \"$ac_try\"") >&5 + { (eval echo "$as_me:5057: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5143: \$? = $ac_status" >&5 + echo "$as_me:5060: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_dlsym=yes else @@ -5150,14 +5067,14 @@ ac_cv_func_dlsym=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5153: result: $ac_cv_func_dlsym" >&5 +echo "$as_me:5070: result: $ac_cv_func_dlsym" >&5 echo "${ECHO_T}$ac_cv_func_dlsym" >&6 if test $ac_cv_func_dlsym = yes; then cf_have_dlsym=yes else cf_have_libdl=no -echo "$as_me:5160: checking for dlsym in -ldl" >&5 +echo "$as_me:5077: 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 @@ -5165,7 +5082,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5168 "configure" +#line 5085 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5184,16 +5101,16 @@ dlsym (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5187: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5104: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5190: \$? = $ac_status" >&5 + echo "$as_me:5107: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5193: \"$ac_try\"") >&5 + { (eval echo "$as_me:5110: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5196: \$? = $ac_status" >&5 + echo "$as_me:5113: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dl_dlsym=yes else @@ -5204,7 +5121,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5207: result: $ac_cv_lib_dl_dlsym" >&5 +echo "$as_me:5124: 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 @@ -5215,12 +5132,27 @@ fi fi if test "$cf_have_dlsym" = yes ; then - test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS" + test "$cf_have_libdl" = yes && +cf_add_libs="-ldl" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +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_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" - echo "$as_me:5220: checking whether able to link to dl*() functions" >&5 + echo "$as_me:5152: 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 5223 "configure" +#line 5155 "configure" #include "confdefs.h" #include int @@ -5238,19 +5170,19 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5241: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5173: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5244: \$? = $ac_status" >&5 + echo "$as_me:5176: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5247: \"$ac_try\"") >&5 + { (eval echo "$as_me:5179: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5250: \$? = $ac_status" >&5 + echo "$as_me:5182: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define HAVE_LIBDL 1 EOF @@ -5258,28 +5190,28 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - { { echo "$as_me:5261: error: Cannot link test program for libdl" >&5 + { { echo "$as_me:5193: 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:5266: result: ok" >&5 + echo "$as_me:5198: result: ok" >&5 echo "${ECHO_T}ok" >&6 else - { { echo "$as_me:5269: error: Cannot find dlsym function" >&5 + { { echo "$as_me:5201: error: Cannot find dlsym function" >&5 echo "$as_me: error: Cannot find dlsym function" >&2;} { (exit 1); exit 1; }; } fi - if test "$with_gpm" != yes ; then + if test "x$with_gpm" != xyes ; then test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 -echo "${as_me:-configure}:5277: testing assuming soname for gpm is $with_gpm ..." 1>&5 +echo "${as_me:-configure}:5209: testing assuming soname for gpm is $with_gpm ..." 1>&5 cf_cv_gpm_soname="$with_gpm" else -echo "$as_me:5282: checking for soname of gpm library" >&5 +echo "$as_me:5214: 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 @@ -5296,16 +5228,32 @@ if (Gpm_Open(0,0)) Gpm_Close(); } CF_EOF cf_save_LIBS="$LIBS" - LIBS="-lgpm $LIBS" - if { (eval echo "$as_me:5300: \"$ac_compile\"") >&5 + +cf_add_libs="-lgpm" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +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_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + + if { (eval echo "$as_me:5248: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5303: \$? = $ac_status" >&5 + echo "$as_me:5251: \$? = $ac_status" >&5 (exit $ac_status); } ; then - if { (eval echo "$as_me:5305: \"$ac_link\"") >&5 + if { (eval echo "$as_me:5253: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5308: \$? = $ac_status" >&5 + echo "$as_me:5256: \$? = $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.` test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown @@ -5316,24 +5264,42 @@ LIBS="$cf_save_LIBS" fi fi -echo "$as_me:5319: result: $cf_cv_gpm_soname" >&5 +echo "$as_me:5267: result: $cf_cv_gpm_soname" >&5 echo "${ECHO_T}$cf_cv_gpm_soname" >&6 fi - test "$cf_cv_gpm_soname" != "unknown" && cat >>confdefs.h <>confdefs.h <>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_LIBGPM 1 EOF -echo "$as_me:5336: checking for Gpm_Wgetch in -lgpm" >&5 +echo "$as_me:5302: 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 @@ -5341,7 +5307,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5344 "configure" +#line 5310 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5360,16 +5326,16 @@ Gpm_Wgetch (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5363: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5329: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5366: \$? = $ac_status" >&5 + echo "$as_me:5332: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5369: \"$ac_try\"") >&5 + { (eval echo "$as_me:5335: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5372: \$? = $ac_status" >&5 + echo "$as_me:5338: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Wgetch=yes else @@ -5380,11 +5346,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5383: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 +echo "$as_me:5349: 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 -echo "$as_me:5387: checking if GPM is weakly bound to curses library" >&5 +echo "$as_me:5353: 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 @@ -5408,15 +5374,15 @@ 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:5411: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5377: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5414: \$? = $ac_status" >&5 + echo "$as_me:5380: \$? = $ac_status" >&5 (exit $ac_status); } ; then - if { (eval echo "$as_me:5416: \"$ac_link\"") >&5 + if { (eval echo "$as_me:5382: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5419: \$? = $ac_status" >&5 + echo "$as_me:5385: \$? = $ac_status" >&5 (exit $ac_status); } ; then cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\' | egrep '\<[vVwW]\>'` test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes @@ -5428,11 +5394,11 @@ CF_EOF fi fi -echo "$as_me:5431: result: $cf_cv_check_gpm_wgetch" >&5 +echo "$as_me:5397: 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:5435: WARNING: GPM library is already linked with curses - read the FAQ" >&5 + { echo "$as_me:5401: 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 @@ -5442,7 +5408,7 @@ fi # not everyone has "test -c" if test -c /dev/sysmouse 2>/dev/null ; then -echo "$as_me:5445: checking if you want to use sysmouse" >&5 +echo "$as_me:5411: 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. @@ -5454,7 +5420,7 @@ else fi; if test "$cf_with_sysmouse" != no ; then cat >conftest.$ac_ext <<_ACEOF -#line 5457 "configure" +#line 5423 "configure" #include "confdefs.h" #include @@ -5477,16 +5443,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5480: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5446: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5483: \$? = $ac_status" >&5 + echo "$as_me:5449: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5486: \"$ac_try\"") >&5 + { (eval echo "$as_me:5452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5489: \$? = $ac_status" >&5 + echo "$as_me:5455: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_with_sysmouse=yes else @@ -5496,9 +5462,10 @@ cf_with_sysmouse=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5499: result: $cf_with_sysmouse" >&5 +echo "$as_me:5465: result: $cf_with_sysmouse" >&5 echo "${ECHO_T}$cf_with_sysmouse" >&6 -test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF +test "$cf_with_sysmouse" = yes && +cat >>confdefs.h <<\EOF #define USE_SYSMOUSE 1 EOF @@ -5506,15 +5473,15 @@ fi if test X"$CC_G_OPT" = X"" ; then CC_G_OPT='-g' - test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT='' + test -n "$GCC" && test "x${ac_cv_prog_cc_g}" != xyes && CC_G_OPT='' fi if test X"$CXX_G_OPT" = X"" ; then CXX_G_OPT='-g' - test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT='' + test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT='' fi -echo "$as_me:5517: checking for default loader flags" >&5 +echo "$as_me:5484: checking for default loader flags" >&5 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 case $DFT_LWR_MODEL in libtool) LD_MODEL='' ;; @@ -5523,13 +5490,13 @@ debug) LD_MODEL=$CC_G_OPT ;; profile) LD_MODEL='-pg';; shared) LD_MODEL='' ;; esac -echo "$as_me:5526: result: $LD_MODEL" >&5 +echo "$as_me:5493: result: $LD_MODEL" >&5 echo "${ECHO_T}$LD_MODEL" >&6 case $DFT_LWR_MODEL in shared) -echo "$as_me:5532: checking if rpath option should be used" >&5 +echo "$as_me:5499: 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. @@ -5539,10 +5506,10 @@ if test "${enable_rpath+set}" = set; then else cf_cv_enable_rpath=no fi; -echo "$as_me:5542: result: $cf_cv_enable_rpath" >&5 +echo "$as_me:5509: result: $cf_cv_enable_rpath" >&5 echo "${ECHO_T}$cf_cv_enable_rpath" >&6 -echo "$as_me:5545: checking if shared libraries should be relinked during install" >&5 +echo "$as_me:5512: 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. @@ -5552,13 +5519,16 @@ if test "${enable_relink+set}" = set; then else cf_cv_do_relink=yes fi; -echo "$as_me:5555: result: $cf_cv_do_relink" >&5 +echo "$as_me:5522: result: $cf_cv_do_relink" >&5 echo "${ECHO_T}$cf_cv_do_relink" >&6 ;; esac +# we will build libraries one-level down. +rel_builddir=.. + LD_RPATH_OPT= -echo "$as_me:5561: checking for an rpath option" >&5 +echo "$as_me:5531: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case $cf_cv_system_name in #(vi irix*) #(vi @@ -5589,17 +5559,33 @@ solaris2*) #(vi *) ;; esac -echo "$as_me:5592: result: $LD_RPATH_OPT" >&5 +echo "$as_me:5562: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in #(vi x-R*) - echo "$as_me:5597: checking if we need a space after rpath option" >&5 + echo "$as_me:5567: 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" - LIBS="${LD_RPATH_OPT}$libdir $LIBS" + +cf_add_libs="${LD_RPATH_OPT}$libdir" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +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_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + cat >conftest.$ac_ext <<_ACEOF -#line 5602 "configure" +#line 5588 "configure" #include "confdefs.h" int @@ -5611,16 +5597,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5614: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5600: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5617: \$? = $ac_status" >&5 + echo "$as_me:5603: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5620: \"$ac_try\"") >&5 + { (eval echo "$as_me:5606: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5623: \$? = $ac_status" >&5 + echo "$as_me:5609: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_space=no else @@ -5630,22 +5616,28 @@ cf_rpath_space=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:5633: result: $cf_rpath_space" >&5 + echo "$as_me:5619: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; esac + RM_SHARED_OPTS= LOCAL_LDFLAGS= LOCAL_LDFLAGS2= LD_SHARED_OPTS= INSTALL_LIB="-m 644" + : ${rel_builddir:=.} + + shlibdir=$libdir + + MAKE_DLLS="#" cf_cv_do_symlinks=no cf_ld_rpath_opt= test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - echo "$as_me:5648: checking if release/abi version should be used for shared libs" >&5 + echo "$as_me:5640: 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. @@ -5660,7 +5652,7 @@ if test "${with_shlib_version+set}" = set; then cf_cv_shlib_version=$withval ;; *) - { { echo "$as_me:5663: error: option value must be one of: rel, abi, auto or no" >&5 + { { echo "$as_me:5655: error: option value must be one of: rel, abi, auto or no" >&5 echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} { (exit 1); exit 1; }; } ;; @@ -5669,23 +5661,24 @@ echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} else cf_cv_shlib_version=auto fi; - echo "$as_me:5672: result: $cf_cv_shlib_version" >&5 + echo "$as_me:5664: result: $cf_cv_shlib_version" >&5 echo "${ECHO_T}$cf_cv_shlib_version" >&6 cf_cv_rm_so_locs=no + cf_try_cflags= # Some less-capable ports of gcc support only -fpic CC_SHARED_OPTS= if test "$GCC" = yes then - echo "$as_me:5681: checking which $CC option to use" >&5 + echo "$as_me:5674: 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 5688 "configure" +#line 5681 "configure" #include "confdefs.h" #include int @@ -5697,16 +5690,16 @@ int x = 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5700: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5693: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5703: \$? = $ac_status" >&5 + echo "$as_me:5696: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5706: \"$ac_try\"") >&5 + { (eval echo "$as_me:5699: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5709: \$? = $ac_status" >&5 + echo "$as_me:5702: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -5715,7 +5708,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done - echo "$as_me:5718: result: $CC_SHARED_OPTS" >&5 + echo "$as_me:5711: result: $CC_SHARED_OPTS" >&5 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 CFLAGS="$cf_save_CFLAGS" fi @@ -5738,9 +5731,12 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6 ;; cygwin*) #(vi CC_SHARED_OPTS= - MK_SHARED_LIB='sh ../mk_shared_lib.sh $@ ${CC} ${CFLAGS}' + MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}' + RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a" cf_cv_shlib_version=cygdll cf_cv_shlib_version_infix=cygdll + shlibdir=$bindir + MAKE_DLLS= cat >mk_shared_lib.sh <<-CF_EOF #!/bin/sh SHARED_LIB=\$1 @@ -5751,17 +5747,39 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6 ** SHARED_LIB \$SHARED_LIB ** IMPORT_LIB \$IMPORT_LIB EOF - exec \$* -shared -Wl,--out-implib=../lib/\${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\${SHARED_LIB} + exec \$* -shared -Wl,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB} +CF_EOF + chmod +x mk_shared_lib.sh + ;; + msys*) #(vi + CC_SHARED_OPTS= + MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}' + RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a" + cf_cv_shlib_version=msysdll + cf_cv_shlib_version_infix=msysdll + shlibdir=$bindir + MAKE_DLLS= + cat >mk_shared_lib.sh <<-CF_EOF + #!/bin/sh + SHARED_LIB=\$1 + IMPORT_LIB=\`echo "\$1" | sed -e 's/msys-/lib/' -e 's/[0-9]*\.dll$/.dll.a/'\` + shift + cat <<-EOF + Linking shared library + ** SHARED_LIB \$SHARED_LIB + ** IMPORT_LIB \$IMPORT_LIB +EOF + exec \$* -shared -Wl,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB} CF_EOF chmod +x mk_shared_lib.sh ;; darwin*) #(vi - EXTRA_CFLAGS="-no-cpp-precomp" + cf_try_cflags="no-cpp-precomp" CC_SHARED_OPTS="-dynamic" MK_SHARED_LIB='${CC} ${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:5764: checking if ld -search_paths_first works" >&5 + echo "$as_me:5782: 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 @@ -5770,7 +5788,7 @@ else cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" cat >conftest.$ac_ext <<_ACEOF -#line 5773 "configure" +#line 5791 "configure" #include "confdefs.h" int @@ -5782,16 +5800,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5785: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5803: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5788: \$? = $ac_status" >&5 + echo "$as_me:5806: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5791: \"$ac_try\"") >&5 + { (eval echo "$as_me:5809: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5794: \$? = $ac_status" >&5 + echo "$as_me:5812: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ldflags_search_paths_first=yes else @@ -5802,12 +5820,20 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS=$cf_save_LDFLAGS fi -echo "$as_me:5805: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "$as_me:5823: 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 LDFLAGS="$LDFLAGS -Wl,-search_paths_first" fi ;; + hpux[7-8]*) #(vi + # HP-UX 8.07 ld lacks "+b" option used for libdir search-list + if test "$GCC" != yes; then + CC_SHARED_OPTS='+Z' + fi + MK_SHARED_LIB='${LD} -b -o $@' + INSTALL_LIB="-m 555" + ;; hpux*) #(vi # (tested with gcc 2.7.2 -- I don't have c89) if test "$GCC" = yes; then @@ -5865,10 +5891,16 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 mingw*) #(vi cf_cv_shlib_version=mingw cf_cv_shlib_version_infix=mingw + shlibdir=$bindir + MAKE_DLLS= + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="-Wl,--enable-auto-import" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + EXTRA_LDFLAGS="-Wl,--enable-auto-import $EXTRA_LDFLAGS" + fi CC_SHARED_OPTS= - MK_SHARED_LIB='sh ../mk_shared_lib.sh $@ ${CC} ${CFLAGS}' - #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]' - #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]' + MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}' + RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a" cat >mk_shared_lib.sh <<-CF_EOF #!/bin/sh SHARED_LIB=\$1 @@ -5879,7 +5911,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 ** SHARED_LIB \$SHARED_LIB ** IMPORT_LIB \$IMPORT_LIB EOF - exec \$* -shared -Wl,--out-implib=../lib/\${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\${SHARED_LIB} + exec \$* -shared -Wl,--enable-auto-import,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB} CF_EOF chmod +x mk_shared_lib.sh ;; @@ -5947,7 +5979,7 @@ CF_EOF MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@' else - MK_SHARED_LIB='${LD} -shared -Bshareable -o $@' + MK_SHARED_LIB='${CC} -Wl,-shared -Wl,-Bshareable -o $@' fi ;; osf*|mls+*) #(vi @@ -6013,7 +6045,7 @@ CF_EOF do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" cat >conftest.$ac_ext <<_ACEOF -#line 6016 "configure" +#line 6048 "configure" #include "confdefs.h" #include int @@ -6025,16 +6057,16 @@ printf("Hello\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6028: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6060: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6031: \$? = $ac_status" >&5 + echo "$as_me:6063: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6034: \"$ac_try\"") >&5 + { (eval echo "$as_me:6066: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6037: \$? = $ac_status" >&5 + echo "$as_me:6069: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -6071,39 +6103,88 @@ rm -f conftest.$ac_objext conftest.$ac_ext test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes ;; *) - { echo "$as_me:6074: WARNING: ignored --with-shlib-version" >&5 + { echo "$as_me:6106: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac ;; esac + if test -n "$cf_try_cflags" + then +cat > conftest.$ac_ext < +int main(int argc, char *argv[]) +{ + printf("hello\n"); + return (argv[argc-1] == 0) ; +} +EOF + cf_save_CFLAGS="$CFLAGS" + for cf_opt in $cf_try_cflags + do + CFLAGS="$cf_save_CFLAGS -$cf_opt" + echo "$as_me:6128: 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:6130: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6133: \$? = $ac_status" >&5 + (exit $ac_status); }; then + echo "$as_me:6135: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + cf_save_CFLAGS="$CFLAGS" + else + echo "$as_me:6139: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi + done + CFLAGS="$cf_save_CFLAGS" + fi + # RPATH_LIST is a colon-separated list of directories 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 -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 -echo "${as_me:-configure}:6087: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 +echo "${as_me:-configure}:6154: 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}:6091: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:6158: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 if test "$CC_SHARED_OPTS" = "unknown"; then for model in $cf_list_models; do if test "$model" = "shared"; then - { { echo "$as_me:6096: error: Shared libraries are not supported in this version" >&5 + { { echo "$as_me:6163: 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 done fi +# pretend that ncurses==ncursesw==ncursest +echo "$as_me:6171: 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. +if test "${enable_lib_suffixes+set}" = set; then + enableval="$enable_lib_suffixes" + disable_lib_suffixes=$enableval +else + disable_lib_suffixes=no +fi; +echo "$as_me:6181: 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"; then -echo "$as_me:6106: checking if rpath-hack should be disabled" >&5 +echo "$as_me:6187: 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. @@ -6120,21 +6201,21 @@ else cf_disable_rpath_hack=no fi; -echo "$as_me:6123: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:6204: 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:6127: checking for updated LDFLAGS" >&5 +echo "$as_me:6208: 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:6130: result: maybe" >&5 + echo "$as_me:6211: 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:6137: checking for $ac_word" >&5 +echo "$as_me:6218: 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 @@ -6149,7 +6230,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:6152: found $ac_dir/$ac_word" >&5 +echo "$as_me:6233: found $ac_dir/$ac_word" >&5 break done @@ -6157,10 +6238,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:6160: result: $cf_ldd_prog" >&5 + echo "$as_me:6241: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:6163: result: no" >&5 + echo "$as_me:6244: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6174,7 +6255,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >conftest.$ac_ext <<_ACEOF -#line 6177 "configure" +#line 6258 "configure" #include "confdefs.h" #include int @@ -6186,19 +6267,19 @@ printf("Hello"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6189: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6270: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6192: \$? = $ac_status" >&5 + echo "$as_me:6273: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6195: \"$ac_try\"") >&5 + { (eval echo "$as_me:6276: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6198: \$? = $ac_status" >&5 + echo "$as_me:6279: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u` - cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort -u` + 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` else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -6223,7 +6304,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext then test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 -echo "${as_me:-configure}:6226: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:6307: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -6235,11 +6316,11 @@ echo "${as_me:-configure}:6226: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:6238: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:6319: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:6242: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:6323: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -6276,7 +6357,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:6279: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:6360: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -6289,11 +6370,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:6292: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:6373: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:6296: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:6377: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -6330,7 +6411,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:6333: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:6414: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -6343,12 +6424,15 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:6346: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:6427: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:6350: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:6431: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +else + echo "$as_me:6434: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi @@ -6358,7 +6442,7 @@ fi ############################################################################### ### use option --disable-overwrite to leave out the link to -lcurses -echo "$as_me:6361: checking if you wish to install ncurses overwriting curses" >&5 +echo "$as_me:6445: 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. @@ -6368,10 +6452,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:6371: result: $with_overwrite" >&5 +echo "$as_me:6455: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 -echo "$as_me:6374: checking if external terminfo-database is used" >&5 +echo "$as_me:6458: 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. @@ -6381,7 +6465,7 @@ if test "${enable_database+set}" = set; then else use_database=yes fi; -echo "$as_me:6384: result: $use_database" >&5 +echo "$as_me:6468: result: $use_database" >&5 echo "${ECHO_T}$use_database" >&6 case $host_os in #(vi @@ -6393,12 +6477,11 @@ os2*) #(vi ;; esac +NCURSES_USE_DATABASE=0 if test "$use_database" != no ; then - cat >>confdefs.h <<\EOF -#define USE_DATABASE 1 -EOF + NCURSES_USE_DATABASE=1 - echo "$as_me:6401: checking which terminfo source-file will be installed" >&5 + echo "$as_me:6484: 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. @@ -6406,10 +6489,10 @@ if test "${with_database+set}" = set; then withval="$with_database" TERMINFO_SRC=$withval fi; - echo "$as_me:6409: result: $TERMINFO_SRC" >&5 + echo "$as_me:6492: result: $TERMINFO_SRC" >&5 echo "${ECHO_T}$TERMINFO_SRC" >&6 - echo "$as_me:6412: checking whether to use hashed database instead of directory/tree" >&5 + echo "$as_me:6495: 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. @@ -6419,13 +6502,13 @@ if test "${with_hashed_db+set}" = set; then else with_hashed_db=no fi; - echo "$as_me:6422: result: $with_hashed_db" >&5 + echo "$as_me:6505: result: $with_hashed_db" >&5 echo "${ECHO_T}$with_hashed_db" >&6 else with_hashed_db=no fi -echo "$as_me:6428: checking for list of fallback descriptions" >&5 +echo "$as_me:6511: 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. @@ -6435,11 +6518,11 @@ if test "${with_fallbacks+set}" = set; then else with_fallback= fi; -echo "$as_me:6438: result: $with_fallback" >&5 +echo "$as_me:6521: result: $with_fallback" >&5 echo "${ECHO_T}$with_fallback" >&6 FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'` -echo "$as_me:6442: checking if you want modern xterm or antique" >&5 +echo "$as_me:6525: 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. @@ -6453,11 +6536,11 @@ case $with_xterm_new in no) with_xterm_new=xterm-old;; *) with_xterm_new=xterm-new;; esac -echo "$as_me:6456: result: $with_xterm_new" >&5 +echo "$as_me:6539: result: $with_xterm_new" >&5 echo "${ECHO_T}$with_xterm_new" >&6 WHICH_XTERM=$with_xterm_new -echo "$as_me:6460: checking if xterm backspace sends BS or DEL" >&5 +echo "$as_me:6543: 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. @@ -6478,7 +6561,7 @@ xDEL|xdel|x127) with_xterm_kbs=$withval ;; esac -echo "$as_me:6481: result: $with_xterm_kbs" >&5 +echo "$as_me:6564: result: $with_xterm_kbs" >&5 echo "${ECHO_T}$with_xterm_kbs" >&6 XTERM_KBS=$with_xterm_kbs @@ -6488,14 +6571,9 @@ if test "$use_database" = no ; then MAKE_TERMINFO="#" else -echo "$as_me:6491: checking for list of terminfo directories" >&5 +echo "$as_me:6574: checking for list of terminfo directories" >&5 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 - case $cf_cv_system_name in - os2*) PATH_SEPARATOR=';' ;; - *) PATH_SEPARATOR=':' ;; - esac - # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. if test "${with_terminfo_dirs+set}" = set; then withval="$with_terminfo_dirs" @@ -6521,7 +6599,7 @@ case ".$cf_src_path" in #(vi ;; .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ;; -.\${*prefix}*) #(vi +.\${*prefix}*|.\${*dir}*) #(vi eval cf_src_path="$cf_src_path" case ".$cf_src_path" in #(vi .NONE/*) @@ -6533,26 +6611,37 @@ case ".$cf_src_path" in #(vi cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:6536: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:6614: 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; }; } ;; esac - test -n "$cf_dst_path" && cf_dst_path="${cf_dst_path}:" + test -n "$cf_dst_path" && cf_dst_path="${cf_dst_path}$PATH_SEPARATOR" cf_dst_path="${cf_dst_path}${cf_src_path}" done IFS="$ac_save_ifs" -eval 'TERMINFO_DIRS="$cf_dst_path"' +# This may use the prefix/exec_prefix symbols which will only yield "NONE" +# so we have to check/work around. We do prefer the result of "eval"... +eval cf_dst_eval="$cf_dst_path" +case "x$cf_dst_eval" in #(vi +xNONE*) #(vi + TERMINFO_DIRS=$cf_dst_path + ;; +*) + TERMINFO_DIRS="$cf_dst_eval" + ;; +esac -echo "$as_me:6549: result: $TERMINFO_DIRS" >&5 +echo "$as_me:6637: result: $TERMINFO_DIRS" >&5 echo "${ECHO_T}$TERMINFO_DIRS" >&6 -test -n "$TERMINFO_DIRS" && cat >>confdefs.h <>confdefs.h <&5 +echo "$as_me:6644: 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. @@ -6576,7 +6665,7 @@ case ".$withval" in #(vi ;; .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ;; -.\${*prefix}*) #(vi +.\${*prefix}*|.\${*dir}*) #(vi eval withval="$withval" case ".$withval" in #(vi .NONE/*) @@ -6588,17 +6677,18 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:6591: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:6680: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; esac fi -TERMINFO="$withval" +eval TERMINFO="$withval" -echo "$as_me:6600: result: $TERMINFO" >&5 +echo "$as_me:6689: result: $TERMINFO" >&5 echo "${ECHO_T}$TERMINFO" >&6 + cat >>confdefs.h <&5 +echo "$as_me:6700: 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. @@ -6619,7 +6709,7 @@ else with_big_core=no else cat >conftest.$ac_ext <<_ACEOF -#line 6622 "configure" +#line 6712 "configure" #include "confdefs.h" #include @@ -6633,15 +6723,15 @@ int main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6636: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6726: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6639: \$? = $ac_status" >&5 + echo "$as_me:6729: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6641: \"$ac_try\"") >&5 + { (eval echo "$as_me:6731: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6644: \$? = $ac_status" >&5 + echo "$as_me:6734: \$? = $ac_status" >&5 (exit $ac_status); }; }; then with_big_core=yes else @@ -6653,16 +6743,17 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi; -echo "$as_me:6656: result: $with_big_core" >&5 +echo "$as_me:6746: result: $with_big_core" >&5 echo "${ECHO_T}$with_big_core" >&6 -test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF +test "x$with_big_core" = "xyes" && +cat >>confdefs.h <<\EOF #define HAVE_BIG_CORE 1 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:6665: checking if big-strings option selected" >&5 +echo "$as_me:6756: 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. @@ -6686,14 +6777,14 @@ else esac fi; -echo "$as_me:6689: result: $with_big_strings" >&5 +echo "$as_me:6780: result: $with_big_strings" >&5 echo "${ECHO_T}$with_big_strings" >&6 USE_BIG_STRINGS=0 -test "$with_big_strings" = "yes" && USE_BIG_STRINGS=1 +test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1 ### use option --enable-termcap to compile in the termcap fallback support -echo "$as_me:6696: checking if you want termcap-fallback support" >&5 +echo "$as_me:6787: 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. @@ -6703,34 +6794,33 @@ if test "${enable_termcap+set}" = set; then else with_termcap=no fi; -echo "$as_me:6706: result: $with_termcap" >&5 +echo "$as_me:6797: result: $with_termcap" >&5 echo "${ECHO_T}$with_termcap" >&6 -if test "$with_termcap" != "yes" ; then +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:6712: error: You have disabled the database w/o specifying fallbacks" >&5 + { { echo "$as_me:6804: 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 fi - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define PURE_TERMINFO 1 EOF else -if test "$with_ticlib" != no ; then - { { echo "$as_me:6724: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 + if test "$with_ticlib" != no ; then + { { echo "$as_me:6817: 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 - -cat >>confdefs.h <<\EOF -#define USE_TERMCAP 1 -EOF + fi -echo "$as_me:6733: checking for list of termcap files" >&5 + NCURSES_USE_TERMCAP=1 + echo "$as_me:6823: 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. @@ -6758,7 +6848,7 @@ case ".$cf_src_path" in #(vi ;; .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ;; -.\${*prefix}*) #(vi +.\${*prefix}*|.\${*dir}*) #(vi eval cf_src_path="$cf_src_path" case ".$cf_src_path" in #(vi .NONE/*) @@ -6770,27 +6860,38 @@ case ".$cf_src_path" in #(vi cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:6773: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:6863: 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; }; } ;; esac - test -n "$cf_dst_path" && cf_dst_path="${cf_dst_path}:" + test -n "$cf_dst_path" && cf_dst_path="${cf_dst_path}$PATH_SEPARATOR" cf_dst_path="${cf_dst_path}${cf_src_path}" done IFS="$ac_save_ifs" -eval 'TERMPATH="$cf_dst_path"' +# This may use the prefix/exec_prefix symbols which will only yield "NONE" +# so we have to check/work around. We do prefer the result of "eval"... +eval cf_dst_eval="$cf_dst_path" +case "x$cf_dst_eval" in #(vi +xNONE*) #(vi + TERMPATH=$cf_dst_path + ;; +*) + TERMPATH="$cf_dst_eval" + ;; +esac -echo "$as_me:6786: result: $TERMPATH" >&5 + echo "$as_me:6886: result: $TERMPATH" >&5 echo "${ECHO_T}$TERMPATH" >&6 -test -n "$TERMPATH" && cat >>confdefs.h <>confdefs.h <&5 + ### use option --enable-getcap to use a hacked getcap for reading termcaps + echo "$as_me:6894: 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. @@ -6800,13 +6901,14 @@ if test "${enable_getcap+set}" = set; then else with_getcap=no fi; -echo "$as_me:6803: result: $with_getcap" >&5 + echo "$as_me:6904: result: $with_getcap" >&5 echo "${ECHO_T}$with_getcap" >&6 -test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF + test "x$with_getcap" = "xyes" && +cat >>confdefs.h <<\EOF #define USE_GETCAP 1 EOF -echo "$as_me:6809: checking if translated termcaps will be cached in ~/.terminfo" >&5 + echo "$as_me:6911: 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. @@ -6816,16 +6918,17 @@ if test "${enable_getcap_cache+set}" = set; then else with_getcap_cache=no fi; -echo "$as_me:6819: result: $with_getcap_cache" >&5 + echo "$as_me:6921: result: $with_getcap_cache" >&5 echo "${ECHO_T}$with_getcap_cache" >&6 -test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF + test "x$with_getcap_cache" = "xyes" && +cat >>confdefs.h <<\EOF #define USE_GETCAP_CACHE 1 EOF fi ### Use option --disable-home-terminfo to completely remove ~/.terminfo -echo "$as_me:6828: checking if ~/.terminfo is wanted" >&5 +echo "$as_me:6931: 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. @@ -6835,13 +6938,14 @@ if test "${enable_home_terminfo+set}" = set; then else with_home_terminfo=yes fi; -echo "$as_me:6838: result: $with_home_terminfo" >&5 +echo "$as_me:6941: result: $with_home_terminfo" >&5 echo "${ECHO_T}$with_home_terminfo" >&6 -test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF +test "x$with_home_terminfo" = "xyes" && +cat >>confdefs.h <<\EOF #define USE_HOME_TERMINFO 1 EOF -echo "$as_me:6844: checking if you want to use restricted environment when running as root" >&5 +echo "$as_me:6948: 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 # Check whether --enable-root-environ or --disable-root-environ was given. @@ -6851,9 +6955,10 @@ if test "${enable_root_environ+set}" = set; then else with_root_environ=yes fi; -echo "$as_me:6854: result: $with_root_environ" >&5 +echo "$as_me:6958: result: $with_root_environ" >&5 echo "${ECHO_T}$with_root_environ" >&6 -test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF +test "x$with_root_environ" = xyes && +cat >>confdefs.h <<\EOF #define USE_ROOT_ENVIRON 1 EOF @@ -6865,13 +6970,13 @@ for ac_func in \ unlink do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:6868: checking for $ac_func" >&5 +echo "$as_me:6973: 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 6874 "configure" +#line 6979 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6902,16 +7007,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6905: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7010: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6908: \$? = $ac_status" >&5 + echo "$as_me:7013: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6911: \"$ac_try\"") >&5 + { (eval echo "$as_me:7016: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6914: \$? = $ac_status" >&5 + echo "$as_me:7019: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6921,7 +7026,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6924: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:7029: 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:7046: 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 6947 "configure" +#line 7052 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6975,16 +7080,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6978: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7083: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6981: \$? = $ac_status" >&5 + echo "$as_me:7086: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6984: \"$ac_try\"") >&5 + { (eval echo "$as_me:7089: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6987: \$? = $ac_status" >&5 + echo "$as_me:7092: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6994,7 +7099,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6997: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:7102: 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:7113: 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 @@ -7018,7 +7123,7 @@ else eval 'ac_cv_func_'$cf_func'=error' else cat >conftest.$ac_ext <<_ACEOF -#line 7021 "configure" +#line 7126 "configure" #include "confdefs.h" #include @@ -7048,15 +7153,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:7051: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7156: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7054: \$? = $ac_status" >&5 + echo "$as_me:7159: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7056: \"$ac_try\"") >&5 + { (eval echo "$as_me:7161: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7059: \$? = $ac_status" >&5 + echo "$as_me:7164: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" @@ -7074,13 +7179,15 @@ fi test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no fi -echo "$as_me:7077: result: $cf_cv_link_funcs" >&5 +echo "$as_me:7182: result: $cf_cv_link_funcs" >&5 echo "${ECHO_T}$cf_cv_link_funcs" >&6 - test "$ac_cv_func_link" = yes && cat >>confdefs.h <<\EOF + test "$ac_cv_func_link" = yes && +cat >>confdefs.h <<\EOF #define HAVE_LINK 1 EOF - test "$ac_cv_func_symlink" = yes && cat >>confdefs.h <<\EOF + test "$ac_cv_func_symlink" = yes && +cat >>confdefs.h <<\EOF #define HAVE_SYMLINK 1 EOF @@ -7091,8 +7198,8 @@ 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 "$ac_cv_func_symlink" = yes ; then - echo "$as_me:7095: checking if tic should use symbolic links" >&5 +if test "x$ac_cv_func_symlink" = xyes ; then + echo "$as_me:7202: 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. @@ -7102,34 +7209,36 @@ if test "${enable_symlinks+set}" = set; then else with_symlinks=no fi; - echo "$as_me:7105: result: $with_symlinks" >&5 + echo "$as_me:7212: 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:7112: checking if tic should use hard links" >&5 + echo "$as_me:7219: checking if tic should use hard links" >&5 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 - if test "$ac_cv_func_link" = yes ; then + if test "x$ac_cv_func_link" = xyes ; then with_links=yes else with_links=no fi - echo "$as_me:7119: result: $with_links" >&5 + echo "$as_me:7226: result: $with_links" >&5 echo "${ECHO_T}$with_links" >&6 fi -test "$with_links" = yes && cat >>confdefs.h <<\EOF +test "x$with_links" = xyes && +cat >>confdefs.h <<\EOF #define USE_LINKS 1 EOF -test "$with_symlinks" = yes && cat >>confdefs.h <<\EOF +test "x$with_symlinks" = xyes && +cat >>confdefs.h <<\EOF #define USE_SYMLINKS 1 EOF ### use option --enable-broken-linker to force on use of broken-linker support -echo "$as_me:7132: checking if you want broken-linker support code" >&5 +echo "$as_me:7241: 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. @@ -7139,12 +7248,13 @@ if test "${enable_broken_linker+set}" = set; then else with_broken_linker=${BROKEN_LINKER:-no} fi; -echo "$as_me:7142: result: $with_broken_linker" >&5 +echo "$as_me:7251: result: $with_broken_linker" >&5 echo "${ECHO_T}$with_broken_linker" >&6 BROKEN_LINKER=0 -if test "$with_broken_linker" = yes ; then - cat >>confdefs.h <<\EOF +if test "x$with_broken_linker" = xyes ; then + +cat >>confdefs.h <<\EOF #define BROKEN_LINKER 1 EOF @@ -7152,21 +7262,22 @@ EOF elif test "$DFT_LWR_MODEL" = shared ; then case $cf_cv_system_name in #(vi cygwin*) - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define BROKEN_LINKER 1 EOF BROKEN_LINKER=1 test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 -echo "${as_me:-configure}:7162: testing cygwin linker is broken anyway ..." 1>&5 +echo "${as_me:-configure}:7273: testing cygwin linker is broken anyway ..." 1>&5 ;; esac fi ### use option --enable-bsdpad to have tputs process BSD-style prefix padding -echo "$as_me:7169: checking if tputs should process BSD-style prefix padding" >&5 +echo "$as_me:7280: 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. @@ -7176,9 +7287,10 @@ if test "${enable_bsdpad+set}" = set; then else with_bsdpad=no fi; -echo "$as_me:7179: result: $with_bsdpad" >&5 +echo "$as_me:7290: result: $with_bsdpad" >&5 echo "${ECHO_T}$with_bsdpad" >&6 -test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF +test "x$with_bsdpad" = xyes && +cat >>confdefs.h <<\EOF #define BSD_TPUTS 1 EOF @@ -7201,7 +7313,7 @@ case $host_os in #(vi aix[4-7]*) #(vi cf_xopen_source="-D_ALL_SOURCE" ;; -cygwin) #(vi +cygwin|msys) #(vi cf_XOPEN_SOURCE=600 ;; darwin[0-8].*) #(vi @@ -7231,14 +7343,14 @@ irix[56].*) #(vi ;; linux*|gnu*|mint*|k*bsd*-gnu) #(vi -echo "$as_me:7234: checking if we must define _GNU_SOURCE" >&5 +echo "$as_me:7346: 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 7241 "configure" +#line 7353 "configure" #include "confdefs.h" #include int @@ -7253,16 +7365,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7256: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7368: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7259: \$? = $ac_status" >&5 + echo "$as_me:7371: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7262: \"$ac_try\"") >&5 + { (eval echo "$as_me:7374: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7265: \$? = $ac_status" >&5 + echo "$as_me:7377: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -7271,7 +7383,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 7274 "configure" +#line 7386 "configure" #include "confdefs.h" #include int @@ -7286,16 +7398,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7289: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7401: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7292: \$? = $ac_status" >&5 + echo "$as_me:7404: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7295: \"$ac_try\"") >&5 + { (eval echo "$as_me:7407: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7298: \$? = $ac_status" >&5 + echo "$as_me:7410: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -7310,7 +7422,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7313: result: $cf_cv_gnu_source" >&5 +echo "$as_me:7425: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" @@ -7332,16 +7444,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:7335: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:7447: 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}:7341: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:7453: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 7344 "configure" +#line 7456 "configure" #include "confdefs.h" #include int @@ -7356,16 +7468,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7359: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7471: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7362: \$? = $ac_status" >&5 + echo "$as_me:7474: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7365: \"$ac_try\"") >&5 + { (eval echo "$as_me:7477: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7368: \$? = $ac_status" >&5 + echo "$as_me:7480: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -7386,7 +7498,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 7389 "configure" +#line 7501 "configure" #include "confdefs.h" #include int @@ -7401,16 +7513,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7404: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7516: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7407: \$? = $ac_status" >&5 + echo "$as_me:7519: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7410: \"$ac_try\"") >&5 + { (eval echo "$as_me:7522: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7413: \$? = $ac_status" >&5 + echo "$as_me:7525: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7421,15 +7533,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:7424: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:7536: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:7429: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:7541: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 7432 "configure" +#line 7544 "configure" #include "confdefs.h" #include int @@ -7444,16 +7556,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7447: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7559: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7450: \$? = $ac_status" >&5 + echo "$as_me:7562: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7453: \"$ac_try\"") >&5 + { (eval echo "$as_me:7565: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7456: \$? = $ac_status" >&5 + echo "$as_me:7568: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7469,7 +7581,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7472: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:7584: 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 @@ -7579,17 +7691,18 @@ sco*) #(vi ;; solaris2.*) #(vi cf_xopen_source="-D__EXTENSIONS__" + cf_cv_xopen_source=broken ;; *) -echo "$as_me:7585: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:7698: 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 7592 "configure" +#line 7705 "configure" #include "confdefs.h" #include @@ -7608,16 +7721,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7611: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7724: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7614: \$? = $ac_status" >&5 + echo "$as_me:7727: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7617: \"$ac_try\"") >&5 + { (eval echo "$as_me:7730: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7620: \$? = $ac_status" >&5 + echo "$as_me:7733: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -7626,7 +7739,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 7629 "configure" +#line 7742 "configure" #include "confdefs.h" #include @@ -7645,16 +7758,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7648: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7761: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7651: \$? = $ac_status" >&5 + echo "$as_me:7764: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7654: \"$ac_try\"") >&5 + { (eval echo "$as_me:7767: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7657: \$? = $ac_status" >&5 + echo "$as_me:7770: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -7669,7 +7782,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7672: result: $cf_cv_xopen_source" >&5 +echo "$as_me:7785: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -7777,16 +7890,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:7780: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:7893: 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}:7786: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:7899: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 7789 "configure" +#line 7902 "configure" #include "confdefs.h" #include int @@ -7801,16 +7914,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7804: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7917: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7807: \$? = $ac_status" >&5 + echo "$as_me:7920: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7810: \"$ac_try\"") >&5 + { (eval echo "$as_me:7923: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7813: \$? = $ac_status" >&5 + echo "$as_me:7926: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -7831,7 +7944,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 7834 "configure" +#line 7947 "configure" #include "confdefs.h" #include int @@ -7846,16 +7959,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7849: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7962: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7852: \$? = $ac_status" >&5 + echo "$as_me:7965: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7855: \"$ac_try\"") >&5 + { (eval echo "$as_me:7968: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7858: \$? = $ac_status" >&5 + echo "$as_me:7971: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7866,15 +7979,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:7869: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:7982: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:7874: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:7987: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 7877 "configure" +#line 7990 "configure" #include "confdefs.h" #include int @@ -7889,16 +8002,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7892: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8005: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7895: \$? = $ac_status" >&5 + echo "$as_me:8008: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7898: \"$ac_try\"") >&5 + { (eval echo "$as_me:8011: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7901: \$? = $ac_status" >&5 + echo "$as_me:8014: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7914,7 +8027,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7917: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:8030: 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 @@ -8087,10 +8200,10 @@ fi fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:8090: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:8203: 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 8093 "configure" +#line 8206 "configure" #include "confdefs.h" #include int @@ -8105,16 +8218,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8108: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8221: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8111: \$? = $ac_status" >&5 + echo "$as_me:8224: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8114: \"$ac_try\"") >&5 + { (eval echo "$as_me:8227: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8117: \$? = $ac_status" >&5 + echo "$as_me:8230: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -8123,12 +8236,12 @@ cat conftest.$ac_ext >&5 cf_XOPEN_SOURCE_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:8126: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:8239: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 if test $cf_XOPEN_SOURCE_set = yes then cat >conftest.$ac_ext <<_ACEOF -#line 8131 "configure" +#line 8244 "configure" #include "confdefs.h" #include int @@ -8143,16 +8256,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8146: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8259: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8149: \$? = $ac_status" >&5 + echo "$as_me:8262: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8152: \"$ac_try\"") >&5 + { (eval echo "$as_me:8265: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8155: \$? = $ac_status" >&5 + echo "$as_me:8268: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -8163,19 +8276,19 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext if test $cf_XOPEN_SOURCE_set_ok = no then - { echo "$as_me:8166: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:8279: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:8171: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:8284: 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 8178 "configure" +#line 8291 "configure" #include "confdefs.h" #include @@ -8194,16 +8307,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8197: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8310: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8200: \$? = $ac_status" >&5 + echo "$as_me:8313: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8203: \"$ac_try\"") >&5 + { (eval echo "$as_me:8316: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8206: \$? = $ac_status" >&5 + echo "$as_me:8319: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8212,7 +8325,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 8215 "configure" +#line 8328 "configure" #include "confdefs.h" #include @@ -8231,16 +8344,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8234: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8347: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8237: \$? = $ac_status" >&5 + echo "$as_me:8350: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8240: \"$ac_try\"") >&5 + { (eval echo "$as_me:8353: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8243: \$? = $ac_status" >&5 + echo "$as_me:8356: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8255,7 +8368,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8258: result: $cf_cv_xopen_source" >&5 +echo "$as_me:8371: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -8355,14 +8468,14 @@ fi # Work around breakage on OS X -echo "$as_me:8358: checking if SIGWINCH is defined" >&5 +echo "$as_me:8471: 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 8365 "configure" +#line 8478 "configure" #include "confdefs.h" #include @@ -8377,23 +8490,23 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8380: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8493: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8383: \$? = $ac_status" >&5 + echo "$as_me:8496: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8386: \"$ac_try\"") >&5 + { (eval echo "$as_me:8499: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8389: \$? = $ac_status" >&5 + echo "$as_me:8502: \$? = $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 8396 "configure" +#line 8509 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -8411,16 +8524,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8414: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8527: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8417: \$? = $ac_status" >&5 + echo "$as_me:8530: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8420: \"$ac_try\"") >&5 + { (eval echo "$as_me:8533: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8423: \$? = $ac_status" >&5 + echo "$as_me:8536: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=maybe else @@ -8434,11 +8547,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8437: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:8550: 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:8441: checking for actual SIGWINCH definition" >&5 +echo "$as_me:8554: 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 @@ -8449,7 +8562,7 @@ cf_sigwinch=32 while test $cf_sigwinch != 1 do cat >conftest.$ac_ext <<_ACEOF -#line 8452 "configure" +#line 8565 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -8471,16 +8584,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8474: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8587: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8477: \$? = $ac_status" >&5 + echo "$as_me:8590: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8480: \"$ac_try\"") >&5 + { (eval echo "$as_me:8593: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8483: \$? = $ac_status" >&5 + echo "$as_me:8596: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -8494,7 +8607,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1` done fi -echo "$as_me:8497: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:8610: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -8504,13 +8617,13 @@ fi # Checks for CODESET support. - echo "$as_me:8507: checking for nl_langinfo and CODESET" >&5 + echo "$as_me:8620: 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 8513 "configure" +#line 8626 "configure" #include "confdefs.h" #include int @@ -8522,16 +8635,16 @@ char* cs = nl_langinfo(CODESET); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8525: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8638: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8528: \$? = $ac_status" >&5 + echo "$as_me:8641: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8531: \"$ac_try\"") >&5 + { (eval echo "$as_me:8644: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8534: \$? = $ac_status" >&5 + echo "$as_me:8647: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else @@ -8542,7 +8655,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8545: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:8658: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test $am_cv_langinfo_codeset = yes; then @@ -8556,7 +8669,7 @@ EOF NCURSES_OK_WCHAR_T= NCURSES_OK_WINT_T= -echo "$as_me:8559: checking if you want wide-character code" >&5 +echo "$as_me:8672: 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. @@ -8566,26 +8679,29 @@ if test "${enable_widec+set}" = set; then else with_widec=no fi; -echo "$as_me:8569: result: $with_widec" >&5 +echo "$as_me:8682: result: $with_widec" >&5 echo "${ECHO_T}$with_widec" >&6 -if test "$with_widec" = yes ; then - LIB_SUFFIX="w${LIB_SUFFIX}" - cat >>confdefs.h <<\EOF +if test "x$with_widec" = xyes ; then + if test "x$disable_lib_suffixes" = xno ; then + LIB_SUFFIX="w${LIB_SUFFIX}" + fi + +cat >>confdefs.h <<\EOF #define USE_WIDEC_SUPPORT 1 EOF - cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define NCURSES_WIDECHAR 1 EOF -echo "$as_me:8581: checking if wchar.h can be used as is" >&5 +echo "$as_me:8697: 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 8588 "configure" +#line 8704 "configure" #include "confdefs.h" #include @@ -8602,16 +8718,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8605: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8721: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8608: \$? = $ac_status" >&5 + echo "$as_me:8724: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8611: \"$ac_try\"") >&5 + { (eval echo "$as_me:8727: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8614: \$? = $ac_status" >&5 + echo "$as_me:8730: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_h_okay=yes else @@ -8621,16 +8737,16 @@ cf_cv_wchar_h_okay=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8624: result: $cf_cv_wchar_h_okay" >&5 +echo "$as_me:8740: result: $cf_cv_wchar_h_okay" >&5 echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6 if test $cf_cv_wchar_h_okay = no then -echo "$as_me:8630: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "$as_me:8746: 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 8633 "configure" +#line 8749 "configure" #include "confdefs.h" #include @@ -8646,16 +8762,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8649: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8765: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8652: \$? = $ac_status" >&5 + echo "$as_me:8768: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8655: \"$ac_try\"") >&5 + { (eval echo "$as_me:8771: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8658: \$? = $ac_status" >&5 + echo "$as_me:8774: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=no else @@ -8664,16 +8780,16 @@ cat conftest.$ac_ext >&5 cf_result=yes fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:8667: result: $cf_result" >&5 +echo "$as_me:8783: 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:8673: checking checking for compatible value versus " >&5 + echo "$as_me:8789: 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 8676 "configure" +#line 8792 "configure" #include "confdefs.h" #include @@ -8689,16 +8805,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8692: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8808: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8695: \$? = $ac_status" >&5 + echo "$as_me:8811: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8698: \"$ac_try\"") >&5 + { (eval echo "$as_me:8814: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8701: \$? = $ac_status" >&5 + echo "$as_me:8817: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -8707,7 +8823,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:8710: result: $cf_result" >&5 + echo "$as_me:8826: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then # perhaps we can override it - try... @@ -8723,13 +8839,13 @@ fi 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:8726: checking for $ac_func" >&5 +echo "$as_me:8842: 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 8732 "configure" +#line 8848 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -8760,16 +8876,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8763: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8879: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8766: \$? = $ac_status" >&5 + echo "$as_me:8882: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8769: \"$ac_try\"") >&5 + { (eval echo "$as_me:8885: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8772: \$? = $ac_status" >&5 + echo "$as_me:8888: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -8779,7 +8895,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8782: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:8898: 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:8910: checking for multibyte character support" >&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 @@ -8799,7 +8915,7 @@ else cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8802 "configure" +#line 8918 "configure" #include "confdefs.h" #include @@ -8812,16 +8928,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8815: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8931: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8818: \$? = $ac_status" >&5 + echo "$as_me:8934: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8821: \"$ac_try\"") >&5 + { (eval echo "$as_me:8937: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8824: \$? = $ac_status" >&5 + echo "$as_me:8940: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_utf8_lib=yes else @@ -8833,12 +8949,12 @@ cat conftest.$ac_ext >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:8836: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:8952: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8841 "configure" +#line 8957 "configure" #include "confdefs.h" #include @@ -8851,16 +8967,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8854: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8970: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8857: \$? = $ac_status" >&5 + echo "$as_me:8973: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8860: \"$ac_try\"") >&5 + { (eval echo "$as_me:8976: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8863: \$? = $ac_status" >&5 + echo "$as_me:8979: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -8874,7 +8990,7 @@ cat conftest.$ac_ext >&5 LIBS="-lutf8 $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8877 "configure" +#line 8993 "configure" #include "confdefs.h" #include @@ -8887,16 +9003,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8890: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9006: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8893: \$? = $ac_status" >&5 + echo "$as_me:9009: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8896: \"$ac_try\"") >&5 + { (eval echo "$as_me:9012: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8899: \$? = $ac_status" >&5 + echo "$as_me:9015: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -8913,9 +9029,9 @@ cat conftest.$ac_ext >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:8916: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:9032: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:8918: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:9034: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -8931,7 +9047,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then -I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` -test "$cf_header_path" != "NONE" && \ +test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" @@ -8952,9 +9068,9 @@ fi cf_search= -test "/usr" != "$prefix" && \ +test "x/usr" != "x$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test "/usr" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr" test -d /usr/include && cf_search="$cf_search /usr/include" test -d /usr/include/utf8 && cf_search="$cf_search /usr/include/utf8" @@ -8963,7 +9079,7 @@ test -d "/usr" && \ test -d /usr/utf8/include/utf8 && cf_search="$cf_search /usr/utf8/include/utf8" } -test "$prefix" != "NONE" && \ +test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for include-directories under $prefix" @@ -8974,9 +9090,9 @@ test -d "$prefix" && \ test -d $prefix/utf8/include/utf8 && cf_search="$cf_search $prefix/utf8/include/utf8" } -test "/usr/local" != "$prefix" && \ +test "x/usr/local" != "x$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test "/usr/local" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr/local" test -d /usr/local/include && cf_search="$cf_search /usr/local/include" test -d /usr/local/include/utf8 && cf_search="$cf_search /usr/local/include/utf8" @@ -8985,9 +9101,9 @@ test -d "/usr/local" && \ test -d /usr/local/utf8/include/utf8 && cf_search="$cf_search /usr/local/utf8/include/utf8" } -test "/opt" != "$prefix" && \ +test "x/opt" != "x$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test "/opt" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /opt" test -d /opt/include && cf_search="$cf_search /opt/include" test -d /opt/include/utf8 && cf_search="$cf_search /opt/include/utf8" @@ -8996,9 +9112,9 @@ test -d "/opt" && \ test -d /opt/utf8/include/utf8 && cf_search="$cf_search /opt/utf8/include/utf8" } -test "$HOME" != "$prefix" && \ +test "x$HOME" != "x$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test "$HOME" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under $HOME" test -d $HOME/include && cf_search="$cf_search $HOME/include" test -d $HOME/include/utf8 && cf_search="$cf_search $HOME/include/utf8" @@ -9028,11 +9144,11 @@ cf_search="$cf_search $cf_header_path_list" 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}:9031: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:9147: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" cat >conftest.$ac_ext <<_ACEOF -#line 9035 "configure" +#line 9151 "configure" #include "confdefs.h" #include @@ -9045,21 +9161,21 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9048: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9164: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9051: \$? = $ac_status" >&5 + echo "$as_me:9167: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9054: \"$ac_try\"") >&5 + { (eval echo "$as_me:9170: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9057: \$? = $ac_status" >&5 + echo "$as_me:9173: \$? = $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}:9062: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:9178: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -9077,7 +9193,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:9080: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:9196: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -9093,7 +9209,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then -L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` -test "$cf_library_path" != "NONE" && \ +test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" @@ -9112,9 +9228,9 @@ fi cf_search= -test "/usr" != "$prefix" && \ +test "x/usr" != "x$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test "/usr" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr" test -d /usr/lib && cf_search="$cf_search /usr/lib" test -d /usr/lib/utf8 && cf_search="$cf_search /usr/lib/utf8" @@ -9123,7 +9239,7 @@ test -d "/usr" && \ test -d /usr/utf8/lib/utf8 && cf_search="$cf_search /usr/utf8/lib/utf8" } -test "$prefix" != "NONE" && \ +test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $prefix" @@ -9134,9 +9250,9 @@ test -d "$prefix" && \ test -d $prefix/utf8/lib/utf8 && cf_search="$cf_search $prefix/utf8/lib/utf8" } -test "/usr/local" != "$prefix" && \ +test "x/usr/local" != "x$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test "/usr/local" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" test -d /usr/local/lib/utf8 && cf_search="$cf_search /usr/local/lib/utf8" @@ -9145,9 +9261,9 @@ test -d "/usr/local" && \ test -d /usr/local/utf8/lib/utf8 && cf_search="$cf_search /usr/local/utf8/lib/utf8" } -test "/opt" != "$prefix" && \ +test "x/opt" != "x$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test "/opt" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /opt" test -d /opt/lib && cf_search="$cf_search /opt/lib" test -d /opt/lib/utf8 && cf_search="$cf_search /opt/lib/utf8" @@ -9156,9 +9272,9 @@ test -d "/opt" && \ test -d /opt/utf8/lib/utf8 && cf_search="$cf_search /opt/utf8/lib/utf8" } -test "$HOME" != "$prefix" && \ +test "x$HOME" != "x$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test "$HOME" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under $HOME" test -d $HOME/lib && cf_search="$cf_search $HOME/lib" test -d $HOME/lib/utf8 && cf_search="$cf_search $HOME/lib/utf8" @@ -9174,13 +9290,13 @@ cf_search="$cf_library_path_list $cf_search" 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}:9177: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:9293: 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 9183 "configure" +#line 9299 "configure" #include "confdefs.h" #include @@ -9193,21 +9309,21 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9196: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9312: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9199: \$? = $ac_status" >&5 + echo "$as_me:9315: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9202: \"$ac_try\"") >&5 + { (eval echo "$as_me:9318: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9205: \$? = $ac_status" >&5 + echo "$as_me:9321: \$? = $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}:9210: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:9326: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -9249,13 +9365,14 @@ fi fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9252: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:9368: 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 # ncurses/ncursesw: if test "$cf_cv_utf8_lib" = "add-on" ; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_LIBUTF8_H 1 EOF @@ -9283,7 +9400,7 @@ if test -n "$cf_cv_header_path_utf8" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 9286 "configure" +#line 9403 "configure" #include "confdefs.h" #include int @@ -9295,16 +9412,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9298: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9415: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9301: \$? = $ac_status" >&5 + echo "$as_me:9418: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9304: \"$ac_try\"") >&5 + { (eval echo "$as_me:9421: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9307: \$? = $ac_status" >&5 + echo "$as_me:9424: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9321,7 +9438,7 @@ 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}:9324: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9441: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9355,7 +9472,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}:9358: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:9475: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -9363,7 +9480,22 @@ echo "${as_me:-configure}:9358: testing adding $cf_add_libdir to library-path .. done fi - LIBS="$cf_cv_library_file_utf8 $LIBS" +cf_add_libs="$cf_cv_library_file_utf8" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +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_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + fi if test "$cf_cv_utf8_lib" != no ; then @@ -9372,14 +9504,14 @@ fi fi # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:9375: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:9507: 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 9382 "configure" +#line 9514 "configure" #include "confdefs.h" #include @@ -9397,23 +9529,23 @@ mbstate_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9400: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9532: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9403: \$? = $ac_status" >&5 + echo "$as_me:9535: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9406: \"$ac_try\"") >&5 + { (eval echo "$as_me:9538: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9409: \$? = $ac_status" >&5 + echo "$as_me:9541: \$? = $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 9416 "configure" +#line 9548 "configure" #include "confdefs.h" #include @@ -9432,16 +9564,16 @@ mbstate_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9435: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9567: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9438: \$? = $ac_status" >&5 + echo "$as_me:9570: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9441: \"$ac_try\"") >&5 + { (eval echo "$as_me:9573: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9444: \$? = $ac_status" >&5 + echo "$as_me:9576: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=yes else @@ -9453,11 +9585,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9456: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:9588: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define NEED_WCHAR_H 1 EOF @@ -9470,14 +9603,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:9473: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:9606: 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 9480 "configure" +#line 9613 "configure" #include "confdefs.h" #include @@ -9495,23 +9628,23 @@ wchar_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9498: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9631: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9501: \$? = $ac_status" >&5 + echo "$as_me:9634: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9504: \"$ac_try\"") >&5 + { (eval echo "$as_me:9637: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9507: \$? = $ac_status" >&5 + echo "$as_me:9640: \$? = $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 9514 "configure" +#line 9647 "configure" #include "confdefs.h" #include @@ -9530,16 +9663,16 @@ wchar_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9533: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9666: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9536: \$? = $ac_status" >&5 + echo "$as_me:9669: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9539: \"$ac_try\"") >&5 + { (eval echo "$as_me:9672: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9542: \$? = $ac_status" >&5 + echo "$as_me:9675: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_t=yes else @@ -9551,11 +9684,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9554: result: $cf_cv_wchar_t" >&5 +echo "$as_me:9687: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define NEED_WCHAR_H 1 EOF @@ -9573,14 +9707,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:9576: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:9710: 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 9583 "configure" +#line 9717 "configure" #include "confdefs.h" #include @@ -9598,23 +9732,23 @@ wint_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9601: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9735: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9604: \$? = $ac_status" >&5 + echo "$as_me:9738: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9607: \"$ac_try\"") >&5 + { (eval echo "$as_me:9741: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9610: \$? = $ac_status" >&5 + echo "$as_me:9744: \$? = $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 9617 "configure" +#line 9751 "configure" #include "confdefs.h" #include @@ -9633,16 +9767,16 @@ wint_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9636: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9770: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9639: \$? = $ac_status" >&5 + echo "$as_me:9773: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9642: \"$ac_try\"") >&5 + { (eval echo "$as_me:9776: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9645: \$? = $ac_status" >&5 + echo "$as_me:9779: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wint_t=yes else @@ -9654,11 +9788,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9657: result: $cf_cv_wint_t" >&5 +echo "$as_me:9791: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define NEED_WCHAR_H 1 EOF @@ -9676,7 +9811,8 @@ if test "$cf_cv_wint_t" != unknown ; then fi if test "$NCURSES_MBSTATE_T" != 0; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define NEED_MBSTATE_T_DEF 1 EOF @@ -9693,7 +9829,7 @@ case $cf_cv_abi_version in ;; esac -echo "$as_me:9696: checking whether to enable _LP64 definition in curses.h" >&5 +echo "$as_me:9832: 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. @@ -9703,10 +9839,10 @@ if test "${enable_lp64+set}" = set; then else with_lp64=$default_with_lp64 fi; -echo "$as_me:9706: result: $with_lp64" >&5 +echo "$as_me:9842: result: $with_lp64" >&5 echo "${ECHO_T}$with_lp64" >&6 -if test "$with_lp64" = yes ; then +if test "x$with_lp64" = xyes ; then cf_cv_enable_lp64=1 else cf_cv_enable_lp64=0 @@ -9719,7 +9855,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:9722: checking for special C compiler options needed for large files" >&5 + echo "$as_me:9858: 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 @@ -9731,7 +9867,7 @@ else # 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 9734 "configure" +#line 9870 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -9751,16 +9887,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9754: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9890: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9757: \$? = $ac_status" >&5 + echo "$as_me:9893: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9760: \"$ac_try\"") >&5 + { (eval echo "$as_me:9896: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9763: \$? = $ac_status" >&5 + echo "$as_me:9899: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -9770,16 +9906,16 @@ fi rm -f conftest.$ac_objext CC="$CC -n32" rm -f conftest.$ac_objext -if { (eval echo "$as_me:9773: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9909: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9776: \$? = $ac_status" >&5 + echo "$as_me:9912: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9779: \"$ac_try\"") >&5 + { (eval echo "$as_me:9915: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9782: \$? = $ac_status" >&5 + echo "$as_me:9918: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -9793,13 +9929,13 @@ rm -f conftest.$ac_objext rm -f conftest.$ac_ext fi fi -echo "$as_me:9796: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:9932: 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:9802: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:9938: 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 @@ -9807,7 +9943,7 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF -#line 9810 "configure" +#line 9946 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -9827,16 +9963,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9830: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9966: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9833: \$? = $ac_status" >&5 + echo "$as_me:9969: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9836: \"$ac_try\"") >&5 + { (eval echo "$as_me:9972: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9839: \$? = $ac_status" >&5 + echo "$as_me:9975: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -9845,7 +9981,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 9848 "configure" +#line 9984 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -9866,16 +10002,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9869: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10005: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9872: \$? = $ac_status" >&5 + echo "$as_me:10008: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9875: \"$ac_try\"") >&5 + { (eval echo "$as_me:10011: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9878: \$? = $ac_status" >&5 + echo "$as_me:10014: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -9886,7 +10022,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:9889: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:10025: 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 @@ -9896,7 +10032,7 @@ EOF fi rm -rf conftest* - echo "$as_me:9899: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:10035: 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 @@ -9904,7 +10040,7 @@ else while :; do ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF -#line 9907 "configure" +#line 10043 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -9924,16 +10060,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9927: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10063: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9930: \$? = $ac_status" >&5 + echo "$as_me:10066: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9933: \"$ac_try\"") >&5 + { (eval echo "$as_me:10069: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9936: \$? = $ac_status" >&5 + echo "$as_me:10072: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -9942,7 +10078,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 9945 "configure" +#line 10081 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -9963,16 +10099,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9966: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10102: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9969: \$? = $ac_status" >&5 + echo "$as_me:10105: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9972: \"$ac_try\"") >&5 + { (eval echo "$as_me:10108: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9975: \$? = $ac_status" >&5 + echo "$as_me:10111: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_large_files=1; break else @@ -9983,7 +10119,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:9986: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:10122: 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 @@ -9996,7 +10132,7 @@ rm -rf conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:9999: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:10135: 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 @@ -10004,7 +10140,7 @@ else while :; do ac_cv_sys_largefile_source=no cat >conftest.$ac_ext <<_ACEOF -#line 10007 "configure" +#line 10143 "configure" #include "confdefs.h" #include int @@ -10016,16 +10152,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10019: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10155: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10022: \$? = $ac_status" >&5 + echo "$as_me:10158: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10025: \"$ac_try\"") >&5 + { (eval echo "$as_me:10161: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10028: \$? = $ac_status" >&5 + echo "$as_me:10164: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -10034,7 +10170,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 10037 "configure" +#line 10173 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include @@ -10047,16 +10183,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10050: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10186: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10053: \$? = $ac_status" >&5 + echo "$as_me:10189: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10056: \"$ac_try\"") >&5 + { (eval echo "$as_me:10192: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10059: \$? = $ac_status" >&5 + echo "$as_me:10195: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_source=1; break else @@ -10067,7 +10203,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:10070: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:10206: 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 @@ -10081,13 +10217,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:10084: checking for fseeko" >&5 +echo "$as_me:10220: 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 10090 "configure" +#line 10226 "configure" #include "confdefs.h" #include int @@ -10099,16 +10235,16 @@ return fseeko && fseeko (stdin, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10102: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10238: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10105: \$? = $ac_status" >&5 + echo "$as_me:10241: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10108: \"$ac_try\"") >&5 + { (eval echo "$as_me:10244: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10111: \$? = $ac_status" >&5 + echo "$as_me:10247: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fseeko=yes else @@ -10118,7 +10254,7 @@ ac_cv_func_fseeko=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10121: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:10257: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -10139,14 +10275,14 @@ fi test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits " - echo "$as_me:10142: checking whether to use struct dirent64" >&5 + echo "$as_me:10278: 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 10149 "configure" +#line 10285 "configure" #include "confdefs.h" #include @@ -10167,16 +10303,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10170: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10306: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10173: \$? = $ac_status" >&5 + echo "$as_me:10309: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10176: \"$ac_try\"") >&5 + { (eval echo "$as_me:10312: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10179: \$? = $ac_status" >&5 + echo "$as_me:10315: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_struct_dirent64=yes else @@ -10187,16 +10323,17 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10190: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:10326: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 - test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF + test "$cf_cv_struct_dirent64" = yes && +cat >>confdefs.h <<\EOF #define HAVE_STRUCT_DIRENT64 1 EOF fi ### use option --disable-tparm-varargs to make tparm() conform to X/Open -echo "$as_me:10199: checking if you want tparm not to use X/Open fixed-parameter list" >&5 +echo "$as_me:10336: 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. @@ -10206,14 +10343,14 @@ if test "${enable_tparm_varargs+set}" = set; then else with_tparm_varargs=yes fi; -echo "$as_me:10209: result: $with_tparm_varargs" >&5 +echo "$as_me:10346: result: $with_tparm_varargs" >&5 echo "${ECHO_T}$with_tparm_varargs" >&6 NCURSES_TPARM_VARARGS=0 -test "$with_tparm_varargs" = yes && NCURSES_TPARM_VARARGS=1 +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:10216: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 +echo "$as_me:10353: 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. @@ -10223,14 +10360,14 @@ if test "${enable_tic_depends+set}" = set; then else with_tic_depends=yes fi; -echo "$as_me:10226: result: $with_tic_depends" >&5 +echo "$as_me:10363: result: $with_tic_depends" >&5 echo "${ECHO_T}$with_tic_depends" >&6 else with_tic_depends=no fi ### use option --with-bool to override bool's type -echo "$as_me:10233: checking for type of bool" >&5 +echo "$as_me:10370: 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. @@ -10240,10 +10377,10 @@ if test "${with_bool+set}" = set; then else NCURSES_BOOL=auto fi; -echo "$as_me:10243: result: $NCURSES_BOOL" >&5 +echo "$as_me:10380: result: $NCURSES_BOOL" >&5 echo "${ECHO_T}$NCURSES_BOOL" >&6 -echo "$as_me:10246: checking for alternate terminal capabilities file" >&5 +echo "$as_me:10383: 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. @@ -10254,11 +10391,11 @@ else TERMINFO_CAPS=Caps fi; test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps -echo "$as_me:10257: result: $TERMINFO_CAPS" >&5 +echo "$as_me:10394: result: $TERMINFO_CAPS" >&5 echo "${ECHO_T}$TERMINFO_CAPS" >&6 ### use option --with-chtype to override chtype's type -echo "$as_me:10261: checking for type of chtype" >&5 +echo "$as_me:10398: 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. @@ -10268,11 +10405,11 @@ if test "${with_chtype+set}" = set; then else NCURSES_CHTYPE=auto fi; -echo "$as_me:10271: result: $NCURSES_CHTYPE" >&5 +echo "$as_me:10408: result: $NCURSES_CHTYPE" >&5 echo "${ECHO_T}$NCURSES_CHTYPE" >&6 ### use option --with-ospeed to override ospeed's type -echo "$as_me:10275: checking for type of ospeed" >&5 +echo "$as_me:10412: 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. @@ -10282,11 +10419,11 @@ if test "${with_ospeed+set}" = set; then else NCURSES_OSPEED=short fi; -echo "$as_me:10285: result: $NCURSES_OSPEED" >&5 +echo "$as_me:10422: result: $NCURSES_OSPEED" >&5 echo "${ECHO_T}$NCURSES_OSPEED" >&6 ### use option --with-mmask-t to override mmask_t's type -echo "$as_me:10289: checking for type of mmask_t" >&5 +echo "$as_me:10426: 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. @@ -10296,11 +10433,11 @@ if test "${with_mmask_t+set}" = set; then else NCURSES_MMASK_T=auto fi; -echo "$as_me:10299: result: $NCURSES_MMASK_T" >&5 +echo "$as_me:10436: 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:10303: checking for size CCHARW_MAX" >&5 +echo "$as_me:10440: 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. @@ -10310,11 +10447,11 @@ if test "${with_ccharw_max+set}" = set; then else NCURSES_CCHARW_MAX=5 fi; -echo "$as_me:10313: result: $NCURSES_CCHARW_MAX" >&5 +echo "$as_me:10450: result: $NCURSES_CCHARW_MAX" >&5 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6 ### use option --with-tparm-arg to override tparm's argument type -echo "$as_me:10317: checking for type of tparm args" >&5 +echo "$as_me:10454: 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. @@ -10324,11 +10461,11 @@ if test "${with_tparm_arg+set}" = set; then else NCURSES_TPARM_ARG=long fi; -echo "$as_me:10327: result: $NCURSES_TPARM_ARG" >&5 +echo "$as_me:10464: result: $NCURSES_TPARM_ARG" >&5 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6 ### Enable compiling-in rcs id's -echo "$as_me:10331: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:10468: 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. @@ -10338,15 +10475,16 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:10341: result: $with_rcs_ids" >&5 +echo "$as_me:10478: result: $with_rcs_ids" >&5 echo "${ECHO_T}$with_rcs_ids" >&6 -test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF +test "x$with_rcs_ids" = xyes && +cat >>confdefs.h <<\EOF #define USE_RCS_IDS 1 EOF ############################################################################### -echo "$as_me:10349: checking format of man-pages" >&5 +echo "$as_me:10487: 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. @@ -10435,14 +10573,14 @@ unknown) ;; esac -echo "$as_me:10438: result: $MANPAGE_FORMAT" >&5 +echo "$as_me:10576: result: $MANPAGE_FORMAT" >&5 echo "${ECHO_T}$MANPAGE_FORMAT" >&6 if test -n "$cf_unknown" ; then - { echo "$as_me:10441: WARNING: Unexpected manpage-format $cf_unknown" >&5 + { echo "$as_me:10579: WARNING: Unexpected manpage-format $cf_unknown" >&5 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} fi -echo "$as_me:10445: checking for manpage renaming" >&5 +echo "$as_me:10583: 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. @@ -10470,7 +10608,7 @@ 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:10473: error: not a filename: $MANPAGE_RENAMES" >&5 + { { echo "$as_me:10611: error: not a filename: $MANPAGE_RENAMES" >&5 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} { (exit 1); exit 1; }; } fi @@ -10484,10 +10622,10 @@ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} fi fi -echo "$as_me:10487: result: $MANPAGE_RENAMES" >&5 +echo "$as_me:10625: result: $MANPAGE_RENAMES" >&5 echo "${ECHO_T}$MANPAGE_RENAMES" >&6 -echo "$as_me:10490: checking if manpage aliases will be installed" >&5 +echo "$as_me:10628: 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. @@ -10498,7 +10636,7 @@ else MANPAGE_ALIASES=yes fi; -echo "$as_me:10501: result: $MANPAGE_ALIASES" >&5 +echo "$as_me:10639: result: $MANPAGE_ALIASES" >&5 echo "${ECHO_T}$MANPAGE_ALIASES" >&6 case "x$LN_S" in #(vi @@ -10512,7 +10650,7 @@ esac MANPAGE_SYMLINKS=no if test "$MANPAGE_ALIASES" = yes ; then -echo "$as_me:10515: checking if manpage symlinks should be used" >&5 +echo "$as_me:10653: 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. @@ -10525,17 +10663,17 @@ fi; if test "$$cf_use_symlinks" = no; then if test "$MANPAGE_SYMLINKS" = yes ; then - { echo "$as_me:10528: WARNING: cannot make symlinks" >&5 + { echo "$as_me:10666: WARNING: cannot make symlinks" >&5 echo "$as_me: WARNING: cannot make symlinks" >&2;} MANPAGE_SYMLINKS=no fi fi -echo "$as_me:10534: result: $MANPAGE_SYMLINKS" >&5 +echo "$as_me:10672: result: $MANPAGE_SYMLINKS" >&5 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 fi -echo "$as_me:10538: checking for manpage tbl" >&5 +echo "$as_me:10676: 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. @@ -10546,7 +10684,7 @@ else MANPAGE_TBL=no fi; -echo "$as_me:10549: result: $MANPAGE_TBL" >&5 +echo "$as_me:10687: result: $MANPAGE_TBL" >&5 echo "${ECHO_T}$MANPAGE_TBL" >&6 if test "$prefix" = "NONE" ; then @@ -10593,6 +10731,7 @@ cat >$cf_edit_man <>$cf_man_alias <<-CF_EOF2 s,@DATADIR@,\$datadir,g - s,@TERMINFO@,\$TERMINFO,g - s,@NCURSES_MAJOR@,\$NCURSES_MAJOR,g - s,@NCURSES_MINOR@,\$NCURSES_MINOR,g - s,@NCURSES_PATCH@,\$NCURSES_PATCH,g - s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g + s,@TERMINFO@,\${TERMINFO:="no default value"},g + s,@TERMINFO_DIRS@,\${TERMINFO_DIRS:="no default value"},g + s,@NCURSES_MAJOR@,\${NCURSES_MAJOR:="no default value"},g + s,@NCURSES_MINOR@,\${NCURSES_MINOR:="no default value"},g + s,@NCURSES_PATCH@,\${NCURSES_PATCH:="no default value"},g + s,@NCURSES_OSPEED@,\${NCURSES_OSPEED:="no default value"},g CF_EOF for cf_name in captoinfo clear infocmp infotocap tabs tic toe tput tset @@ -10877,7 +11017,7 @@ chmod 755 $cf_edit_man ############################################################################### ### Note that some functions (such as const) are normally disabled anyway. -echo "$as_me:10880: checking if you want to build with function extensions" >&5 +echo "$as_me:11020: 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. @@ -10887,51 +11027,52 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:10890: result: $with_ext_funcs" >&5 +echo "$as_me:11030: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 -if test "$with_ext_funcs" = yes ; then +if test "x$with_ext_funcs" = xyes ; then NCURSES_EXT_FUNCS=1 - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_ASSUME_DEFAULT_COLORS 1 EOF - cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define HAVE_CURSES_VERSION 1 EOF - cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define HAVE_HAS_KEY 1 EOF - cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define HAVE_RESIZETERM 1 EOF - cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define HAVE_RESIZE_TERM 1 EOF - cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define HAVE_TERM_ENTRY_H 1 EOF - cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define HAVE_USE_DEFAULT_COLORS 1 EOF - cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define HAVE_USE_SCREEN 1 EOF - cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define HAVE_USE_WINDOW 1 EOF - cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define HAVE_WRESIZE 1 EOF - cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define NCURSES_EXT_FUNCS 1 EOF @@ -10941,7 +11082,7 @@ else GENERATED_EXT_FUNCS= fi -echo "$as_me:10944: checking if you want to build with experimental SCREEN extensions" >&5 +echo "$as_me:11085: checking if you want to build with experimental SCREEN extensions" >&5 echo $ECHO_N "checking if you want to build with experimental SCREEN extensions... $ECHO_C" >&6 # Check whether --enable-sp-funcs or --disable-sp-funcs was given. @@ -10951,11 +11092,12 @@ if test "${enable_sp_funcs+set}" = set; then else with_sp_funcs=no fi; -echo "$as_me:10954: result: $with_sp_funcs" >&5 +echo "$as_me:11095: result: $with_sp_funcs" >&5 echo "${ECHO_T}$with_sp_funcs" >&6 -if test "$with_sp_funcs" = yes ; then +if test "x$with_sp_funcs" = xyes ; then NCURSES_SP_FUNCS=1 - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define NCURSES_SP_FUNCS 1 EOF @@ -10965,7 +11107,7 @@ else GENERATED_SP_FUNCS= fi -echo "$as_me:10968: checking if you want to build with experimental terminal-driver" >&5 +echo "$as_me:11110: checking if you want to build with experimental terminal-driver" >&5 echo $ECHO_N "checking if you want to build with experimental terminal-driver... $ECHO_C" >&6 # Check whether --enable-term-driver or --disable-term-driver was given. @@ -10975,22 +11117,23 @@ if test "${enable_term_driver+set}" = set; then else with_term_driver=no fi; -echo "$as_me:10978: result: $with_term_driver" >&5 +echo "$as_me:11120: result: $with_term_driver" >&5 echo "${ECHO_T}$with_term_driver" >&6 -if test "$with_term_driver" = yes ; then - cat >>confdefs.h <<\EOF +if test "x$with_term_driver" = xyes ; then + +cat >>confdefs.h <<\EOF #define USE_TERM_DRIVER 1 EOF - if test "$with_sp_funcs" != yes ; then - { { echo "$as_me:10986: error: The term-driver option relies upon sp-funcs" >&5 + if test "x$with_sp_funcs" != xyes ; then + { { echo "$as_me:11129: 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:10993: checking for extended use of const keyword" >&5 +echo "$as_me:11136: 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. @@ -11000,15 +11143,15 @@ if test "${enable_const+set}" = set; then else with_ext_const=no fi; -echo "$as_me:11003: result: $with_ext_const" >&5 +echo "$as_me:11146: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' -if test "$with_ext_const" = yes ; then +if test "x$with_ext_const" = xyes ; then NCURSES_CONST=const fi ### use option --enable-ext-colors to turn on use of colors beyond 16. -echo "$as_me:11011: checking if you want to use extended colors" >&5 +echo "$as_me:11154: 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. @@ -11018,12 +11161,12 @@ if test "${enable_ext_colors+set}" = set; then else with_ext_colors=no fi; -echo "$as_me:11021: result: $with_ext_colors" >&5 +echo "$as_me:11164: result: $with_ext_colors" >&5 echo "${ECHO_T}$with_ext_colors" >&6 NCURSES_EXT_COLORS=0 -if test "$with_ext_colors" = yes ; then - if test "$with_widec" != yes ; then - { { echo "$as_me:11026: error: This option applies only to wide-character library" >&5 +if test "x$with_ext_colors" = xyes ; then + if test "x$with_widec" != xyes ; then + { { echo "$as_me:11169: error: This option applies only to wide-character library" >&5 echo "$as_me: error: This option applies only to wide-character library" >&2;} { (exit 1); exit 1; }; } else @@ -11034,7 +11177,7 @@ if test "${with_abi_version+set}" != set; then 5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:11037: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:11180: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -11042,14 +11185,15 @@ fi fi NCURSES_EXT_COLORS=1 - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define NCURSES_EXT_COLORS 1 EOF fi ### use option --enable-ext-mouse to modify coding to support 5-button mice -echo "$as_me:11052: checking if you want to use extended mouse encoding" >&5 +echo "$as_me:11196: 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. @@ -11059,10 +11203,10 @@ if test "${enable_ext_mouse+set}" = set; then else with_ext_mouse=no fi; -echo "$as_me:11062: result: $with_ext_mouse" >&5 +echo "$as_me:11206: result: $with_ext_mouse" >&5 echo "${ECHO_T}$with_ext_mouse" >&6 NCURSES_MOUSE_VERSION=1 -if test "$with_ext_mouse" = yes ; then +if test "x$with_ext_mouse" = xyes ; then NCURSES_MOUSE_VERSION=2 if test "${with_abi_version+set}" != set; then @@ -11070,7 +11214,7 @@ if test "${with_abi_version+set}" != set; then 5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:11073: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:11217: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -11078,7 +11222,7 @@ fi fi -echo "$as_me:11081: checking if you want \$NCURSES_NO_PADDING code" >&5 +echo "$as_me:11225: 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. @@ -11088,19 +11232,20 @@ if test "${enable_no_padding+set}" = set; then else with_no_padding=$with_ext_funcs fi; -echo "$as_me:11091: result: $with_no_padding" >&5 +echo "$as_me:11235: result: $with_no_padding" >&5 echo "${ECHO_T}$with_no_padding" >&6 -test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF +test "x$with_no_padding" = xyes && +cat >>confdefs.h <<\EOF #define NCURSES_NO_PADDING 1 EOF -echo "$as_me:11097: checking for ANSI C header files" >&5 +echo "$as_me:11242: 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 11103 "configure" +#line 11248 "configure" #include "confdefs.h" #include #include @@ -11108,13 +11253,13 @@ else #include _ACEOF -if { (eval echo "$as_me:11111: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:11256: \"$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:11117: \$? = $ac_status" >&5 + echo "$as_me:11262: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11136,7 +11281,7 @@ 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 11139 "configure" +#line 11284 "configure" #include "confdefs.h" #include @@ -11154,7 +11299,7 @@ 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 11157 "configure" +#line 11302 "configure" #include "confdefs.h" #include @@ -11175,7 +11320,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 11178 "configure" +#line 11323 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -11201,15 +11346,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11204: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11349: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11207: \$? = $ac_status" >&5 + echo "$as_me:11352: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11209: \"$ac_try\"") >&5 + { (eval echo "$as_me:11354: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11212: \$? = $ac_status" >&5 + echo "$as_me:11357: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -11222,7 +11367,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:11225: result: $ac_cv_header_stdc" >&5 +echo "$as_me:11370: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -11238,28 +11383,28 @@ 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:11241: checking for $ac_header" >&5 +echo "$as_me:11386: 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 11247 "configure" +#line 11392 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11253: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11398: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11256: \$? = $ac_status" >&5 + echo "$as_me:11401: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11259: \"$ac_try\"") >&5 + { (eval echo "$as_me:11404: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11262: \$? = $ac_status" >&5 + echo "$as_me:11407: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -11269,7 +11414,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11272: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:11417: 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:11427: 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 11288 "configure" +#line 11433 "configure" #include "confdefs.h" $ac_includes_default int @@ -11300,16 +11445,16 @@ if (sizeof (signed char)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11303: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11448: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11306: \$? = $ac_status" >&5 + echo "$as_me:11451: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11309: \"$ac_try\"") >&5 + { (eval echo "$as_me:11454: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11312: \$? = $ac_status" >&5 + echo "$as_me:11457: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signed_char=yes else @@ -11319,10 +11464,10 @@ ac_cv_type_signed_char=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11322: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:11467: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:11325: checking size of signed char" >&5 +echo "$as_me:11470: 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 @@ -11331,7 +11476,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 11334 "configure" +#line 11479 "configure" #include "confdefs.h" $ac_includes_default int @@ -11343,21 +11488,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11346: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11491: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11349: \$? = $ac_status" >&5 + echo "$as_me:11494: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11352: \"$ac_try\"") >&5 + { (eval echo "$as_me:11497: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11355: \$? = $ac_status" >&5 + echo "$as_me:11500: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 11360 "configure" +#line 11505 "configure" #include "confdefs.h" $ac_includes_default int @@ -11369,16 +11514,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11372: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11517: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11375: \$? = $ac_status" >&5 + echo "$as_me:11520: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11378: \"$ac_try\"") >&5 + { (eval echo "$as_me:11523: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11381: \$? = $ac_status" >&5 + echo "$as_me:11526: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -11394,7 +11539,7 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 11397 "configure" +#line 11542 "configure" #include "confdefs.h" $ac_includes_default int @@ -11406,16 +11551,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11409: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11554: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11412: \$? = $ac_status" >&5 + echo "$as_me:11557: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11415: \"$ac_try\"") >&5 + { (eval echo "$as_me:11560: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11418: \$? = $ac_status" >&5 + echo "$as_me:11563: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -11431,7 +11576,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext 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 11434 "configure" +#line 11579 "configure" #include "confdefs.h" $ac_includes_default int @@ -11443,16 +11588,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11446: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11591: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11449: \$? = $ac_status" >&5 + echo "$as_me:11594: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11452: \"$ac_try\"") >&5 + { (eval echo "$as_me:11597: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11455: \$? = $ac_status" >&5 + echo "$as_me:11600: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -11465,12 +11610,12 @@ done ac_cv_sizeof_signed_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:11468: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:11613: 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 11473 "configure" +#line 11618 "configure" #include "confdefs.h" $ac_includes_default int @@ -11486,15 +11631,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11489: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11634: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11492: \$? = $ac_status" >&5 + echo "$as_me:11637: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11494: \"$ac_try\"") >&5 + { (eval echo "$as_me:11639: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11497: \$? = $ac_status" >&5 + echo "$as_me:11642: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_signed_char=`cat conftest.val` else @@ -11510,7 +11655,7 @@ else ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:11513: result: $ac_cv_sizeof_signed_char" >&5 +echo "$as_me:11658: result: $ac_cv_sizeof_signed_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 cat >>confdefs.h <&5 +echo "$as_me:11669: 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. @@ -11531,12 +11676,12 @@ if test "${enable_signed_char+set}" = set; then else with_signed_char=no fi; -echo "$as_me:11534: result: $with_signed_char" >&5 +echo "$as_me:11679: result: $with_signed_char" >&5 echo "${ECHO_T}$with_signed_char" >&6 -test "$with_signed_char" != yes && NCURSES_SBOOL="char" +test "x$with_signed_char" != xyes && NCURSES_SBOOL="char" ### use option --enable-sigwinch to turn on use of SIGWINCH logic -echo "$as_me:11539: checking if you want SIGWINCH handler" >&5 +echo "$as_me:11684: 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. @@ -11546,14 +11691,15 @@ if test "${enable_sigwinch+set}" = set; then else with_sigwinch=$with_ext_funcs fi; -echo "$as_me:11549: result: $with_sigwinch" >&5 +echo "$as_me:11694: result: $with_sigwinch" >&5 echo "${ECHO_T}$with_sigwinch" >&6 -test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF +test "x$with_sigwinch" = xyes && +cat >>confdefs.h <<\EOF #define USE_SIGWINCH 1 EOF ### use option --enable-tcap-names to allow user to define new capabilities -echo "$as_me:11556: checking if you want user-definable terminal capabilities like termcap" >&5 +echo "$as_me:11702: 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. @@ -11563,15 +11709,15 @@ if test "${enable_tcap_names+set}" = set; then else with_tcap_names=$with_ext_funcs fi; -echo "$as_me:11566: result: $with_tcap_names" >&5 +echo "$as_me:11712: result: $with_tcap_names" >&5 echo "${ECHO_T}$with_tcap_names" >&6 NCURSES_XNAMES=0 -test "$with_tcap_names" = yes && NCURSES_XNAMES=1 +test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1 ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:11574: checking if you want all development code" >&5 +echo "$as_me:11720: 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. @@ -11581,11 +11727,11 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:11584: result: $with_develop" >&5 +echo "$as_me:11730: 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:11588: checking if you want hard-tabs code" >&5 +echo "$as_me:11734: 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. @@ -11595,14 +11741,15 @@ if test "${enable_hard_tabs+set}" = set; then else enable_hard_tabs=$with_develop fi; -echo "$as_me:11598: result: $enable_hard_tabs" >&5 +echo "$as_me:11744: result: $enable_hard_tabs" >&5 echo "${ECHO_T}$enable_hard_tabs" >&6 -test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF +test "x$enable_hard_tabs" = xyes && +cat >>confdefs.h <<\EOF #define USE_HARD_TABS 1 EOF ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize -echo "$as_me:11605: checking if you want limited support for xmc" >&5 +echo "$as_me:11752: 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. @@ -11612,16 +11759,17 @@ if test "${enable_xmc_glitch+set}" = set; then else enable_xmc_glitch=$with_develop fi; -echo "$as_me:11615: result: $enable_xmc_glitch" >&5 +echo "$as_me:11762: result: $enable_xmc_glitch" >&5 echo "${ECHO_T}$enable_xmc_glitch" >&6 -test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF +test "x$enable_xmc_glitch" = xyes && +cat >>confdefs.h <<\EOF #define USE_XMC_SUPPORT 1 EOF ############################################################################### # These are just experimental, probably should not be in a package: -echo "$as_me:11624: checking if you do not want to assume colors are white-on-black" >&5 +echo "$as_me:11772: 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. @@ -11631,14 +11779,15 @@ if test "${enable_assumed_color+set}" = set; then else with_assumed_color=yes fi; -echo "$as_me:11634: result: $with_assumed_color" >&5 +echo "$as_me:11782: result: $with_assumed_color" >&5 echo "${ECHO_T}$with_assumed_color" >&6 -test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF +test "x$with_assumed_color" = xyes && +cat >>confdefs.h <<\EOF #define USE_ASSUMED_COLOR 1 EOF ### use option --enable-hashmap to turn on use of hashmap scrolling logic -echo "$as_me:11641: checking if you want hashmap scrolling-optimization code" >&5 +echo "$as_me:11790: 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. @@ -11648,14 +11797,15 @@ if test "${enable_hashmap+set}" = set; then else with_hashmap=yes fi; -echo "$as_me:11651: result: $with_hashmap" >&5 +echo "$as_me:11800: result: $with_hashmap" >&5 echo "${ECHO_T}$with_hashmap" >&6 -test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF +test "x$with_hashmap" = xyes && +cat >>confdefs.h <<\EOF #define USE_HASHMAP 1 EOF ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment -echo "$as_me:11658: checking if you want colorfgbg code" >&5 +echo "$as_me:11808: 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. @@ -11665,14 +11815,15 @@ if test "${enable_colorfgbg+set}" = set; then else with_colorfgbg=no fi; -echo "$as_me:11668: result: $with_colorfgbg" >&5 +echo "$as_me:11818: result: $with_colorfgbg" >&5 echo "${ECHO_T}$with_colorfgbg" >&6 -test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF +test "x$with_colorfgbg" = xyes && +cat >>confdefs.h <<\EOF #define USE_COLORFGBG 1 EOF ### use option --enable-interop to turn on use of bindings used for interop -echo "$as_me:11675: checking if you want interop bindings" >&5 +echo "$as_me:11826: 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. @@ -11682,16 +11833,16 @@ if test "${enable_interop+set}" = set; then else with_exp_interop=no fi; -echo "$as_me:11685: result: $with_exp_interop" >&5 +echo "$as_me:11836: result: $with_exp_interop" >&5 echo "${ECHO_T}$with_exp_interop" >&6 NCURSES_INTEROP_FUNCS=0 -test "$with_exp_interop" = yes && NCURSES_INTEROP_FUNCS=1 +test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1 # This is still experimental (20080329), but should ultimately be moved to # the script-block --with-normal, etc. -echo "$as_me:11694: checking if you want to link with the pthread library" >&5 +echo "$as_me:11845: 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. @@ -11701,27 +11852,27 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:11704: result: $with_pthread" >&5 +echo "$as_me:11855: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:11708: checking for pthread.h" >&5 + echo "$as_me:11859: 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 11714 "configure" +#line 11865 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:11718: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:11869: \"$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:11724: \$? = $ac_status" >&5 + echo "$as_me:11875: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11740,22 +11891,38 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:11743: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:11894: 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 - cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define HAVE_PTHREADS_H 1 EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:11753: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:11904: 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" - LIBS="-l$cf_lib_pthread $LIBS" + +cf_add_libs="-l$cf_lib_pthread" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +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_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + cat >conftest.$ac_ext <<_ACEOF -#line 11758 "configure" +#line 11925 "configure" #include "confdefs.h" #include @@ -11772,16 +11939,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11775: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11942: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11778: \$? = $ac_status" >&5 + echo "$as_me:11945: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11781: \"$ac_try\"") >&5 + { (eval echo "$as_me:11948: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11784: \$? = $ac_status" >&5 + echo "$as_me:11951: \$? = $ac_status" >&5 (exit $ac_status); }; }; then with_pthread=yes else @@ -11791,19 +11958,35 @@ with_pthread=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:11794: result: $with_pthread" >&5 + echo "$as_me:11961: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done if test "$with_pthread" = yes ; then - LIBS="-l$cf_lib_pthread $LIBS" - cat >>confdefs.h <<\EOF + +cf_add_libs="-l$cf_lib_pthread" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +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_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + +cat >>confdefs.h <<\EOF #define HAVE_LIBPTHREADS 1 EOF else - { { echo "$as_me:11806: error: Cannot link with pthread library" >&5 + { { echo "$as_me:11989: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -11813,13 +11996,13 @@ fi fi if test "x$with_pthread" != xno; then - echo "$as_me:11816: checking for pthread_kill" >&5 + echo "$as_me:11999: 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 11822 "configure" +#line 12005 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pthread_kill (); below. */ @@ -11850,16 +12033,16 @@ f = pthread_kill; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11853: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12036: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11856: \$? = $ac_status" >&5 + echo "$as_me:12039: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11859: \"$ac_try\"") >&5 + { (eval echo "$as_me:12042: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11862: \$? = $ac_status" >&5 + echo "$as_me:12045: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_pthread_kill=yes else @@ -11869,11 +12052,11 @@ ac_cv_func_pthread_kill=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11872: result: $ac_cv_func_pthread_kill" >&5 +echo "$as_me:12055: 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 - echo "$as_me:11876: checking if you want to allow EINTR in wgetch with pthreads" >&5 + echo "$as_me:12059: 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. @@ -11883,17 +12066,18 @@ if test "${enable_pthreads_eintr+set}" = set; then else use_pthreads_eintr=no fi; - echo "$as_me:11886: result: $use_pthreads_eintr" >&5 + echo "$as_me:12069: result: $use_pthreads_eintr" >&5 echo "${ECHO_T}$use_pthreads_eintr" >&6 - if test $use_pthreads_eintr = yes ; then - cat >>confdefs.h <<\EOF + if test "x$use_pthreads_eintr" = xyes ; then + +cat >>confdefs.h <<\EOF #define USE_PTHREADS_EINTR 1 EOF fi fi - echo "$as_me:11896: checking if you want to use weak-symbols for pthreads" >&5 + echo "$as_me:12080: 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. @@ -11903,18 +12087,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; - echo "$as_me:11906: result: $use_weak_symbols" >&5 + echo "$as_me:12090: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 - if test "$use_weak_symbols" = yes ; then + if test "x$use_weak_symbols" = xyes ; then -echo "$as_me:11910: checking if $CC supports weak symbols" >&5 +echo "$as_me:12094: 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 11917 "configure" +#line 12101 "configure" #include "confdefs.h" #include @@ -11940,16 +12124,16 @@ weak_symbol(fopen); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11943: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12127: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11946: \$? = $ac_status" >&5 + echo "$as_me:12130: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11949: \"$ac_try\"") >&5 + { (eval echo "$as_me:12133: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11952: \$? = $ac_status" >&5 + echo "$as_me:12136: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_weak_symbols=yes else @@ -11960,15 +12144,16 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11963: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:12147: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else cf_cv_weak_symbols=no fi - if test $cf_cv_weak_symbols = yes ; then - cat >>confdefs.h <<\EOF + if test "x$cf_cv_weak_symbols" = xyes ; then + +cat >>confdefs.h <<\EOF #define USE_WEAK_SYMBOLS 1 EOF @@ -11976,13 +12161,14 @@ EOF fi PTHREAD= -if test "$with_pthread" = "yes" ; then - cat >>confdefs.h <<\EOF +if test "x$with_pthread" = "xyes" ; then + +cat >>confdefs.h <<\EOF #define USE_PTHREADS 1 EOF enable_reentrant=yes - if test $cf_cv_weak_symbols = yes ; then + if test "x$cf_cv_weak_symbols" = xyes ; then PTHREAD=-lpthread fi fi @@ -11991,7 +12177,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:11994: checking if you want experimental reentrant code" >&5 +echo "$as_me:12180: checking if you want experimental reentrant code" >&5 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 # Check whether --enable-reentrant or --disable-reentrant was given. @@ -12001,24 +12187,71 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=no fi; -echo "$as_me:12004: result: $with_reentrant" >&5 +echo "$as_me:12190: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 -if test "$with_reentrant" = yes ; then +if test "x$with_reentrant" = xyes ; then cf_cv_enable_reentrant=1 cf_cv_enable_opaque="NCURSES_INTERNALS" NCURSES_OPAQUE=1 NCURSES_SIZE_T=int - if test $cf_cv_weak_symbols = yes ; then + if test "x$cf_cv_weak_symbols" = xyes ; then # remove pthread library from $LIBS LIBS=`echo "$LIBS" | sed -e 's/-lpthread[ ]//g' -e 's/-lpthread$//'` - TEST_LIBS="-lpthread $TEST_LIBS" - TEST_LIBS2="-lpthread $TEST_LIBS2" +cf_add_libs="-lpthread" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $TEST_LIBS +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_libs $cf_add_1lib" +done +TEST_LIBS="$cf_add_libs" + +cf_add_libs="-lpthread" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $TEST_LIBS2 +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_libs $cf_add_1lib" +done +TEST_LIBS2="$cf_add_libs" + else - LIB_SUFFIX="t${LIB_SUFFIX}" + # when not using weak symbols but with_reentrant, + # add 't' to the library suffix on all platforms + # except cygwin, where we only do that if ALSO + # compiling with full thread support. + case "$host" in + *cygwin* | *msys*) #(vi + if test "$with_pthread" = "yes" ; then + if test "x$disable_lib_suffixes" = "xno" ; then + LIB_SUFFIX="t${LIB_SUFFIX}" + fi + fi ;; + *) + if test "x$disable_lib_suffixes" = "xno" ; then + LIB_SUFFIX="t${LIB_SUFFIX}" + fi + ;; + esac fi - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define USE_REENTRANT 1 EOF @@ -12027,7 +12260,7 @@ if test "${with_abi_version+set}" != set; then 5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:12030: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:12263: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -12042,7 +12275,7 @@ fi ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:12045: checking for prefix used to wrap public variables" >&5 + echo "$as_me:12278: 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. @@ -12052,7 +12285,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:12055: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:12288: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -12062,7 +12295,7 @@ cat >>confdefs.h <&5 +echo "$as_me:12298: 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. @@ -12072,16 +12305,17 @@ if test "${enable_safe_sprintf+set}" = set; then else with_safe_sprintf=no fi; -echo "$as_me:12075: result: $with_safe_sprintf" >&5 +echo "$as_me:12308: result: $with_safe_sprintf" >&5 echo "${ECHO_T}$with_safe_sprintf" >&6 -test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF +test "x$with_safe_sprintf" = xyes && +cat >>confdefs.h <<\EOF #define USE_SAFE_SPRINTF 1 EOF ### 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:12084: checking if you want to experiment without scrolling-hints code" >&5 +echo "$as_me:12318: 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. @@ -12091,15 +12325,16 @@ if test "${enable_scroll_hints+set}" = set; then else with_scroll_hints=yes fi; -echo "$as_me:12094: result: $with_scroll_hints" >&5 +echo "$as_me:12328: result: $with_scroll_hints" >&5 echo "${ECHO_T}$with_scroll_hints" >&6 -test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF +test "x$with_scroll_hints" = xyes && +cat >>confdefs.h <<\EOF #define USE_SCROLL_HINTS 1 EOF fi -echo "$as_me:12102: checking if you want experimental wgetch-events code" >&5 +echo "$as_me:12337: checking if you want experimental wgetch-events code" >&5 echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6 # Check whether --enable-wgetch-events or --disable-wgetch-events was given. @@ -12109,9 +12344,10 @@ if test "${enable_wgetch_events+set}" = set; then else with_wgetch_events=no fi; -echo "$as_me:12112: result: $with_wgetch_events" >&5 +echo "$as_me:12347: result: $with_wgetch_events" >&5 echo "${ECHO_T}$with_wgetch_events" >&6 -test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF +test "x$with_wgetch_events" = xyes && +cat >>confdefs.h <<\EOF #define NCURSES_WGETCH_EVENTS 1 EOF @@ -12119,7 +12355,7 @@ EOF ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:12122: checking if you want to see long compiling messages" >&5 +echo "$as_me:12358: 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. @@ -12153,10 +12389,10 @@ else ECHO_CC='' fi; -echo "$as_me:12156: result: $enableval" >&5 +echo "$as_me:12392: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -if test "$enable_echo" = yes; then +if test "x$enable_echo" = xyes; then ECHO_LINK= else ECHO_LINK='@ echo linking $@ ... ;' @@ -12165,7 +12401,7 @@ else fi ### use option --enable-warnings to turn on all gcc warnings -echo "$as_me:12168: checking if you want to see compiler warnings" >&5 +echo "$as_me:12404: 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. @@ -12173,7 +12409,7 @@ if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" with_warnings=$enableval fi; -echo "$as_me:12176: result: $with_warnings" >&5 +echo "$as_me:12412: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "x$with_warnings" = "xyes"; then @@ -12185,12 +12421,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in linux*|gnu*) - echo "$as_me:12188: checking if this is really Intel C compiler" >&5 + echo "$as_me:12424: 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 12193 "configure" +#line 12429 "configure" #include "confdefs.h" int @@ -12207,19 +12443,19 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12210: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12446: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12213: \$? = $ac_status" >&5 + echo "$as_me:12449: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12216: \"$ac_try\"") >&5 + { (eval echo "$as_me:12452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12219: \$? = $ac_status" >&5 + echo "$as_me:12455: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +cf_save_CFLAGS="$cf_save_CFLAGS -we147" else echo "$as_me: failed program was:" >&5 @@ -12227,14 +12463,63 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:12230: result: $INTEL_COMPILER" >&5 + echo "$as_me:12466: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac fi +CLANG_COMPILER=no + +if test "$GCC" = yes ; then + echo "$as_me:12475: 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 12480 "configure" +#include "confdefs.h" + +int +main () +{ + +#ifdef __clang__ +#else +make an error +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:12497: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:12500: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:12503: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12506: \$? = $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 +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$cf_save_CFLAGS" + echo "$as_me:12517: result: $CLANG_COMPILER" >&5 +echo "${ECHO_T}$CLANG_COMPILER" >&6 +fi + cat > conftest.$ac_ext <&5 + { echo "$as_me:12539: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -12267,12 +12552,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:12270: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:12555: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12273: \$? = $ac_status" >&5 + echo "$as_me:12558: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:12275: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:12560: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -12281,16 +12566,20 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:12284: checking for $CC warning options..." >&5 + { echo "$as_me:12569: 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" + test "x$CLANG_COMPILER" = xyes && cf_gcc_warnings= for cf_opt in W Wall \ Wbad-function-cast \ Wcast-align \ Wcast-qual \ + Wdeclaration-after-statement \ + Wextra \ Winline \ Wmissing-declarations \ Wmissing-prototypes \ @@ -12298,15 +12587,15 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wpointer-arith \ Wshadow \ Wstrict-prototypes \ - Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum + Wundef $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:12304: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:12593: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12307: \$? = $ac_status" >&5 + echo "$as_me:12596: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:12309: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:12598: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -12317,7 +12606,17 @@ echo "${ECHO_T}... -$cf_opt" >&6 [34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:12320: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:12609: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac + ;; + Wpointer-arith) #(vi + case $GCC_VERSION in + [12].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +echo "${as_me:-configure}:12619: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -12330,19 +12629,19 @@ echo "${as_me:-configure}:12320: testing feature is broken in gcc $GCC_VERSION . fi rm -rf conftest* - if test "$cf_with_cxx" = yes ; then + 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:12340: checking if this is really Intel C++ compiler" >&5 + echo "$as_me:12639: 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 12345 "configure" +#line 12644 "configure" #include "confdefs.h" int @@ -12359,19 +12658,19 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12362: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12661: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12365: \$? = $ac_status" >&5 + echo "$as_me:12664: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12368: \"$ac_try\"") >&5 + { (eval echo "$as_me:12667: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12371: \$? = $ac_status" >&5 + echo "$as_me:12670: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_CPLUSPLUS=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +cf_save_CFLAGS="$cf_save_CFLAGS -we147" else echo "$as_me: failed program was:" >&5 @@ -12379,12 +12678,61 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:12382: result: $INTEL_CPLUSPLUS" >&5 + echo "$as_me:12681: result: $INTEL_CPLUSPLUS" >&5 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 ;; esac fi +CLANG_CPLUSPLUS=no + +if test "$GCC" = yes ; then + echo "$as_me:12690: 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" + CXXFLAGS="$CXXFLAGS -Qunused-arguments" + cat >conftest.$ac_ext <<_ACEOF +#line 12695 "configure" +#include "confdefs.h" + +int +main () +{ + +#ifdef __clang__ +#else +make an error +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:12712: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:12715: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:12718: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12721: \$? = $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 +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CXXFLAGS="$cf_save_CFLAGS" + echo "$as_me:12732: result: $CLANG_CPLUSPLUS" >&5 +echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 +fi + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -12393,7 +12741,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat > conftest.$ac_ext <&5 + { echo "$as_me:12762: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-Wall" @@ -12428,12 +12776,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:12431: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:12779: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12434: \$? = $ac_status" >&5 + echo "$as_me:12782: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:12436: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:12784: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" fi @@ -12442,7 +12790,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GXX" = yes then - { echo "$as_me:12445: checking for $CXX warning options..." >&5 + { echo "$as_me:12793: checking for $CXX warning options..." >&5 echo "$as_me: checking for $CXX warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-W -Wall" @@ -12458,29 +12806,30 @@ echo "$as_me: checking for $CXX warning options..." >&6;} for cf_opt in \ Wabi \ fabi-version=0 \ + Wextra \ + Wignored-qualifiers \ + Wlogical-op \ Woverloaded-virtual \ Wsign-promo \ Wsynth \ Wold-style-cast \ Wcast-align \ Wcast-qual \ - Wmissing-prototypes \ Wpointer-arith \ Wshadow \ - Wstrict-prototypes \ Wundef $cf_gxx_extra_warnings Wno-unused do CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" - if { (eval echo "$as_me:12474: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:12823: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12477: \$? = $ac_status" >&5 + echo "$as_me:12826: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:12479: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:12828: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" else - test -n "$verbose" && echo "$as_me:12483: result: ... no -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:12832: result: ... no -$cf_opt" >&5 echo "${ECHO_T}... no -$cf_opt" >&6 fi done @@ -12516,10 +12865,10 @@ cat > conftest.i <&5 + { echo "$as_me:12868: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:12920: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12574: \$? = $ac_status" >&5 + echo "$as_me:12923: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:12576: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:12925: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in #(vi + noreturn) #(vi + +cat >>confdefs.h <>confdefs.h <>confdefs.h <>confdefs.h <<\EOF +#define GCC_PRINTF 1 EOF + fi + +cat >>confdefs.h <>confdefs.h <>confdefs.h <>confdefs.h <<\EOF +#define GCC_SCANF 1 EOF + fi + +cat >>confdefs.h <>confdefs.h <&5 +echo "$as_me:12984: 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. @@ -12618,27 +12991,28 @@ if test "${enable_string_hacks+set}" = set; then else with_string_hacks=no fi; -echo "$as_me:12621: result: $with_string_hacks" >&5 +echo "$as_me:12994: result: $with_string_hacks" >&5 echo "${ECHO_T}$with_string_hacks" >&6 if test "x$with_string_hacks" = "xyes"; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define USE_STRING_HACKS 1 EOF - { echo "$as_me:12629: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + { echo "$as_me:13003: 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;} for ac_func in strlcat strlcpy snprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:12635: checking for $ac_func" >&5 +echo "$as_me:13009: 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 12641 "configure" +#line 13015 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -12669,16 +13043,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12672: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13046: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12675: \$? = $ac_status" >&5 + echo "$as_me:13049: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12678: \"$ac_try\"") >&5 + { (eval echo "$as_me:13052: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12681: \$? = $ac_status" >&5 + echo "$as_me:13055: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -12688,7 +13062,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12691: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:13065: 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:13078: 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. @@ -12711,16 +13085,12 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:12714: result: $with_assertions" >&5 +echo "$as_me:13088: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then if test "$with_assertions" = no then - cat >>confdefs.h <<\EOF -#define NDEBUG 1 -EOF - CPPFLAGS="$CPPFLAGS -DNDEBUG" else @@ -12731,13 +13101,14 @@ fi ### use option --disable-leaks to suppress "permanent" leaks, for testing -echo "$as_me:12734: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:13104: 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" - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <&5 +echo "$as_me:13121: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in #(vi @@ -12841,23 +13212,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:12844: checking for dmalloc.h" >&5 + echo "$as_me:13215: 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 12850 "configure" +#line 13221 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:12854: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13225: \"$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:12860: \$? = $ac_status" >&5 + echo "$as_me:13231: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12876,11 +13247,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:12879: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:13250: 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 -echo "$as_me:12883: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:13254: 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 @@ -12888,7 +13259,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12891 "configure" +#line 13262 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12907,16 +13278,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12910: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13281: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12913: \$? = $ac_status" >&5 + echo "$as_me:13284: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12916: \"$ac_try\"") >&5 + { (eval echo "$as_me:13287: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12919: \$? = $ac_status" >&5 + echo "$as_me:13290: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -12927,7 +13298,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12930: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:13301: 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 cat >>confdefs.h <&5 +echo "$as_me:13316: 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" - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <&5 +echo "$as_me:13333: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in #(vi @@ -13052,23 +13424,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:13055: checking for dbmalloc.h" >&5 + echo "$as_me:13427: 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 13061 "configure" +#line 13433 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:13065: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13437: \"$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:13071: \$? = $ac_status" >&5 + echo "$as_me:13443: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13087,11 +13459,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13090: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:13462: 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 -echo "$as_me:13094: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:13466: 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 @@ -13099,7 +13471,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13102 "configure" +#line 13474 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13118,16 +13490,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13121: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13493: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13124: \$? = $ac_status" >&5 + echo "$as_me:13496: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13127: \"$ac_try\"") >&5 + { (eval echo "$as_me:13499: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13130: \$? = $ac_status" >&5 + echo "$as_me:13502: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -13138,7 +13510,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13141: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:13513: 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 cat >>confdefs.h <&5 +echo "$as_me:13528: 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" - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <&5 +echo "$as_me:13545: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in #(vi @@ -13262,7 +13635,7 @@ fi ;; esac -echo "$as_me:13265: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:13638: 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. @@ -13272,15 +13645,16 @@ if test "${enable_leaks+set}" = set; then else : ${with_no_leaks:=no} fi; -echo "$as_me:13275: result: $with_no_leaks" >&5 +echo "$as_me:13648: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define NO_LEAKS 1 EOF - cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define YY_NO_LEAKS 1 EOF @@ -13295,7 +13669,8 @@ EOF # Check whether --enable-expanded or --disable-expanded was given. if test "${enable_expanded+set}" = set; then enableval="$enable_expanded" - test "$enableval" = yes && cat >>confdefs.h <<\EOF + test "x$enableval" = xyes && +cat >>confdefs.h <<\EOF #define NCURSES_EXPANDED 1 EOF @@ -13306,7 +13681,8 @@ fi; # Check whether --enable-macros or --disable-macros was given. if test "${enable_macros+set}" = set; then enableval="$enable_macros" - test "$enableval" = no && cat >>confdefs.h <<\EOF + test "$enableval" = no && +cat >>confdefs.h <<\EOF #define NCURSES_NOMACROS 1 EOF @@ -13321,7 +13697,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:13324: checking whether to add trace feature to all models" >&5 +echo "$as_me:13700: 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. @@ -13331,10 +13707,10 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:13334: result: $cf_with_trace" >&5 +echo "$as_me:13710: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 -if test "$cf_with_trace" = yes ; then +if test "x$cf_with_trace" = xyes ; then LIB_TRACING=all ADA_TRACE=TRUE @@ -13421,18 +13797,39 @@ else ADA_TRACE=FALSE fi +echo "$as_me:13800: 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. +if test "${enable_gnat_projects+set}" = set; then + enableval="$enable_gnat_projects" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + enable_gnat_projects=no + else + enable_gnat_projects=yes + fi +else + enableval=yes + enable_gnat_projects=yes + +fi; +echo "$as_me:13817: result: $enable_gnat_projects" >&5 +echo "${ECHO_T}$enable_gnat_projects" >&6 + ### Checks for libraries. case $cf_cv_system_name in #(vi *mingw32*) #(vi + LIBS=" -lpsapi $LIBS" ;; *) -echo "$as_me:13429: checking for gettimeofday" >&5 +echo "$as_me:13826: 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 13435 "configure" +#line 13832 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gettimeofday (); below. */ @@ -13463,16 +13860,16 @@ f = gettimeofday; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13466: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13863: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13469: \$? = $ac_status" >&5 + echo "$as_me:13866: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13472: \"$ac_try\"") >&5 + { (eval echo "$as_me:13869: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13475: \$? = $ac_status" >&5 + echo "$as_me:13872: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gettimeofday=yes else @@ -13482,16 +13879,17 @@ ac_cv_func_gettimeofday=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13485: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:13882: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test $ac_cv_func_gettimeofday = yes; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_GETTIMEOFDAY 1 EOF else -echo "$as_me:13494: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:13892: 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 @@ -13499,7 +13897,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13502 "configure" +#line 13900 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13518,16 +13916,16 @@ gettimeofday (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13521: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13919: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13524: \$? = $ac_status" >&5 + echo "$as_me:13922: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13527: \"$ac_try\"") >&5 + { (eval echo "$as_me:13925: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13530: \$? = $ac_status" >&5 + echo "$as_me:13928: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -13538,28 +13936,44 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13541: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:13939: 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 - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_GETTIMEOFDAY 1 EOF - LIBS="-lbsd $LIBS" +cf_add_libs="-lbsd" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +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_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + fi fi ;; esac -echo "$as_me:13555: checking if -lm needed for math functions" >&5 +echo "$as_me:13969: 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 13562 "configure" +#line 13976 "configure" #include "confdefs.h" #include @@ -13568,22 +13982,22 @@ else int main () { -double x = rand(); printf("result = %g\n", sin(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:13577: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13991: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13580: \$? = $ac_status" >&5 + echo "$as_me:13994: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13583: \"$ac_try\"") >&5 + { (eval echo "$as_me:13997: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13586: \$? = $ac_status" >&5 + echo "$as_me:14000: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_libm=no else @@ -13593,7 +14007,7 @@ cf_cv_need_libm=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13596: result: $cf_cv_need_libm" >&5 +echo "$as_me:14010: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes then @@ -13601,13 +14015,13 @@ MATH_LIB=-lm fi ### Checks for header files. -echo "$as_me:13604: checking for ANSI C header files" >&5 +echo "$as_me:14018: 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 13610 "configure" +#line 14024 "configure" #include "confdefs.h" #include #include @@ -13615,13 +14029,13 @@ else #include _ACEOF -if { (eval echo "$as_me:13618: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14032: \"$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:13624: \$? = $ac_status" >&5 + echo "$as_me:14038: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13643,7 +14057,7 @@ 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 13646 "configure" +#line 14060 "configure" #include "confdefs.h" #include @@ -13661,7 +14075,7 @@ 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 13664 "configure" +#line 14078 "configure" #include "confdefs.h" #include @@ -13682,7 +14096,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 13685 "configure" +#line 14099 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -13708,15 +14122,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:13711: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14125: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13714: \$? = $ac_status" >&5 + echo "$as_me:14128: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13716: \"$ac_try\"") >&5 + { (eval echo "$as_me:14130: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13719: \$? = $ac_status" >&5 + echo "$as_me:14133: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -13729,7 +14143,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:13732: result: $ac_cv_header_stdc" >&5 +echo "$as_me:14146: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -13742,13 +14156,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:13745: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:14159: 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 13751 "configure" +#line 14165 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -13763,16 +14177,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13766: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14180: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13769: \$? = $ac_status" >&5 + echo "$as_me:14183: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13772: \"$ac_try\"") >&5 + { (eval echo "$as_me:14186: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13775: \$? = $ac_status" >&5 + echo "$as_me:14189: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -13782,7 +14196,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13785: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:14199: 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:14212: 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 @@ -13803,7 +14217,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13806 "configure" +#line 14220 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13822,16 +14236,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13825: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14239: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13828: \$? = $ac_status" >&5 + echo "$as_me:14242: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13831: \"$ac_try\"") >&5 + { (eval echo "$as_me:14245: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13834: \$? = $ac_status" >&5 + echo "$as_me:14248: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -13842,14 +14256,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13845: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:14259: 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 LIBS="$LIBS -ldir" fi else - echo "$as_me:13852: checking for opendir in -lx" >&5 + echo "$as_me:14266: 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 @@ -13857,7 +14271,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13860 "configure" +#line 14274 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13876,16 +14290,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13879: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14293: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13882: \$? = $ac_status" >&5 + echo "$as_me:14296: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13885: \"$ac_try\"") >&5 + { (eval echo "$as_me:14299: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13888: \$? = $ac_status" >&5 + echo "$as_me:14302: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -13896,7 +14310,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13899: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:14313: 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 LIBS="$LIBS -lx" @@ -13904,13 +14318,13 @@ fi fi -echo "$as_me:13907: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:14321: 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 13913 "configure" +#line 14327 "configure" #include "confdefs.h" #include #include @@ -13926,16 +14340,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13929: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14343: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13932: \$? = $ac_status" >&5 + echo "$as_me:14346: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13935: \"$ac_try\"") >&5 + { (eval echo "$as_me:14349: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13938: \$? = $ac_status" >&5 + echo "$as_me:14352: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -13945,7 +14359,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13948: result: $ac_cv_header_time" >&5 +echo "$as_me:14362: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -13964,13 +14378,13 @@ mingw*) ;; esac -echo "$as_me:13967: checking for regcomp" >&5 +echo "$as_me:14381: 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 13973 "configure" +#line 14387 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char regcomp (); below. */ @@ -14001,16 +14415,16 @@ f = regcomp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14004: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14418: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14007: \$? = $ac_status" >&5 + echo "$as_me:14421: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14010: \"$ac_try\"") >&5 + { (eval echo "$as_me:14424: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14013: \$? = $ac_status" >&5 + echo "$as_me:14427: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_regcomp=yes else @@ -14020,7 +14434,7 @@ ac_cv_func_regcomp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14023: result: $ac_cv_func_regcomp" >&5 +echo "$as_me:14437: 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 @@ -14029,7 +14443,7 @@ else 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:14032: checking for regcomp in -l$cf_regex_lib" >&5 +echo "$as_me:14446: 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 @@ -14037,7 +14451,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_regex_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14040 "configure" +#line 14454 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14056,16 +14470,16 @@ regcomp (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14059: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14473: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14062: \$? = $ac_status" >&5 + echo "$as_me:14476: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14065: \"$ac_try\"") >&5 + { (eval echo "$as_me:14479: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14068: \$? = $ac_status" >&5 + echo "$as_me:14482: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -14076,11 +14490,26 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14079: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:14493: 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 - LIBS="-l$cf_regex_lib $LIBS" +cf_add_libs="-l$cf_regex_lib" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +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_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + cf_regex_func=regcomp break fi @@ -14090,13 +14519,13 @@ fi fi if test "$cf_regex_func" = no ; then - echo "$as_me:14093: checking for compile" >&5 + echo "$as_me:14522: 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 cat >conftest.$ac_ext <<_ACEOF -#line 14099 "configure" +#line 14528 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char compile (); below. */ @@ -14127,16 +14556,16 @@ f = compile; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14130: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14559: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14133: \$? = $ac_status" >&5 + echo "$as_me:14562: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14136: \"$ac_try\"") >&5 + { (eval echo "$as_me:14565: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14139: \$? = $ac_status" >&5 + echo "$as_me:14568: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_compile=yes else @@ -14146,13 +14575,13 @@ ac_cv_func_compile=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14149: result: $ac_cv_func_compile" >&5 +echo "$as_me:14578: 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:14155: checking for compile in -lgen" >&5 + echo "$as_me:14584: 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 @@ -14160,7 +14589,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14163 "configure" +#line 14592 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14179,16 +14608,16 @@ compile (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14182: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14611: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14185: \$? = $ac_status" >&5 + echo "$as_me:14614: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14188: \"$ac_try\"") >&5 + { (eval echo "$as_me:14617: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14191: \$? = $ac_status" >&5 + echo "$as_me:14620: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gen_compile=yes else @@ -14199,11 +14628,26 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14202: result: $ac_cv_lib_gen_compile" >&5 +echo "$as_me:14631: 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 - LIBS="-lgen $LIBS" +cf_add_libs="-lgen" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +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_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + cf_regex_func=compile fi @@ -14212,11 +14656,11 @@ fi fi if test "$cf_regex_func" = no ; then - { echo "$as_me:14215: WARNING: cannot find regular expression library" >&5 + { echo "$as_me:14659: WARNING: cannot find regular expression library" >&5 echo "$as_me: WARNING: cannot find regular expression library" >&2;} fi -echo "$as_me:14219: checking for regular-expression headers" >&5 +echo "$as_me:14663: 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 @@ -14228,7 +14672,7 @@ compile) #(vi for cf_regex_hdr in regexp.h regexpr.h do cat >conftest.$ac_ext <<_ACEOF -#line 14231 "configure" +#line 14675 "configure" #include "confdefs.h" #include <$cf_regex_hdr> int @@ -14243,16 +14687,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14246: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14690: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14249: \$? = $ac_status" >&5 + echo "$as_me:14693: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14252: \"$ac_try\"") >&5 + { (eval echo "$as_me:14696: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14255: \$? = $ac_status" >&5 + echo "$as_me:14699: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -14269,7 +14713,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext for cf_regex_hdr in regex.h do cat >conftest.$ac_ext <<_ACEOF -#line 14272 "configure" +#line 14716 "configure" #include "confdefs.h" #include #include <$cf_regex_hdr> @@ -14287,16 +14731,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14290: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14734: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14293: \$? = $ac_status" >&5 + echo "$as_me:14737: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14296: \"$ac_try\"") >&5 + { (eval echo "$as_me:14740: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14299: \$? = $ac_status" >&5 + echo "$as_me:14743: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -14312,21 +14756,24 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext esac fi -echo "$as_me:14315: result: $cf_cv_regex_hdrs" >&5 +echo "$as_me:14759: result: $cf_cv_regex_hdrs" >&5 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 case $cf_cv_regex_hdrs in #(vi - no) { echo "$as_me:14319: WARNING: no regular expression header found" >&5 + no) { echo "$as_me:14763: WARNING: no regular expression header found" >&5 echo "$as_me: WARNING: no regular expression header found" >&2;} ;; #(vi - regex.h) cat >>confdefs.h <<\EOF + regex.h) +cat >>confdefs.h <<\EOF #define HAVE_REGEX_H_FUNCS 1 EOF ;; #(vi - regexp.h) cat >>confdefs.h <<\EOF + regexp.h) +cat >>confdefs.h <<\EOF #define HAVE_REGEXP_H_FUNCS 1 EOF ;; #(vi - regexpr.h) cat >>confdefs.h <<\EOF + regexpr.h) +cat >>confdefs.h <<\EOF #define HAVE_REGEXPR_H_FUNCS 1 EOF ;; @@ -14352,23 +14799,23 @@ wctype.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:14355: checking for $ac_header" >&5 +echo "$as_me:14802: 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 14361 "configure" +#line 14808 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14365: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14812: \"$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:14371: \$? = $ac_status" >&5 + echo "$as_me:14818: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14387,7 +14834,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14390: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:14837: 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:14850: 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 14409 "configure" +#line 14856 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14413: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14860: \"$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:14419: \$? = $ac_status" >&5 + echo "$as_me:14866: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14435,7 +14882,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14438: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:14885: 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:14895: checking for header declaring getopt variables" >&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 @@ -14455,7 +14902,7 @@ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h do cat >conftest.$ac_ext <<_ACEOF -#line 14458 "configure" +#line 14905 "configure" #include "confdefs.h" #include <$cf_header> @@ -14468,16 +14915,16 @@ int x = optind; char *y = optarg } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14471: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14918: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14474: \$? = $ac_status" >&5 + echo "$as_me:14921: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14477: \"$ac_try\"") >&5 + { (eval echo "$as_me:14924: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14480: \$? = $ac_status" >&5 + echo "$as_me:14927: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_getopt_header=$cf_header break @@ -14489,10 +14936,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:14492: result: $cf_cv_getopt_header" >&5 +echo "$as_me:14939: 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 + +cat >>confdefs.h <<\EOF #define HAVE_GETOPT_HEADER 1 EOF @@ -14500,9 +14948,9 @@ fi # check for ISC (this may also define _POSIX_SOURCE) # Note: even non-Posix ISC needs to declare fd_set -if test "$ISC" = yes ; then +if test "x$ISC" = xyes ; then -echo "$as_me:14505: checking for main in -lcposix" >&5 +echo "$as_me:14953: 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 @@ -14510,7 +14958,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14513 "configure" +#line 14961 "configure" #include "confdefs.h" int @@ -14522,16 +14970,16 @@ main (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14525: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14973: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14528: \$? = $ac_status" >&5 + echo "$as_me:14976: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14531: \"$ac_try\"") >&5 + { (eval echo "$as_me:14979: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14534: \$? = $ac_status" >&5 + echo "$as_me:14982: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cposix_main=yes else @@ -14542,7 +14990,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14545: result: $ac_cv_lib_cposix_main" >&5 +echo "$as_me:14993: 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 "$as_me:15004: checking for bzero in -linet" >&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 @@ -14561,7 +15009,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-linet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14564 "configure" +#line 15012 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14580,16 +15028,16 @@ bzero (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14583: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15031: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14586: \$? = $ac_status" >&5 + echo "$as_me:15034: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14589: \"$ac_try\"") >&5 + { (eval echo "$as_me:15037: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14592: \$? = $ac_status" >&5 + echo "$as_me:15040: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_inet_bzero=yes else @@ -14600,21 +15048,37 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14603: result: $ac_cv_lib_inet_bzero" >&5 +echo "$as_me:15051: 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 - LIBS="-linet $LIBS" + +cf_add_libs="-linet" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +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_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + fi fi -echo "$as_me:14610: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:15074: 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 14617 "configure" +#line 15081 "configure" #include "confdefs.h" #include @@ -14634,16 +15098,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14637: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15101: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14640: \$? = $ac_status" >&5 + echo "$as_me:15104: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14643: \"$ac_try\"") >&5 + { (eval echo "$as_me:15107: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14646: \$? = $ac_status" >&5 + echo "$as_me:15110: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sys_time_select=yes else @@ -14655,9 +15119,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14658: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:15122: 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 +test "$cf_cv_sys_time_select" = yes && +cat >>confdefs.h <<\EOF #define HAVE_SYS_TIME_SELECT 1 EOF @@ -14669,104 +15134,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -echo "$as_me:14672: 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 14680 "configure" -#include "confdefs.h" -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -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:14729: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:14732: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14735: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14738: \$? = $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 -fi -rm -f conftest.$ac_objext -done -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:14755: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:14758: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; -esac - -echo "$as_me:14763: checking for an ANSI C-conforming const" >&5 +echo "$as_me:15137: 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 14769 "configure" +#line 15143 "configure" #include "confdefs.h" int @@ -14824,16 +15198,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14827: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15201: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14830: \$? = $ac_status" >&5 + echo "$as_me:15204: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14833: \"$ac_try\"") >&5 + { (eval echo "$as_me:15207: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14836: \$? = $ac_status" >&5 + echo "$as_me:15210: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -14843,7 +15217,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14846: result: $ac_cv_c_const" >&5 +echo "$as_me:15220: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -14853,7 +15227,7 @@ EOF fi -echo "$as_me:14856: checking for inline" >&5 +echo "$as_me:15230: 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 @@ -14861,7 +15235,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 14864 "configure" +#line 15238 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -14870,16 +15244,16 @@ $ac_kw int foo () {return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14873: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15247: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14876: \$? = $ac_status" >&5 + echo "$as_me:15250: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14879: \"$ac_try\"") >&5 + { (eval echo "$as_me:15253: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14882: \$? = $ac_status" >&5 + echo "$as_me:15256: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -14890,7 +15264,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:14893: result: $ac_cv_c_inline" >&5 +echo "$as_me:15267: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -14909,11 +15283,14 @@ NCURSES_INLINE= if test "$ac_cv_c_inline" != no ; then NCURSES_INLINE=inline if test "$INTEL_COMPILER" = yes + then + : + elif test "$CLANG_COMPILER" = yes then : elif test "$GCC" = yes then - echo "$as_me:14916: checking if $CC supports options to tune inlining" >&5 + echo "$as_me:15293: 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 @@ -14922,7 +15299,7 @@ else cf_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS --param max-inline-insns-single=1200" cat >conftest.$ac_ext <<_ACEOF -#line 14925 "configure" +#line 15302 "configure" #include "confdefs.h" inline int foo(void) { return 1; } int @@ -14934,16 +15311,16 @@ ${cf_cv_main_return:-return} foo() } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14937: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15314: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14940: \$? = $ac_status" >&5 + echo "$as_me:15317: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14943: \"$ac_try\"") >&5 + { (eval echo "$as_me:15320: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14946: \$? = $ac_status" >&5 + echo "$as_me:15323: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gcc_inline=yes else @@ -14955,7 +15332,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS=$cf_save_CFLAGS fi -echo "$as_me:14958: result: $cf_cv_gcc_inline" >&5 +echo "$as_me:15335: result: $cf_cv_gcc_inline" >&5 echo "${ECHO_T}$cf_cv_gcc_inline" >&6 if test "$cf_cv_gcc_inline" = yes ; then @@ -15041,7 +15418,7 @@ fi fi fi -echo "$as_me:15044: checking for signal global datatype" >&5 +echo "$as_me:15421: 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 @@ -15053,7 +15430,7 @@ else "int" do cat >conftest.$ac_ext <<_ACEOF -#line 15056 "configure" +#line 15433 "configure" #include "confdefs.h" #include @@ -15076,16 +15453,16 @@ signal(SIGINT, handler); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15079: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15456: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15082: \$? = $ac_status" >&5 + echo "$as_me:15459: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15085: \"$ac_try\"") >&5 + { (eval echo "$as_me:15462: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15088: \$? = $ac_status" >&5 + echo "$as_me:15465: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -15099,15 +15476,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15102: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:15479: 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 <>confdefs.h <&5 +echo "$as_me:15488: 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 @@ -15117,7 +15495,7 @@ else cf_cv_typeof_chtype=long else cat >conftest.$ac_ext <<_ACEOF -#line 15120 "configure" +#line 15498 "configure" #include "confdefs.h" #define WANT_BITS 31 @@ -15152,15 +15530,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15155: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15533: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15158: \$? = $ac_status" >&5 + echo "$as_me:15536: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15160: \"$ac_try\"") >&5 + { (eval echo "$as_me:15538: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15163: \$? = $ac_status" >&5 + echo "$as_me:15541: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_typeof_chtype=`cat cf_test.out` else @@ -15175,7 +15553,7 @@ fi fi -echo "$as_me:15178: result: $cf_cv_typeof_chtype" >&5 +echo "$as_me:15556: result: $cf_cv_typeof_chtype" >&5 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 cat >>confdefs.h <&5 +echo "$as_me:15568: 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 15197 "configure" +#line 15575 "configure" #include "confdefs.h" int @@ -15206,16 +15584,16 @@ long x = 1L + 1UL + 1U + 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15209: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15587: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15212: \$? = $ac_status" >&5 + echo "$as_me:15590: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15215: \"$ac_try\"") >&5 + { (eval echo "$as_me:15593: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15218: \$? = $ac_status" >&5 + echo "$as_me:15596: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_unsigned_literals=yes else @@ -15227,7 +15605,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15230: result: $cf_cv_unsigned_literals" >&5 +echo "$as_me:15608: result: $cf_cv_unsigned_literals" >&5 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 cf_cv_1UL="1" @@ -15243,14 +15621,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t="" ### Checks for external-data -echo "$as_me:15246: checking if external errno is declared" >&5 +echo "$as_me:15624: 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 15253 "configure" +#line 15631 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -15268,16 +15646,16 @@ int x = (int) errno } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15271: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15649: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15274: \$? = $ac_status" >&5 + echo "$as_me:15652: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15277: \"$ac_try\"") >&5 + { (eval echo "$as_me:15655: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15280: \$? = $ac_status" >&5 + echo "$as_me:15658: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_errno=yes else @@ -15288,7 +15666,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15291: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:15669: result: $cf_cv_dcl_errno" >&5 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then @@ -15303,14 +15681,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:15306: checking if external errno exists" >&5 +echo "$as_me:15684: 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 15313 "configure" +#line 15691 "configure" #include "confdefs.h" #undef errno @@ -15325,16 +15703,16 @@ errno = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15328: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15706: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15331: \$? = $ac_status" >&5 + echo "$as_me:15709: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15334: \"$ac_try\"") >&5 + { (eval echo "$as_me:15712: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15337: \$? = $ac_status" >&5 + echo "$as_me:15715: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_errno=yes else @@ -15345,7 +15723,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15348: result: $cf_cv_have_errno" >&5 +echo "$as_me:15726: result: $cf_cv_have_errno" >&5 echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then @@ -15358,7 +15736,7 @@ EOF fi -echo "$as_me:15361: checking if data-only library module links" >&5 +echo "$as_me:15739: 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 @@ -15366,20 +15744,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:15750: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15375: \$? = $ac_status" >&5 + echo "$as_me:15753: \$? = $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:15773: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15398: \$? = $ac_status" >&5 + echo "$as_me:15776: \$? = $ac_status" >&5 (exit $ac_status); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -15408,7 +15786,7 @@ EOF cf_cv_link_dataonly=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 15411 "configure" +#line 15789 "configure" #include "confdefs.h" int main() @@ -15419,15 +15797,15 @@ else _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15422: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15800: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15425: \$? = $ac_status" >&5 + echo "$as_me:15803: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15427: \"$ac_try\"") >&5 + { (eval echo "$as_me:15805: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15430: \$? = $ac_status" >&5 + echo "$as_me:15808: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_dataonly=yes else @@ -15442,11 +15820,12 @@ fi fi -echo "$as_me:15445: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:15823: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define BROKEN_LINKER 1 EOF @@ -15462,10 +15841,12 @@ geteuid \ getttynam \ issetugid \ poll \ +putenv \ remove \ select \ setbuf \ setbuffer \ +setenv \ setvbuf \ sigaction \ sigvec \ @@ -15477,13 +15858,13 @@ vsnprintf \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:15480: checking for $ac_func" >&5 +echo "$as_me:15861: 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 15486 "configure" +#line 15867 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -15514,16 +15895,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15517: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15898: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15520: \$? = $ac_status" >&5 + echo "$as_me:15901: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15523: \"$ac_try\"") >&5 + { (eval echo "$as_me:15904: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15526: \$? = $ac_status" >&5 + echo "$as_me:15907: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -15533,7 +15914,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15536: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:15917: 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:15929: 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 15555 "configure" +#line 15936 "configure" #include "confdefs.h" #include @@ -15572,16 +15953,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15575: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15956: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15578: \$? = $ac_status" >&5 + echo "$as_me:15959: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15581: \"$ac_try\"") >&5 + { (eval echo "$as_me:15962: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15584: \$? = $ac_status" >&5 + echo "$as_me:15965: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent=yes else @@ -15592,23 +15973,24 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15595: result: $cf_cv_cgetent" >&5 +echo "$as_me:15976: result: $cf_cv_cgetent" >&5 echo "${ECHO_T}$cf_cv_cgetent" >&6 if test "$cf_cv_cgetent" = yes then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_BSD_CGETENT 1 EOF -echo "$as_me:15604: checking if cgetent uses const parameter" >&5 +echo "$as_me:15986: 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 15611 "configure" +#line 15993 "configure" #include "confdefs.h" #include @@ -15630,16 +16012,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15633: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16015: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15636: \$? = $ac_status" >&5 + echo "$as_me:16018: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15639: \"$ac_try\"") >&5 + { (eval echo "$as_me:16021: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15642: \$? = $ac_status" >&5 + echo "$as_me:16024: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent_const=yes else @@ -15650,11 +16032,12 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15653: result: $cf_cv_cgetent_const" >&5 +echo "$as_me:16035: result: $cf_cv_cgetent_const" >&5 echo "${ECHO_T}$cf_cv_cgetent_const" >&6 if test "$cf_cv_cgetent_const" = yes then - cat >>confdefs.h <>confdefs.h <&5 +echo "$as_me:16049: 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 15673 "configure" +#line 16056 "configure" #include "confdefs.h" #include int @@ -15682,16 +16065,16 @@ int x = isascii(' ') } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15685: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16068: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15688: \$? = $ac_status" >&5 + echo "$as_me:16071: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15691: \"$ac_try\"") >&5 + { (eval echo "$as_me:16074: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15694: \$? = $ac_status" >&5 + echo "$as_me:16077: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_isascii=yes else @@ -15702,17 +16085,18 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15705: result: $cf_cv_have_isascii" >&5 +echo "$as_me:16088: result: $cf_cv_have_isascii" >&5 echo "${ECHO_T}$cf_cv_have_isascii" >&6 -test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF +test "$cf_cv_have_isascii" = yes && +cat >>confdefs.h <<\EOF #define HAVE_ISASCII 1 EOF if test "$ac_cv_func_sigaction" = yes; then -echo "$as_me:15712: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "$as_me:16096: 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 15715 "configure" +#line 16099 "configure" #include "confdefs.h" #include @@ -15726,16 +16110,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15729: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16113: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15732: \$? = $ac_status" >&5 + echo "$as_me:16116: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15735: \"$ac_try\"") >&5 + { (eval echo "$as_me:16119: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15738: \$? = $ac_status" >&5 + echo "$as_me:16122: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=no else @@ -15743,7 +16127,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 15746 "configure" +#line 16130 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -15758,19 +16142,20 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15761: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16145: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15764: \$? = $ac_status" >&5 + echo "$as_me:16148: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15767: \"$ac_try\"") >&5 + { (eval echo "$as_me:16151: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15770: \$? = $ac_status" >&5 + echo "$as_me:16154: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=yes - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define _POSIX_SOURCE 1 EOF @@ -15782,11 +16167,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:15785: result: $sigact_bad" >&5 +echo "$as_me:16170: result: $sigact_bad" >&5 echo "${ECHO_T}$sigact_bad" >&6 fi -echo "$as_me:15789: checking if nanosleep really works" >&5 +echo "$as_me:16174: 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 @@ -15796,7 +16181,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_nanosleep=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 15799 "configure" +#line 16184 "configure" #include "confdefs.h" #include @@ -15821,15 +16206,15 @@ int main() { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15824: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16209: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15827: \$? = $ac_status" >&5 + echo "$as_me:16212: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15829: \"$ac_try\"") >&5 + { (eval echo "$as_me:16214: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15832: \$? = $ac_status" >&5 + echo "$as_me:16217: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_nanosleep=yes else @@ -15841,10 +16226,11 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:15844: result: $cf_cv_func_nanosleep" >&5 +echo "$as_me:16229: result: $cf_cv_func_nanosleep" >&5 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 -test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF +test "$cf_cv_func_nanosleep" = "yes" && +cat >>confdefs.h <<\EOF #define HAVE_NANOSLEEP 1 EOF @@ -15855,23 +16241,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:15858: checking for $ac_header" >&5 +echo "$as_me:16244: 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 15864 "configure" +#line 16250 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:15868: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16254: \"$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:15874: \$? = $ac_status" >&5 + echo "$as_me:16260: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15890,7 +16276,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:15893: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16279: 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:16294: 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 15914 "configure" +#line 16300 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:15918: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16304: \"$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:15924: \$? = $ac_status" >&5 + echo "$as_me:16310: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15940,7 +16326,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:15943: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16329: 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:16347: 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 15964 "configure" +#line 16350 "configure" #include "confdefs.h" #include int @@ -15973,16 +16359,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15976: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16362: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15979: \$? = $ac_status" >&5 + echo "$as_me:16365: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15982: \"$ac_try\"") >&5 + { (eval echo "$as_me:16368: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15985: \$? = $ac_status" >&5 + echo "$as_me:16371: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=no else @@ -15990,7 +16376,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 15993 "configure" +#line 16379 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -16004,22 +16390,23 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16007: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16393: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16010: \$? = $ac_status" >&5 + echo "$as_me:16396: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16013: \"$ac_try\"") >&5 + { (eval echo "$as_me:16399: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16016: \$? = $ac_status" >&5 + echo "$as_me:16402: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=unknown else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -termios_bad=yes cat >>confdefs.h <<\EOF +termios_bad=yes +cat >>confdefs.h <<\EOF #define _POSIX_SOURCE 1 EOF @@ -16028,19 +16415,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:16031: result: $termios_bad" >&5 + echo "$as_me:16418: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:16036: checking for tcgetattr" >&5 +echo "$as_me:16423: 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 16043 "configure" +#line 16430 "configure" #include "confdefs.h" #include @@ -16068,16 +16455,16 @@ tcgetattr(1, &foo); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16071: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16458: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16074: \$? = $ac_status" >&5 + echo "$as_me:16461: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16077: \"$ac_try\"") >&5 + { (eval echo "$as_me:16464: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16080: \$? = $ac_status" >&5 + echo "$as_me:16467: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_tcgetattr=yes else @@ -16087,20 +16474,21 @@ cf_cv_have_tcgetattr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16090: result: $cf_cv_have_tcgetattr" >&5 +echo "$as_me:16477: result: $cf_cv_have_tcgetattr" >&5 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 -test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF +test "$cf_cv_have_tcgetattr" = yes && +cat >>confdefs.h <<\EOF #define HAVE_TCGETATTR 1 EOF -echo "$as_me:16096: checking for vsscanf function or workaround" >&5 +echo "$as_me:16484: 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 16103 "configure" +#line 16491 "configure" #include "confdefs.h" #include @@ -16116,16 +16504,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16119: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16507: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16122: \$? = $ac_status" >&5 + echo "$as_me:16510: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16125: \"$ac_try\"") >&5 + { (eval echo "$as_me:16513: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16128: \$? = $ac_status" >&5 + echo "$as_me:16516: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vsscanf else @@ -16133,7 +16521,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 16136 "configure" +#line 16524 "configure" #include "confdefs.h" #include @@ -16155,16 +16543,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16158: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16546: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16161: \$? = $ac_status" >&5 + echo "$as_me:16549: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16164: \"$ac_try\"") >&5 + { (eval echo "$as_me:16552: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16167: \$? = $ac_status" >&5 + echo "$as_me:16555: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vfscanf else @@ -16172,7 +16560,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 16175 "configure" +#line 16563 "configure" #include "confdefs.h" #include @@ -16194,16 +16582,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16197: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16585: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16200: \$? = $ac_status" >&5 + echo "$as_me:16588: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16203: \"$ac_try\"") >&5 + { (eval echo "$as_me:16591: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16206: \$? = $ac_status" >&5 + echo "$as_me:16594: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=_doscan else @@ -16218,25 +16606,28 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16221: result: $cf_cv_func_vsscanf" >&5 +echo "$as_me:16609: result: $cf_cv_func_vsscanf" >&5 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 case $cf_cv_func_vsscanf in #(vi -vsscanf) cat >>confdefs.h <<\EOF +vsscanf) +cat >>confdefs.h <<\EOF #define HAVE_VSSCANF 1 EOF ;; #(vi -vfscanf) cat >>confdefs.h <<\EOF +vfscanf) +cat >>confdefs.h <<\EOF #define HAVE_VFSCANF 1 EOF ;; #(vi -_doscan) cat >>confdefs.h <<\EOF +_doscan) +cat >>confdefs.h <<\EOF #define HAVE__DOSCAN 1 EOF ;; esac -echo "$as_me:16239: checking for working mkstemp" >&5 +echo "$as_me:16630: 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 @@ -16247,7 +16638,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 16250 "configure" +#line 16641 "configure" #include "confdefs.h" #include @@ -16285,15 +16676,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16288: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16679: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16291: \$? = $ac_status" >&5 + echo "$as_me:16682: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16293: \"$ac_try\"") >&5 + { (eval echo "$as_me:16684: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16296: \$? = $ac_status" >&5 + echo "$as_me:16687: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -16308,16 +16699,16 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:16311: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:16702: 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:16314: checking for mkstemp" >&5 + echo "$as_me:16705: 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 16320 "configure" +#line 16711 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mkstemp (); below. */ @@ -16348,16 +16739,16 @@ f = mkstemp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16351: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16742: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16354: \$? = $ac_status" >&5 + echo "$as_me:16745: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16357: \"$ac_try\"") >&5 + { (eval echo "$as_me:16748: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16360: \$? = $ac_status" >&5 + echo "$as_me:16751: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -16367,12 +16758,13 @@ ac_cv_func_mkstemp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16370: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:16761: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_MKSTEMP 1 EOF @@ -16386,22 +16778,22 @@ else HAVE_VSSCANF=0 fi -if test "$cross_compiling" = yes ; then - { echo "$as_me:16390: WARNING: cross compiling: assume setvbuf params not reversed" >&5 +if test "x$cross_compiling" = xyes ; then + { echo "$as_me:16782: 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:16393: checking whether setvbuf arguments are reversed" >&5 + echo "$as_me:16785: 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:16399: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:16791: 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 16404 "configure" +#line 16796 "configure" #include "confdefs.h" #include /* If setvbuf has the reversed format, exit 0. */ @@ -16418,15 +16810,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16421: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16813: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16424: \$? = $ac_status" >&5 + echo "$as_me:16816: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16426: \"$ac_try\"") >&5 + { (eval echo "$as_me:16818: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16429: \$? = $ac_status" >&5 + echo "$as_me:16821: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_setvbuf_reversed=yes else @@ -16439,7 +16831,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f core core.* *.core fi -echo "$as_me:16442: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "$as_me:16834: 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 @@ -16450,67 +16842,13 @@ EOF fi fi -echo "$as_me:16453: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 -if test "${ac_cv_type_signal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 16459 "configure" -#include "confdefs.h" -#include -#include -#ifdef signal -# undef signal -#endif -#ifdef __cplusplus -extern "C" void (*signal (int, void (*)(int)))(int); -#else -void (*signal ()) (); -#endif - -int -main () -{ -int i; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:16481: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:16484: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16487: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16490: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_signal=void -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_signal=int -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:16500: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6 - -cat >>confdefs.h <&5 +echo "$as_me:16845: 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 16513 "configure" +#line 16851 "configure" #include "confdefs.h" $ac_includes_default int @@ -16525,16 +16863,16 @@ if (sizeof (intptr_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16528: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16866: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16531: \$? = $ac_status" >&5 + echo "$as_me:16869: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16534: \"$ac_try\"") >&5 + { (eval echo "$as_me:16872: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16537: \$? = $ac_status" >&5 + echo "$as_me:16875: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_intptr_t=yes else @@ -16544,7 +16882,7 @@ ac_cv_type_intptr_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16547: result: $ac_cv_type_intptr_t" >&5 +echo "$as_me:16885: 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 : @@ -16556,14 +16894,14 @@ EOF fi -echo "$as_me:16559: checking for type sigaction_t" >&5 +echo "$as_me:16897: 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 16566 "configure" +#line 16904 "configure" #include "confdefs.h" #include @@ -16576,16 +16914,16 @@ sigaction_t x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16579: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16917: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16582: \$? = $ac_status" >&5 + echo "$as_me:16920: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16585: \"$ac_try\"") >&5 + { (eval echo "$as_me:16923: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16588: \$? = $ac_status" >&5 + echo "$as_me:16926: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_sigaction=yes else @@ -16596,13 +16934,14 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16599: result: $cf_cv_type_sigaction" >&5 +echo "$as_me:16937: result: $cf_cv_type_sigaction" >&5 echo "${ECHO_T}$cf_cv_type_sigaction" >&6 -test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF +test "$cf_cv_type_sigaction" = yes && +cat >>confdefs.h <<\EOF #define HAVE_TYPE_SIGACTION 1 EOF -echo "$as_me:16605: checking declaration of size-change" >&5 +echo "$as_me:16944: 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 @@ -16617,7 +16956,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat >conftest.$ac_ext <<_ACEOF -#line 16620 "configure" +#line 16959 "configure" #include "confdefs.h" #include #ifdef HAVE_TERMIOS_H @@ -16661,16 +17000,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16664: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17003: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16667: \$? = $ac_status" >&5 + echo "$as_me:17006: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16670: \"$ac_try\"") >&5 + { (eval echo "$as_me:17009: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16673: \$? = $ac_status" >&5 + echo "$as_me:17012: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sizechange=yes else @@ -16689,10 +17028,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:16692: result: $cf_cv_sizechange" >&5 +echo "$as_me:17031: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_SIZECHANGE 1 EOF @@ -16706,13 +17046,13 @@ EOF esac fi -echo "$as_me:16709: checking for memmove" >&5 +echo "$as_me:17049: 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 16715 "configure" +#line 17055 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char memmove (); below. */ @@ -16743,16 +17083,16 @@ f = memmove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16746: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17086: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16749: \$? = $ac_status" >&5 + echo "$as_me:17089: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16752: \"$ac_try\"") >&5 + { (eval echo "$as_me:17092: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16755: \$? = $ac_status" >&5 + echo "$as_me:17095: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_memmove=yes else @@ -16762,19 +17102,19 @@ ac_cv_func_memmove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16765: result: $ac_cv_func_memmove" >&5 +echo "$as_me:17105: result: $ac_cv_func_memmove" >&5 echo "${ECHO_T}$ac_cv_func_memmove" >&6 if test $ac_cv_func_memmove = yes; then : else -echo "$as_me:16771: checking for bcopy" >&5 +echo "$as_me:17111: 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 16777 "configure" +#line 17117 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char bcopy (); below. */ @@ -16805,16 +17145,16 @@ f = bcopy; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16808: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17148: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16811: \$? = $ac_status" >&5 + echo "$as_me:17151: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16814: \"$ac_try\"") >&5 + { (eval echo "$as_me:17154: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16817: \$? = $ac_status" >&5 + echo "$as_me:17157: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_bcopy=yes else @@ -16824,11 +17164,11 @@ ac_cv_func_bcopy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16827: result: $ac_cv_func_bcopy" >&5 +echo "$as_me:17167: result: $ac_cv_func_bcopy" >&5 echo "${ECHO_T}$ac_cv_func_bcopy" >&6 if test $ac_cv_func_bcopy = yes; then - echo "$as_me:16831: checking if bcopy does overlapping moves" >&5 + echo "$as_me:17171: 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 @@ -16838,7 +17178,7 @@ else cf_cv_good_bcopy=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 16841 "configure" +#line 17181 "configure" #include "confdefs.h" int main() { @@ -16852,15 +17192,15 @@ int main() { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16855: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17195: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16858: \$? = $ac_status" >&5 + echo "$as_me:17198: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16860: \"$ac_try\"") >&5 + { (eval echo "$as_me:17200: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16863: \$? = $ac_status" >&5 + echo "$as_me:17203: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_good_bcopy=yes else @@ -16873,7 +17213,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:16876: result: $cf_cv_good_bcopy" >&5 +echo "$as_me:17216: result: $cf_cv_good_bcopy" >&5 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 else @@ -16881,12 +17221,14 @@ else fi if test "$cf_cv_good_bcopy" = yes ; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define USE_OK_BCOPY 1 EOF else - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define USE_MY_MEMMOVE 1 EOF @@ -16894,7 +17236,7 @@ EOF fi -echo "$as_me:16897: checking if poll really works" >&5 +echo "$as_me:17239: 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 @@ -16904,10 +17246,13 @@ if test "$cross_compiling" = yes; then cf_cv_working_poll=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 16907 "configure" +#line 17249 "configure" #include "confdefs.h" +#include #include +#include +#include #ifdef HAVE_POLL_H #include #else @@ -16918,7 +17263,7 @@ int main() { int ret; /* check for Darwin bug with respect to "devices" */ - myfds.fd = open("/dev/null", 1); + myfds.fd = open("/dev/null", 1); /* O_WRONLY */ if (myfds.fd < 0) myfds.fd = 0; myfds.events = POLLIN; @@ -16929,30 +17274,34 @@ int main() { if (ret < 0 || (myfds.revents & POLLNVAL)) { ret = -1; } else { + int fd = 0; + if (!isatty(fd)) { + fd = open("/dev/tty", 2); /* O_RDWR */ + } - /* also check with standard input */ - myfds.fd = 0; - myfds.events = POLLIN; - myfds.revents = 0; - - ret = poll(&myfds, 1, 100); - if (ret < 0) { - ret = 0; + if (fd >= 0) { + /* also check with standard input */ + myfds.fd = fd; + myfds.events = POLLIN; + myfds.revents = 0; + ret = poll(&myfds, 1, 100); + } else { + ret = -1; } } - ${cf_cv_main_return:-return}(ret != 0); + ${cf_cv_main_return:-return}(ret < 0); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16947: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17296: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16950: \$? = $ac_status" >&5 + echo "$as_me:17299: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16952: \"$ac_try\"") >&5 + { (eval echo "$as_me:17301: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16955: \$? = $ac_status" >&5 + echo "$as_me:17304: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_working_poll=yes else @@ -16964,20 +17313,21 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:16967: result: $cf_cv_working_poll" >&5 +echo "$as_me:17316: result: $cf_cv_working_poll" >&5 echo "${ECHO_T}$cf_cv_working_poll" >&6 -test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF +test "$cf_cv_working_poll" = "yes" && +cat >>confdefs.h <<\EOF #define HAVE_WORKING_POLL 1 EOF -echo "$as_me:16973: checking for va_copy" >&5 +echo "$as_me:17323: 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 16980 "configure" +#line 17330 "configure" #include "confdefs.h" #include @@ -16994,16 +17344,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16997: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17347: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17000: \$? = $ac_status" >&5 + echo "$as_me:17350: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17003: \"$ac_try\"") >&5 + { (eval echo "$as_me:17353: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17006: \$? = $ac_status" >&5 + echo "$as_me:17356: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_va_copy=yes else @@ -17013,21 +17363,22 @@ cf_cv_have_va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17016: result: $cf_cv_have_va_copy" >&5 +echo "$as_me:17366: result: $cf_cv_have_va_copy" >&5 echo "${ECHO_T}$cf_cv_have_va_copy" >&6 -test "$cf_cv_have_va_copy" = yes && cat >>confdefs.h <<\EOF +test "$cf_cv_have_va_copy" = yes && +cat >>confdefs.h <<\EOF #define HAVE_VA_COPY 1 EOF -echo "$as_me:17023: checking for __va_copy" >&5 +echo "$as_me:17374: 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 17030 "configure" +#line 17381 "configure" #include "confdefs.h" #include @@ -17044,16 +17395,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17047: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17398: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17050: \$? = $ac_status" >&5 + echo "$as_me:17401: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17053: \"$ac_try\"") >&5 + { (eval echo "$as_me:17404: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17056: \$? = $ac_status" >&5 + echo "$as_me:17407: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have___va_copy=yes else @@ -17063,20 +17414,21 @@ cf_cv_have___va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17066: result: $cf_cv_have___va_copy" >&5 +echo "$as_me:17417: result: $cf_cv_have___va_copy" >&5 echo "${ECHO_T}$cf_cv_have___va_copy" >&6 -test "$cf_cv_have___va_copy" = yes && cat >>confdefs.h <<\EOF +test "$cf_cv_have___va_copy" = yes && +cat >>confdefs.h <<\EOF #define HAVE___VA_COPY 1 EOF -echo "$as_me:17073: checking for pid_t" >&5 +echo "$as_me:17425: 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 17079 "configure" +#line 17431 "configure" #include "confdefs.h" $ac_includes_default int @@ -17091,16 +17443,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17094: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17446: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17097: \$? = $ac_status" >&5 + echo "$as_me:17449: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17100: \"$ac_try\"") >&5 + { (eval echo "$as_me:17452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17103: \$? = $ac_status" >&5 + echo "$as_me:17455: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -17110,7 +17462,7 @@ ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:17113: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:17465: 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 : @@ -17125,23 +17477,23 @@ 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:17128: checking for $ac_header" >&5 +echo "$as_me:17480: 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 17134 "configure" +#line 17486 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17138: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:17490: \"$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:17144: \$? = $ac_status" >&5 + echo "$as_me:17496: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17160,7 +17512,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17163: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:17515: 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:17528: 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 17182 "configure" +#line 17534 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -17210,16 +17562,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17213: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17565: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17216: \$? = $ac_status" >&5 + echo "$as_me:17568: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17219: \"$ac_try\"") >&5 + { (eval echo "$as_me:17571: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17222: \$? = $ac_status" >&5 + echo "$as_me:17574: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -17229,7 +17581,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17232: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:17584: 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:17596: 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 @@ -17264,15 +17616,15 @@ else } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17267: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17619: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17270: \$? = $ac_status" >&5 + echo "$as_me:17622: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17272: \"$ac_try\"") >&5 + { (eval echo "$as_me:17624: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17275: \$? = $ac_status" >&5 + echo "$as_me:17627: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fork_works=yes else @@ -17284,7 +17636,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:17287: result: $ac_cv_func_fork_works" >&5 +echo "$as_me:17639: result: $ac_cv_func_fork_works" >&5 echo "${ECHO_T}$ac_cv_func_fork_works" >&6 fi @@ -17298,12 +17650,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:17301: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + { echo "$as_me:17653: 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:17306: checking for working vfork" >&5 + echo "$as_me:17658: 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 @@ -17312,7 +17664,7 @@ else ac_cv_func_vfork_works=cross else cat >conftest.$ac_ext <<_ACEOF -#line 17315 "configure" +#line 17667 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include @@ -17409,15 +17761,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17412: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17764: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17415: \$? = $ac_status" >&5 + echo "$as_me:17767: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17417: \"$ac_try\"") >&5 + { (eval echo "$as_me:17769: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17420: \$? = $ac_status" >&5 + echo "$as_me:17772: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_vfork_works=yes else @@ -17429,13 +17781,13 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:17432: result: $ac_cv_func_vfork_works" >&5 +echo "$as_me:17784: 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:17438: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + { echo "$as_me:17790: 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 @@ -17462,7 +17814,7 @@ fi # special check for test/ditto.c -echo "$as_me:17465: checking for openpty in -lutil" >&5 +echo "$as_me:17817: 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 @@ -17470,7 +17822,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 17473 "configure" +#line 17825 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17489,16 +17841,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17492: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17844: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17495: \$? = $ac_status" >&5 + echo "$as_me:17847: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17498: \"$ac_try\"") >&5 + { (eval echo "$as_me:17850: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17501: \$? = $ac_status" >&5 + echo "$as_me:17853: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -17509,7 +17861,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17512: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:17864: 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 cf_cv_lib_util=yes @@ -17517,18 +17869,34 @@ else cf_cv_lib_util=no fi -echo "$as_me:17520: checking for openpty header" >&5 +echo "$as_me:17872: 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 && LIBS="-lutil $LIBS" + test $cf_cv_lib_util = yes && +cf_add_libs="-lutil" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +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_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + for cf_header in pty.h libutil.h util.h do cat >conftest.$ac_ext <<_ACEOF -#line 17531 "configure" +#line 17899 "configure" #include "confdefs.h" #include <$cf_header> @@ -17545,16 +17913,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17548: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17916: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17551: \$? = $ac_status" >&5 + echo "$as_me:17919: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17554: \"$ac_try\"") >&5 + { (eval echo "$as_me:17922: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17557: \$? = $ac_status" >&5 + echo "$as_me:17925: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_openpty=$cf_header @@ -17572,25 +17940,43 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi -echo "$as_me:17575: result: $cf_cv_func_openpty" >&5 +echo "$as_me:17943: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then - cat >>confdefs.h <>confdefs.h < EOF - cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define USE_XTERM_PTY 1 EOF - if test "$cf_cv_lib_util" = yes ; then - TEST_LIBS="-lutil $TEST_LIBS" + if test "x$cf_cv_lib_util" = xyes ; then + +cf_add_libs="-lutil" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $TEST_LIBS +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_libs $cf_add_1lib" +done +TEST_LIBS="$cf_add_libs" + fi fi if test "$with_hashed_db" != no ; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define USE_HASHED_DB 1 EOF @@ -17624,7 +18010,7 @@ if test -n "$with_hashed_db/include" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 17627 "configure" +#line 18013 "configure" #include "confdefs.h" #include int @@ -17636,16 +18022,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17639: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18025: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17642: \$? = $ac_status" >&5 + echo "$as_me:18028: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17645: \"$ac_try\"") >&5 + { (eval echo "$as_me:18031: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17648: \$? = $ac_status" >&5 + echo "$as_me:18034: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -17662,7 +18048,7 @@ 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}:17665: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:18051: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -17696,7 +18082,247 @@ 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}:17699: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:18085: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + + else + case "$with_hashed_db" in #(vi + ./*|../*|/*) + { echo "$as_me:18096: WARNING: no such directory $with_hashed_db" >&5 +echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} + ;; #(vi + *) + +cf_search= + +test "x/usr" != "x$prefix" && \ +test -d "/usr" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for include-directories under /usr" + test -d /usr/include && cf_search="$cf_search /usr/include" + test -d /usr/include/$with_hashed_db && cf_search="$cf_search /usr/include/$with_hashed_db" + test -d /usr/include/$with_hashed_db/include && cf_search="$cf_search /usr/include/$with_hashed_db/include" + test -d /usr/$with_hashed_db/include && cf_search="$cf_search /usr/$with_hashed_db/include" + test -d /usr/$with_hashed_db/include/$with_hashed_db && cf_search="$cf_search /usr/$with_hashed_db/include/$with_hashed_db" +} + +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 "x/usr/local" != "x$prefix" && \ +test -d "/usr/local" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for include-directories under /usr/local" + test -d /usr/local/include && cf_search="$cf_search /usr/local/include" + test -d /usr/local/include/$with_hashed_db && cf_search="$cf_search /usr/local/include/$with_hashed_db" + test -d /usr/local/include/$with_hashed_db/include && cf_search="$cf_search /usr/local/include/$with_hashed_db/include" + test -d /usr/local/$with_hashed_db/include && cf_search="$cf_search /usr/local/$with_hashed_db/include" + test -d /usr/local/$with_hashed_db/include/$with_hashed_db && cf_search="$cf_search /usr/local/$with_hashed_db/include/$with_hashed_db" +} + +test "x/opt" != "x$prefix" && \ +test -d "/opt" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for include-directories under /opt" + test -d /opt/include && cf_search="$cf_search /opt/include" + test -d /opt/include/$with_hashed_db && cf_search="$cf_search /opt/include/$with_hashed_db" + test -d /opt/include/$with_hashed_db/include && cf_search="$cf_search /opt/include/$with_hashed_db/include" + test -d /opt/$with_hashed_db/include && cf_search="$cf_search /opt/$with_hashed_db/include" + test -d /opt/$with_hashed_db/include/$with_hashed_db && cf_search="$cf_search /opt/$with_hashed_db/include/$with_hashed_db" +} + +test "x$HOME" != "x$prefix" && \ +test -d "$HOME" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for include-directories under $HOME" + test -d $HOME/include && cf_search="$cf_search $HOME/include" + test -d $HOME/include/$with_hashed_db && cf_search="$cf_search $HOME/include/$with_hashed_db" + test -d $HOME/include/$with_hashed_db/include && cf_search="$cf_search $HOME/include/$with_hashed_db/include" + test -d $HOME/$with_hashed_db/include && cf_search="$cf_search $HOME/$with_hashed_db/include" + test -d $HOME/$with_hashed_db/include/$with_hashed_db && cf_search="$cf_search $HOME/$with_hashed_db/include/$with_hashed_db" +} + + for cf_item in $cf_search + do + case $cf_item in #(vi + */$with_hashed_db) + +if test -n "$cf_item" ; then + for cf_add_incdir in $cf_item + do + while test $cf_add_incdir != /usr/include + do + if test -d $cf_add_incdir + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi + + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +#line 18187 "configure" +#include "confdefs.h" +#include +int +main () +{ +printf("Hello") + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:18199: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:18202: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:18205: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18208: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi + + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +echo "${as_me:-configure}:18225: 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%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + fi + done + done +fi + + ;; + esac + done + +cf_search= + +test "x/usr" != "x$prefix" && \ +test -d "/usr" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for lib-directories under /usr" + test -d /usr/lib && cf_search="$cf_search /usr/lib" + test -d /usr/lib/$with_hashed_db && cf_search="$cf_search /usr/lib/$with_hashed_db" + test -d /usr/lib/$with_hashed_db/lib && cf_search="$cf_search /usr/lib/$with_hashed_db/lib" + test -d /usr/$with_hashed_db/lib && cf_search="$cf_search /usr/$with_hashed_db/lib" + test -d /usr/$with_hashed_db/lib/$with_hashed_db && cf_search="$cf_search /usr/$with_hashed_db/lib/$with_hashed_db" +} + +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 "x/usr/local" != "x$prefix" && \ +test -d "/usr/local" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" + test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" + test -d /usr/local/lib/$with_hashed_db && cf_search="$cf_search /usr/local/lib/$with_hashed_db" + test -d /usr/local/lib/$with_hashed_db/lib && cf_search="$cf_search /usr/local/lib/$with_hashed_db/lib" + test -d /usr/local/$with_hashed_db/lib && cf_search="$cf_search /usr/local/$with_hashed_db/lib" + test -d /usr/local/$with_hashed_db/lib/$with_hashed_db && cf_search="$cf_search /usr/local/$with_hashed_db/lib/$with_hashed_db" +} + +test "x/opt" != "x$prefix" && \ +test -d "/opt" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for lib-directories under /opt" + test -d /opt/lib && cf_search="$cf_search /opt/lib" + test -d /opt/lib/$with_hashed_db && cf_search="$cf_search /opt/lib/$with_hashed_db" + test -d /opt/lib/$with_hashed_db/lib && cf_search="$cf_search /opt/lib/$with_hashed_db/lib" + test -d /opt/$with_hashed_db/lib && cf_search="$cf_search /opt/$with_hashed_db/lib" + test -d /opt/$with_hashed_db/lib/$with_hashed_db && cf_search="$cf_search /opt/$with_hashed_db/lib/$with_hashed_db" +} + +test "x$HOME" != "x$prefix" && \ +test -d "$HOME" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for lib-directories under $HOME" + test -d $HOME/lib && cf_search="$cf_search $HOME/lib" + test -d $HOME/lib/$with_hashed_db && cf_search="$cf_search $HOME/lib/$with_hashed_db" + test -d $HOME/lib/$with_hashed_db/lib && cf_search="$cf_search $HOME/lib/$with_hashed_db/lib" + test -d $HOME/$with_hashed_db/lib && cf_search="$cf_search $HOME/$with_hashed_db/lib" + test -d $HOME/$with_hashed_db/lib/$with_hashed_db && cf_search="$cf_search $HOME/$with_hashed_db/lib/$with_hashed_db" +} + + for cf_item in $cf_search + do + case $cf_item in #(vi + */$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 + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +echo "${as_me:-configure}:18325: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -17704,26 +18330,32 @@ echo "${as_me:-configure}:17699: testing adding $cf_add_libdir to library-path . done fi + ;; + esac + done + + ;; + esac fi esac -echo "$as_me:17710: checking for db.h" >&5 +echo "$as_me:18342: 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 17716 "configure" +#line 18348 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:17720: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18352: \"$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:17726: \$? = $ac_status" >&5 + echo "$as_me:18358: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17742,11 +18374,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17745: result: $ac_cv_header_db_h" >&5 +echo "$as_me:18377: 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 -echo "$as_me:17749: checking for version of db" >&5 +echo "$as_me:18381: 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 @@ -17754,13 +18386,13 @@ else cf_cv_hashed_db_version=unknown -for cf_db_version in 1 2 3 4 5 +for cf_db_version in 1 2 3 4 5 6 do -echo "${as_me:-configure}:17760: testing checking for db version $cf_db_version ..." 1>&5 +echo "${as_me:-configure}:18392: testing checking for db version $cf_db_version ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 17763 "configure" +#line 18395 "configure" #include "confdefs.h" $ac_includes_default @@ -17790,16 +18422,16 @@ DBT *foo = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17793: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18425: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17796: \$? = $ac_status" >&5 + echo "$as_me:18428: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17799: \"$ac_try\"") >&5 + { (eval echo "$as_me:18431: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17802: \$? = $ac_status" >&5 + echo "$as_me:18434: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_hashed_db_version=$cf_db_version @@ -17813,16 +18445,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:17816: result: $cf_cv_hashed_db_version" >&5 +echo "$as_me:18448: 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:17820: error: Cannot determine version of db" >&5 + { { echo "$as_me:18452: 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:17825: checking for db libraries" >&5 +echo "$as_me:18457: 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 @@ -17833,13 +18465,29 @@ for cf_db_libs in "" db$cf_cv_hashed_db_version db-$cf_cv_hashed_db_version db ' do cf_save_libs="$LIBS" if test -n "$cf_db_libs"; then - LIBS="-l$cf_db_libs $LIBS" + +cf_add_libs="-l$cf_db_libs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +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_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + fi -echo "${as_me:-configure}:17839: testing checking for library "$cf_db_libs" ..." 1>&5 +echo "${as_me:-configure}:18487: testing checking for library "$cf_db_libs" ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 17842 "configure" +#line 18490 "configure" #include "confdefs.h" $ac_includes_default @@ -17894,16 +18542,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17897: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18545: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17900: \$? = $ac_status" >&5 + echo "$as_me:18548: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17903: \"$ac_try\"") >&5 + { (eval echo "$as_me:18551: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17906: \$? = $ac_status" >&5 + echo "$as_me:18554: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test -n "$cf_db_libs" ; then @@ -17923,21 +18571,37 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:17926: result: $cf_cv_hashed_db_libs" >&5 +echo "$as_me:18574: 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:17930: error: Cannot determine library for db" >&5 + { { echo "$as_me:18578: 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 - LIBS="-l$cf_cv_hashed_db_libs $LIBS" + +cf_add_libs="-l$cf_cv_hashed_db_libs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +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_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + fi fi else - { { echo "$as_me:17940: error: Cannot find db.h" >&5 + { { echo "$as_me:18604: error: Cannot find db.h" >&5 echo "$as_me: error: Cannot find db.h" >&2;} { (exit 1); exit 1; }; } @@ -17952,7 +18616,7 @@ fi # Just in case, check if the C compiler has a bool type. -echo "$as_me:17955: checking if we should include stdbool.h" >&5 +echo "$as_me:18619: 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 @@ -17960,7 +18624,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 17963 "configure" +#line 18627 "configure" #include "confdefs.h" int @@ -17972,23 +18636,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17975: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18639: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17978: \$? = $ac_status" >&5 + echo "$as_me:18642: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17981: \"$ac_try\"") >&5 + { (eval echo "$as_me:18645: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17984: \$? = $ac_status" >&5 + echo "$as_me:18648: \$? = $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 17991 "configure" +#line 18655 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -18004,16 +18668,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18007: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18671: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18010: \$? = $ac_status" >&5 + echo "$as_me:18674: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18013: \"$ac_try\"") >&5 + { (eval echo "$as_me:18677: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18016: \$? = $ac_status" >&5 + echo "$as_me:18680: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -18027,13 +18691,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:18030: result: yes" >&5 +then echo "$as_me:18694: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:18032: result: no" >&5 +else echo "$as_me:18696: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:18036: checking for builtin bool type" >&5 +echo "$as_me:18700: 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 @@ -18041,7 +18705,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 18044 "configure" +#line 18708 "configure" #include "confdefs.h" #include @@ -18056,16 +18720,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18059: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18723: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18062: \$? = $ac_status" >&5 + echo "$as_me:18726: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18065: \"$ac_try\"") >&5 + { (eval echo "$as_me:18729: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18068: \$? = $ac_status" >&5 + echo "$as_me:18732: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cc_bool_type=1 else @@ -18078,9 +18742,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_cc_bool_type" = 1 -then echo "$as_me:18081: result: yes" >&5 +then echo "$as_me:18745: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:18083: result: no" >&5 +else echo "$as_me:18747: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -18102,16 +18766,32 @@ os2*) #(vi cf_stdcpp_libname=stdc++ ;; esac -echo "$as_me:18105: checking for library $cf_stdcpp_libname" >&5 +echo "$as_me:18769: 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 else cf_save="$LIBS" - LIBS="-l$cf_stdcpp_libname $LIBS" + +cf_add_libs="-l$cf_stdcpp_libname" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +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_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + cat >conftest.$ac_ext <<_ACEOF -#line 18114 "configure" +#line 18794 "configure" #include "confdefs.h" #include @@ -18127,16 +18807,16 @@ strstreambuf foo(buf, sizeof(buf)) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18130: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18810: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18133: \$? = $ac_status" >&5 + echo "$as_me:18813: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18136: \"$ac_try\"") >&5 + { (eval echo "$as_me:18816: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18139: \$? = $ac_status" >&5 + echo "$as_me:18819: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_libstdcpp=yes else @@ -18148,12 +18828,28 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save" fi -echo "$as_me:18151: result: $cf_cv_libstdcpp" >&5 +echo "$as_me:18831: result: $cf_cv_libstdcpp" >&5 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 -test "$cf_cv_libstdcpp" = yes && CXXLIBS="-l$cf_stdcpp_libname $CXXLIBS" +test "$cf_cv_libstdcpp" = yes && +cf_add_libs="-l$cf_stdcpp_libname" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $CXXLIBS +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_libs $cf_add_1lib" +done +CXXLIBS="$cf_add_libs" + fi - echo "$as_me:18156: checking whether $CXX understands -c and -o together" >&5 + echo "$as_me:18852: 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 @@ -18169,15 +18865,15 @@ 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 -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:18172: \"$ac_try\"") >&5 +if { (eval echo "$as_me:18868: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18175: \$? = $ac_status" >&5 + echo "$as_me:18871: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:18177: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:18873: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18180: \$? = $ac_status" >&5 + echo "$as_me:18876: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CXX_c_o=yes @@ -18188,10 +18884,10 @@ rm -rf conftest* fi if test $cf_cv_prog_CXX_c_o = yes; then - echo "$as_me:18191: result: yes" >&5 + echo "$as_me:18887: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:18194: result: no" >&5 + echo "$as_me:18890: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -18211,12 +18907,28 @@ os2*) #(vi ;; esac if test "$GXX" = yes; then - echo "$as_me:18214: checking for lib$cf_gpp_libname" >&5 + echo "$as_me:18910: checking for lib$cf_gpp_libname" >&5 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 cf_save="$LIBS" - LIBS="-l$cf_gpp_libname $LIBS" + +cf_add_libs="-l$cf_gpp_libname" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +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_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + cat >conftest.$ac_ext <<_ACEOF -#line 18219 "configure" +#line 18931 "configure" #include "confdefs.h" #include <$cf_gpp_libname/builtin.h> @@ -18230,26 +18942,44 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18233: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18945: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18236: \$? = $ac_status" >&5 + echo "$as_me:18948: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18239: \"$ac_try\"") >&5 + { (eval echo "$as_me:18951: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18242: \$? = $ac_status" >&5 + echo "$as_me:18954: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes - CXXLIBS="-l$cf_gpp_libname $CXXLIBS" + +cf_add_libs="-l$cf_gpp_libname" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $CXXLIBS +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_libs $cf_add_1lib" +done +CXXLIBS="$cf_add_libs" + if test "$cf_gpp_libname" = cpp ; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_GPP_BUILTIN_H 1 EOF else - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_GXX_BUILTIN_H 1 EOF @@ -18258,7 +18988,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 18261 "configure" +#line 18991 "configure" #include "confdefs.h" #include @@ -18272,20 +19002,36 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18275: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19005: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18278: \$? = $ac_status" >&5 + echo "$as_me:19008: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18281: \"$ac_try\"") >&5 + { (eval echo "$as_me:19011: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18284: \$? = $ac_status" >&5 + echo "$as_me:19014: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes - CXXLIBS="-l$cf_gpp_libname $CXXLIBS" - cat >>confdefs.h <<\EOF + +cf_add_libs="-l$cf_gpp_libname" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $CXXLIBS +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_libs $cf_add_1lib" +done +CXXLIBS="$cf_add_libs" + +cat >>confdefs.h <<\EOF #define HAVE_BUILTIN_H 1 EOF @@ -18298,7 +19044,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save" - echo "$as_me:18301: result: $cf_cxx_library" >&5 + echo "$as_me:19047: result: $cf_cxx_library" >&5 echo "${ECHO_T}$cf_cxx_library" >&6 fi @@ -18314,7 +19060,7 @@ 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:18317: checking how to run the C++ preprocessor" >&5 +echo "$as_me:19063: 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 @@ -18331,18 +19077,18 @@ do # 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 18334 "configure" +#line 19080 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:18339: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:19085: \"$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:18345: \$? = $ac_status" >&5 + echo "$as_me:19091: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18365,17 +19111,17 @@ 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 18368 "configure" +#line 19114 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18372: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:19118: \"$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:18378: \$? = $ac_status" >&5 + echo "$as_me:19124: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18412,7 +19158,7 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:18415: result: $CXXCPP" >&5 +echo "$as_me:19161: result: $CXXCPP" >&5 echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -18422,18 +19168,18 @@ do # 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 18425 "configure" +#line 19171 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:18430: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:19176: \"$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:18436: \$? = $ac_status" >&5 + echo "$as_me:19182: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18456,17 +19202,17 @@ 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 18459 "configure" +#line 19205 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18463: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:19209: \"$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:18469: \$? = $ac_status" >&5 + echo "$as_me:19215: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18494,7 +19240,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:18497: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + { { echo "$as_me:19243: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -18509,23 +19255,23 @@ 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:18512: checking for $ac_header" >&5 +echo "$as_me:19258: 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 18518 "configure" +#line 19264 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18522: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:19268: \"$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:18528: \$? = $ac_status" >&5 + echo "$as_me:19274: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18544,7 +19290,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18547: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:19293: 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:19306: 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 18566 "configure" +#line 19312 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18570: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:19316: \"$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:18576: \$? = $ac_status" >&5 + echo "$as_me:19322: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18592,7 +19338,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18595: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:19341: 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:19352: 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 18609 "configure" +#line 19355 "configure" #include "confdefs.h" #include @@ -18623,16 +19369,16 @@ cerr << "testing" << endl; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18626: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19372: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18629: \$? = $ac_status" >&5 + echo "$as_me:19375: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18632: \"$ac_try\"") >&5 + { (eval echo "$as_me:19378: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18635: \$? = $ac_status" >&5 + echo "$as_me:19381: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_iostream_namespace=yes else @@ -18641,17 +19387,18 @@ cat conftest.$ac_ext >&5 cf_iostream_namespace=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:18644: result: $cf_iostream_namespace" >&5 + echo "$as_me:19390: result: $cf_iostream_namespace" >&5 echo "${ECHO_T}$cf_iostream_namespace" >&6 if test "$cf_iostream_namespace" = yes ; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define IOSTREAM_NAMESPACE 1 EOF fi fi -echo "$as_me:18654: checking if we should include stdbool.h" >&5 +echo "$as_me:19401: 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 @@ -18659,7 +19406,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 18662 "configure" +#line 19409 "configure" #include "confdefs.h" int @@ -18671,23 +19418,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18674: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19421: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18677: \$? = $ac_status" >&5 + echo "$as_me:19424: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18680: \"$ac_try\"") >&5 + { (eval echo "$as_me:19427: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18683: \$? = $ac_status" >&5 + echo "$as_me:19430: \$? = $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 18690 "configure" +#line 19437 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -18703,16 +19450,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18706: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19453: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18709: \$? = $ac_status" >&5 + echo "$as_me:19456: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18712: \"$ac_try\"") >&5 + { (eval echo "$as_me:19459: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18715: \$? = $ac_status" >&5 + echo "$as_me:19462: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -18726,13 +19473,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:18729: result: yes" >&5 +then echo "$as_me:19476: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:18731: result: no" >&5 +else echo "$as_me:19478: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:18735: checking for builtin bool type" >&5 +echo "$as_me:19482: 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 @@ -18740,7 +19487,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 18743 "configure" +#line 19490 "configure" #include "confdefs.h" #include @@ -18755,16 +19502,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18758: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19505: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18761: \$? = $ac_status" >&5 + echo "$as_me:19508: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18764: \"$ac_try\"") >&5 + { (eval echo "$as_me:19511: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18767: \$? = $ac_status" >&5 + echo "$as_me:19514: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_builtin_bool=1 else @@ -18777,13 +19524,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_builtin_bool" = 1 -then echo "$as_me:18780: result: yes" >&5 +then echo "$as_me:19527: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:18782: result: no" >&5 +else echo "$as_me:19529: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:18786: checking for size of bool" >&5 +echo "$as_me:19533: 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 $ECHO_N "(cached) $ECHO_C" >&6 @@ -18794,7 +19541,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 18797 "configure" +#line 19544 "configure" #include "confdefs.h" #include @@ -18818,7 +19565,7 @@ else #endif -main() +int main() { FILE *fp = fopen("cf_test.out", "w"); if (fp != 0) { @@ -18836,15 +19583,15 @@ main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18839: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19586: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18842: \$? = $ac_status" >&5 + echo "$as_me:19589: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18844: \"$ac_try\"") >&5 + { (eval echo "$as_me:19591: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18847: \$? = $ac_status" >&5 + echo "$as_me:19594: \$? = $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 @@ -18862,18 +19609,18 @@ fi fi rm -f cf_test.out -echo "$as_me:18865: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:19612: 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 #(vi .auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:18871: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:19618: 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:18876: checking for special defines needed for etip.h" >&5 +echo "$as_me:19623: 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" @@ -18891,7 +19638,7 @@ do 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 18894 "configure" +#line 19641 "configure" #include "confdefs.h" #include @@ -18905,16 +19652,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18908: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19655: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18911: \$? = $ac_status" >&5 + echo "$as_me:19658: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18914: \"$ac_try\"") >&5 + { (eval echo "$as_me:19661: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18917: \$? = $ac_status" >&5 + echo "$as_me:19664: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$cf_math" && cat >>confdefs.h <&5 +echo "$as_me:19685: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 CXXFLAGS="$cf_save_CXXFLAGS" if test -n "$CXX"; then -echo "$as_me:18943: checking if $CXX accepts parameter initialization" >&5 +echo "$as_me:19690: 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 @@ -18957,7 +19704,7 @@ ac_main_return=return cf_cv_cpp_param_init=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 18960 "configure" +#line 19707 "configure" #include "confdefs.h" class TEST { @@ -18976,15 +19723,15 @@ int main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18979: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19726: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18982: \$? = $ac_status" >&5 + echo "$as_me:19729: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18984: \"$ac_try\"") >&5 + { (eval echo "$as_me:19731: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18987: \$? = $ac_status" >&5 + echo "$as_me:19734: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_param_init=yes else @@ -19003,16 +19750,17 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:19006: result: $cf_cv_cpp_param_init" >&5 +echo "$as_me:19753: 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 +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:19015: checking if $CXX accepts static_cast" >&5 +echo "$as_me:19763: 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 @@ -19026,7 +19774,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat >conftest.$ac_ext <<_ACEOF -#line 19029 "configure" +#line 19777 "configure" #include "confdefs.h" class NCursesPanel @@ -19038,7 +19786,7 @@ public: int begin_x = 0) { } - + NCursesPanel(); ~NCursesPanel(); }; @@ -19070,16 +19818,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19073: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19821: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19076: \$? = $ac_status" >&5 + echo "$as_me:19824: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19079: \"$ac_try\"") >&5 + { (eval echo "$as_me:19827: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19082: \$? = $ac_status" >&5 + echo "$as_me:19830: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_static_cast=yes else @@ -19097,12 +19845,13 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:19100: result: $cf_cv_cpp_static_cast" >&5 +echo "$as_me:19848: 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 +test "$cf_cv_cpp_static_cast" = yes && +cat >>confdefs.h <<\EOF #define CPP_HAS_STATIC_CAST 1 EOF @@ -19145,7 +19894,7 @@ else else if test "$cf_cv_header_stdbool_h" = 1 ; then -echo "$as_me:19148: checking for size of bool" >&5 +echo "$as_me:19897: 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 $ECHO_N "(cached) $ECHO_C" >&6 @@ -19156,7 +19905,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 19159 "configure" +#line 19908 "configure" #include "confdefs.h" #include @@ -19180,7 +19929,7 @@ else #endif -main() +int main() { FILE *fp = fopen("cf_test.out", "w"); if (fp != 0) { @@ -19198,15 +19947,15 @@ main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:19201: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19950: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19204: \$? = $ac_status" >&5 + echo "$as_me:19953: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19206: \"$ac_try\"") >&5 + { (eval echo "$as_me:19955: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19209: \$? = $ac_status" >&5 + echo "$as_me:19958: \$? = $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 @@ -19224,25 +19973,25 @@ fi fi rm -f cf_test.out -echo "$as_me:19227: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:19976: 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 #(vi .auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:19233: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:19982: 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:19239: checking for fallback type of bool" >&5 + echo "$as_me:19988: checking for fallback type of bool" >&5 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 case "$host_cpu" in #(vi i?86) cf_cv_type_of_bool=char ;; #(vi *) cf_cv_type_of_bool=int ;; esac - echo "$as_me:19245: result: $cf_cv_type_of_bool" >&5 + echo "$as_me:19994: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 fi fi @@ -19271,7 +20020,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:19274: WARNING: libtool does not support Ada - disabling feature" >&5 + { echo "$as_me:20023: 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 @@ -19282,7 +20031,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} cf_ada_make=gnatmake # Extract the first word of "$cf_ada_make", so it can be a program name with args. set dummy $cf_ada_make; ac_word=$2 -echo "$as_me:19285: checking for $ac_word" >&5 +echo "$as_me:20034: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_gnat_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19297,7 +20046,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_gnat_exists="yes" -echo "$as_me:19300: found $ac_dir/$ac_word" >&5 +echo "$as_me:20049: found $ac_dir/$ac_word" >&5 break done @@ -19306,10 +20055,10 @@ fi fi gnat_exists=$ac_cv_prog_gnat_exists if test -n "$gnat_exists"; then - echo "$as_me:19309: result: $gnat_exists" >&5 + echo "$as_me:20058: result: $gnat_exists" >&5 echo "${ECHO_T}$gnat_exists" >&6 else - echo "$as_me:19312: result: no" >&5 + echo "$as_me:20061: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -19318,12 +20067,12 @@ if test "$ac_cv_prog_gnat_exists" = no; then cf_cv_prog_gnat_correct=no else -echo "$as_me:19321: checking for gnat version" >&5 +echo "$as_me:20070: checking for gnat version" >&5 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ grep '[0-9].[0-9][0-9]*' |\ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` -echo "$as_me:19326: result: $cf_gnat_version" >&5 +echo "$as_me:20075: result: $cf_gnat_version" >&5 echo "${ECHO_T}$cf_gnat_version" >&6 case $cf_gnat_version in #(vi @@ -19331,7 +20080,7 @@ case $cf_gnat_version in #(vi cf_cv_prog_gnat_correct=yes ;; *) - { echo "$as_me:19334: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:20083: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} cf_cv_prog_gnat_correct=no ;; @@ -19339,7 +20088,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:19342: checking for $ac_word" >&5 +echo "$as_me:20091: 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 @@ -19354,7 +20103,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:19357: found $ac_dir/$ac_word" >&5 +echo "$as_me:20106: found $ac_dir/$ac_word" >&5 break done @@ -19363,10 +20112,10 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:19366: result: $M4_exists" >&5 + echo "$as_me:20115: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:19369: result: no" >&5 + echo "$as_me:20118: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -19375,7 +20124,7 @@ fi echo Ada95 binding required program m4 not found. Ada95 binding disabled. fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:19378: checking if GNAT works" >&5 + echo "$as_me:20127: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf conftest* *~conftest* @@ -19403,32 +20152,36 @@ else fi rm -rf conftest* *~conftest* - echo "$as_me:19406: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:20155: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi fi - if test "$cf_cv_prog_gnat_correct" = yes; then + if test "x$cf_cv_prog_gnat_correct" = xyes; then ADAFLAGS="$ADAFLAGS -gnatpn" - # make ADAFLAGS consistent with CFLAGS - case "$CFLAGS" in - *-g*) + echo "$as_me:20164: checking optimization options for ADAFLAGS" >&5 +echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + *-g*) ADAFLAGS="$ADAFLAGS -g" - ;; - esac - case "$CFLAGS" in - *-O*) + ;; + esac + case "$CFLAGS" in + *-O*) + cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[ ].*//'` - ADAFLAGS="$ADAFLAGS -O3" + ADAFLAGS="$ADAFLAGS $cf_O_flag" - ;; - esac + ;; + esac + echo "$as_me:20181: result: $ADAFLAGS" >&5 +echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:19431: checking if GNAT supports generics" >&5 +echo "$as_me:20184: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case $cf_gnat_version in #(vi 3.[1-9]*|[4-9].*) #(vi @@ -19438,7 +20191,7 @@ case $cf_gnat_version in #(vi cf_gnat_generics=no ;; esac -echo "$as_me:19441: result: $cf_gnat_generics" >&5 +echo "$as_me:20194: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -19450,7 +20203,7 @@ else cf_generic_objects= fi -echo "$as_me:19453: checking if GNAT supports SIGINT" >&5 +echo "$as_me:20206: 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 @@ -19498,7 +20251,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:19501: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:20254: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test $cf_cv_gnat_sigint = yes ; then @@ -19507,58 +20260,18 @@ else USE_GNAT_SIGINT="#" fi -echo "$as_me:19510: checking if GNAT pragma Unreferenced works" >&5 -echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 -if test "${cf_cv_pragma_unreferenced+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -rm -rf conftest* *~conftest* -cat >>conftest.ads <>conftest.adb <&5 2>&1 ) ; then - cf_cv_pragma_unreferenced=yes -else - cf_cv_pragma_unreferenced=no -fi -rm -rf conftest* *~conftest* - -fi -echo "$as_me:19541: result: $cf_cv_pragma_unreferenced" >&5 -echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6 - -# if the pragma is supported, use it (needed in the Trace code). -if test $cf_cv_pragma_unreferenced = yes ; then - PRAGMA_UNREF=TRUE -else - PRAGMA_UNREF=FALSE -fi - cf_gnat_libraries=no cf_gnat_projects=no -echo "$as_me:19554: checking if GNAT supports project files" >&5 +if test "$enable_gnat_projects" != no ; then +echo "$as_me:20267: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case $cf_gnat_version in #(vi 3.[0-9]*) #(vi ;; *) case $cf_cv_system_name in #(vi - cygwin*) #(vi + cygwin*|msys*) #(vi ;; *) mkdir conftest.src conftest.bin conftest.lib @@ -19575,14 +20288,6 @@ project Library is for Library_Dir use External("BUILD_DIR"); Source_Dir := External ("SOURCE_DIR"); for Source_Dirs use (Source_Dir); - package Compiler is - for Default_Switches ("Ada") use - ("-g", - "-O2", - "-gnatafno", - "-gnatVa", -- All validity checks - "-gnatwa"); -- Activate all optional errors - end Compiler; end Library; CF_EOF cat >>confpackage.ads <&5 +echo "$as_me:20327: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 +fi # enable_gnat_projects if test $cf_gnat_projects = yes then - echo "$as_me:19627: checking if GNAT supports libraries" >&5 + echo "$as_me:20333: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:19629: result: $cf_gnat_libraries" >&5 + echo "$as_me:20335: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -19646,7 +20352,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:19649: checking for ada-compiler" >&5 +echo "$as_me:20355: 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. @@ -19657,12 +20363,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:19660: result: $cf_ada_compiler" >&5 +echo "$as_me:20366: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:19665: checking for ada-include" >&5 +echo "$as_me:20371: 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. @@ -19686,7 +20392,55 @@ case ".$withval" in #(vi ;; .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ;; -.\${*prefix}*) #(vi +.\${*prefix}*|.\${*dir}*) #(vi + eval withval="$withval" + case ".$withval" in #(vi + .NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; #(vi +.no|.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; +*) + { { echo "$as_me:20407: error: expected a pathname, not \"$withval\"" >&5 +echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +esac + +fi +eval ADA_INCLUDE="$withval" + +echo "$as_me:20416: result: $ADA_INCLUDE" >&5 +echo "${ECHO_T}$ADA_INCLUDE" >&6 + +echo "$as_me:20419: 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. +if test "${with_ada_objects+set}" = set; then + withval="$with_ada_objects" + +else + withval="${ADA_OBJECTS:-$prefix/lib/ada/adalib}" +fi; if test -n "$prefix/lib/ada/adalib" ; then + +if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" +else + cf_path_syntax="$ac_default_prefix" +fi + +case ".$withval" in #(vi +.\$\(*\)*|.\'*\'*) #(vi + ;; +..|./*|.\\*) #(vi + ;; +.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +.\${*prefix}*|.\${*dir}*) #(vi eval withval="$withval" case ".$withval" in #(vi .NONE/*) @@ -19698,95 +20452,288 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:19701: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:20455: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; esac fi -ADA_INCLUDE="$withval" - -echo "$as_me:19710: result: $ADA_INCLUDE" >&5 -echo "${ECHO_T}$ADA_INCLUDE" >&6 - -echo "$as_me:19713: 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. -if test "${with_ada_objects+set}" = set; then - withval="$with_ada_objects" - +eval ADA_OBJECTS="$withval" + +echo "$as_me:20464: result: $ADA_OBJECTS" >&5 +echo "${ECHO_T}$ADA_OBJECTS" >&6 + +echo "$as_me:20467: 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. +if test "${with_ada_sharedlib+set}" = set; then + withval="$with_ada_sharedlib" + with_ada_sharedlib=$withval +else + with_ada_sharedlib=no +fi; +echo "$as_me:20477: result: $with_ada_sharedlib" >&5 +echo "${ECHO_T}$with_ada_sharedlib" >&6 + +ADA_SHAREDLIB='lib$(LIB_NAME).so.1' +MAKE_ADA_SHAREDLIB="#" + +if test "x$with_ada_sharedlib" != xno +then + MAKE_ADA_SHAREDLIB= + if test "x$with_ada_sharedlib" != xyes + then + ADA_SHAREDLIB="$with_ada_sharedlib" + fi +fi + + fi + fi +else + cf_with_ada=no +fi + +# do this "late" to avoid conflict with header-checks +if test "x$with_widec" = xyes ; then + echo "$as_me:20500: 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 20506 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((wchar_t *) 0) + return 0; +if (sizeof (wchar_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:20521: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:20524: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:20527: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:20530: \$? = $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 +ac_cv_type_wchar_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:20540: result: $ac_cv_type_wchar_t" >&5 +echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 + +echo "$as_me:20543: 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 +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 20552 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:20564: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:20567: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:20570: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:20573: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 20578 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:20590: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:20593: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:20596: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:20599: \$? = $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 20615 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:20627: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:20630: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:20633: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:20636: \$? = $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 20652 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:20664: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:20667: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:20670: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:20673: \$? = $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_wchar_t=$ac_lo else - withval="${ADA_OBJECTS:-$prefix/lib/ada/adalib}" -fi; if test -n "$prefix/lib/ada/adalib" ; then - -if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + if test "$cross_compiling" = yes; then + { { echo "$as_me:20686: 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 - cf_path_syntax="$ac_default_prefix" + cat >conftest.$ac_ext <<_ACEOF +#line 20691 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +FILE *f = fopen ("conftest.val", "w"); +if (!f) + $ac_main_return (1); +fprintf (f, "%d", (sizeof (wchar_t))); +fclose (f); + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:20707: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:20710: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:20712: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:20715: \$? = $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 fi - -case ".$withval" in #(vi -.\$\(*\)*|.\'*\'*) #(vi - ;; -..|./*|.\\*) #(vi - ;; -.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX - ;; -.\${*prefix}*) #(vi - eval withval="$withval" - case ".$withval" in #(vi - .NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; #(vi -.no|.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; -*) - { { echo "$as_me:19749: error: expected a pathname, not \"$withval\"" >&5 -echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -esac - +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -ADA_OBJECTS="$withval" - -echo "$as_me:19758: result: $ADA_OBJECTS" >&5 -echo "${ECHO_T}$ADA_OBJECTS" >&6 - -echo "$as_me:19761: 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. -if test "${with_ada_sharedlib+set}" = set; then - withval="$with_ada_sharedlib" - with_ada_sharedlib=$withval +fi +rm -f conftest.val else - with_ada_sharedlib=no -fi; -echo "$as_me:19771: result: $with_ada_sharedlib" >&5 -echo "${ECHO_T}$with_ada_sharedlib" >&6 - -ADA_SHAREDLIB='lib$(LIB_NAME).so.1' -MAKE_ADA_SHAREDLIB="#" - -if test "x$with_ada_sharedlib" != xno -then - MAKE_ADA_SHAREDLIB= - if test "x$with_ada_sharedlib" != xyes - then - ADA_SHAREDLIB="$with_ada_sharedlib" - fi + ac_cv_sizeof_wchar_t=0 fi +fi +echo "$as_me:20731: result: $ac_cv_sizeof_wchar_t" >&5 +echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 +cat >>confdefs.h <&5 +echo "$as_me:20749: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= -if test "$cf_with_progs" = yes || test "$with_ticlib" != no || test "$with_termcap" != no; then +if test "x$cf_with_progs" = xyes || test "$with_ticlib" != no || test "$with_termcap" != no; then LIB_SUBSETS="${LIB_SUBSETS}ticlib" if test "$with_ticlib" != no ; then LIB_SUBSETS="${LIB_SUBSETS} " @@ -19813,7 +20760,7 @@ if test "$cf_with_progs" = yes || test "$with_ticlib" != no || test "$with_termc fi LIB_SUBSETS="${LIB_SUBSETS}termlib" -test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo" +test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo" if test "$with_termlib" != no ; then LIB_SUBSETS="${LIB_SUBSETS} " @@ -19837,29 +20784,29 @@ if test "$with_term_driver" != no ; then esac fi -test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" -test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" +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:19843: result: $LIB_SUBSETS" >&5 +echo "$as_me:20790: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated -CPPFLAGS="$CPPFLAGS -I. -I../include" -if test "$srcdir" != "."; then - CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include" -fi if test "$GCC" != yes; then - CPPFLAGS="$CPPFLAGS -I\${includedir}" + CPPFLAGS="-I\${includedir} $CPPFLAGS" elif test "$includedir" != "/usr/include"; then if test "$includedir" = '${prefix}/include' ; then - if test $prefix != /usr ; then - CPPFLAGS="$CPPFLAGS -I\${includedir}" + if test x$prefix != x/usr ; then + CPPFLAGS="-I\${includedir} $CPPFLAGS" fi else - CPPFLAGS="$CPPFLAGS -I\${includedir}" + CPPFLAGS="-I\${includedir} $CPPFLAGS" fi fi +if test "$srcdir" != "."; then + CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS" +fi +CPPFLAGS="-I. -I../include $CPPFLAGS" ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS" if test "$srcdir" != "."; then @@ -19869,7 +20816,7 @@ if test "$GCC" != yes; then ACPPFLAGS="$ACPPFLAGS -I\${includedir}" elif test "$includedir" != "/usr/include"; then if test "$includedir" = '${prefix}/include' ; then - if test $prefix != /usr ; then + if test x$prefix != x/usr ; then ACPPFLAGS="$ACPPFLAGS -I\${includedir}" fi else @@ -19878,7 +20825,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:19881: checking default library suffix" >&5 +echo "$as_me:20828: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -19889,36 +20836,32 @@ 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:19892: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:20839: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:19895: checking default library-dependency suffix" >&5 +echo "$as_me:20842: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 - case $DFT_LWR_MODEL in #(vi - libtool) #(vi + case X$DFT_LWR_MODEL in #(vi + Xlibtool) #(vi DFT_LIB_SUFFIX='.la' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; - normal) #(vi - DFT_LIB_SUFFIX='.a' - DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX - ;; - debug) #(vi + Xdebug) #(vi DFT_LIB_SUFFIX='_g.a' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; - profile) #(vi + Xprofile) #(vi DFT_LIB_SUFFIX='_p.a' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; - shared) #(vi + Xshared) #(vi case $cf_cv_system_name in aix[5-7]*) #(vi - DFT_LIB_SUFFIX='.a' + DFT_LIB_SUFFIX='.so' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; - cygwin*|mingw*) #(vi + cygwin*|msys*|mingw*) #(vi DFT_LIB_SUFFIX='.dll' DFT_DEP_SUFFIX='.dll.a' ;; @@ -19938,17 +20881,23 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 ;; esac ;; - *) DFT_LIB_SUFFIX='.so' + *) #(vi + DFT_LIB_SUFFIX='.so' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; esac + ;; + *) + DFT_LIB_SUFFIX='.a' + DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX + ;; esac test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" -echo "$as_me:19948: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:20897: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:19951: checking default object directory" >&5 +echo "$as_me:20900: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -19958,47 +20907,47 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 profile) DFT_OBJ_SUBDIR='obj_p' ;; shared) case $cf_cv_system_name in #(vi - cygwin) #(vi + cygwin|msys) #(vi DFT_OBJ_SUBDIR='objects' ;; *) DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:19967: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:20916: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 -# libtool thinks it can make c++ shared libraries (perhaps only g++) -if test "$cf_with_cxx" = yes ; then -echo "$as_me:19972: checking c++ library-dependency suffix" >&5 +if test "x$cf_with_cxx" = xyes ; then +echo "$as_me:20920: 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++) + CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX +elif test "$with_shared_cxx" != "no"; then + # also for g++ users... CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX else + # we normally make a static library because C/C++ library rules differ - case normal in #(vi - libtool) #(vi + case Xnormal in #(vi + Xlibtool) #(vi CXX_LIB_SUFFIX='.la' CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; - normal) #(vi - CXX_LIB_SUFFIX='.a' - CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX - ;; - debug) #(vi + Xdebug) #(vi CXX_LIB_SUFFIX='_g.a' CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; - profile) #(vi + Xprofile) #(vi CXX_LIB_SUFFIX='_p.a' CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; - shared) #(vi + Xshared) #(vi case $cf_cv_system_name in aix[5-7]*) #(vi - CXX_LIB_SUFFIX='.a' + CXX_LIB_SUFFIX='.so' CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; - cygwin*|mingw*) #(vi + cygwin*|msys*|mingw*) #(vi CXX_LIB_SUFFIX='.dll' CXX_DEP_SUFFIX='.dll.a' ;; @@ -20018,21 +20967,28 @@ else ;; esac ;; - *) CXX_LIB_SUFFIX='.so' + *) #(vi + CXX_LIB_SUFFIX='.so' CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; esac + ;; + *) + CXX_LIB_SUFFIX='.a' + CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX + ;; esac test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}" test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}" + fi -echo "$as_me:20029: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:20985: 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 "$with_dlsym" = yes ; then +if test "x$with_dlsym" = xyes ; then if test $DFT_LWR_MODEL = shared || \ test $DFT_LWR_MODEL = libtool ; then @@ -20046,7 +21002,7 @@ fi # TICS_LIST and TINFO_LIST are needed to build libtic.so and libterm.so, but # do not need libdl TICS_LIST= -if test "$with_dlsym" = yes ; then +if test "x$with_dlsym" = xyes ; then # remove dl library from $SHLIB_LIST TINFO_LIST=`echo "$SHLIB_LIST" | sed -e 's/-ldl[ ]//g' -e 's/-ldl$//'` @@ -20055,7 +21011,7 @@ fi if test "$with_ticlib" != no ; then - if test "$with_ticlib" != yes ; then + if test "x$with_ticlib" != xyes ; then TICS_NAME=$with_ticlib TICS_ARG_SUFFIX="${with_ticlib}`echo ${DFT_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`" TICS_DEP_SUFFIX="${with_ticlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`" @@ -20074,7 +21030,7 @@ fi if test "$with_termlib" != no ; then - if test "$with_termlib" != yes ; then + if test "x$with_termlib" != xyes ; then TINFO_NAME=$with_termlib TINFO_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`" TINFO_ARG_SUFFIX="${with_termlib}`echo ${DFT_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`" @@ -20115,7 +21071,7 @@ else TINFO_NAME=${LIB_NAME} TINFO_SUFFIX=${DFT_LIB_SUFFIX} TINFO_ARG_SUFFIX=${LIB_NAME}${DFT_ARG_SUFFIX} - if test "$with_tic_depends" = yes ; then + if test "x$with_tic_depends" = xyes ; then TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}" else TICS_LIST="$SHLIB_LIST" @@ -20127,14 +21083,14 @@ fi if test "$DFT_LWR_MODEL" = shared ; then case $cf_cv_system_name in #(vi - cygwin*) - # "lib" files have ".dll.a" suffix, "cyg" files have ".dll" + cygwin*|msys*) + # "lib" files have ".dll.a" suffix, "cyg"or "msys-" files have ".dll" TINFO_SUFFIX=.dll ;; esac fi -if test "$with_dlsym" = yes ; then +if test "x$with_dlsym" = xyes ; then # remove dl library from $TICS_LIST TICS_LIST=`echo "$TICS_LIST" | sed -e 's/-ldl[ ]//g' -e 's/-ldl$//'` @@ -20191,19 +21147,19 @@ fi if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" then - echo "$as_me:20194: checking if linker supports switching between static/dynamic" >&5 + echo "$as_me:21150: 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:20203: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:21159: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20206: \$? = $ac_status" >&5 + echo "$as_me:21162: \$? = $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 @@ -20214,10 +21170,10 @@ EOF LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 20217 "configure" +#line 21173 "configure" #include "confdefs.h" -#line 20220 "configure" +#line 21176 "configure" #include int cf_ldflags_static(FILE *fp); @@ -20232,16 +21188,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20235: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21191: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20238: \$? = $ac_status" >&5 + echo "$as_me:21194: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20241: \"$ac_try\"") >&5 + { (eval echo "$as_me:21197: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20244: \$? = $ac_status" >&5 + echo "$as_me:21200: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # some linkers simply ignore the -dynamic @@ -20264,7 +21220,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f libconftest.* LIBS="$cf_save_LIBS" - echo "$as_me:20267: result: $cf_ldflags_static" >&5 + echo "$as_me:21223: result: $cf_ldflags_static" >&5 echo "${ECHO_T}$cf_ldflags_static" >&6 if test $cf_ldflags_static != yes @@ -20280,20 +21236,25 @@ fi ;; esac -echo "$as_me:20283: checking where we will install curses.h" >&5 +echo "$as_me:21239: checking where we will install curses.h" >&5 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 -test "$with_overwrite" = no && \ -test "x$includedir" = 'x${prefix}/include' && \ - includedir='${prefix}/include/ncurses'${LIB_SUFFIX} -echo "$as_me:20288: result: $includedir" >&5 -echo "${ECHO_T}$includedir" >&6 + +includesubdir= +if test "$with_overwrite" = no && \ + ( test "x$includedir" = 'x${prefix}/include' || \ + test "x$includedir" = "x${prefix}/include" ) +then + includesubdir="/ncurses${LIB_SUFFIX}" +fi +echo "$as_me:21249: result: ${includedir}${includesubdir}" >&5 +echo "${ECHO_T}${includedir}${includesubdir}" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications ### that will need libutf8 to add it to their configure script. if test "$with_overwrite" != no ; then if test "$NCURSES_LIBUTF8" = 1 ; then NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' - { echo "$as_me:20296: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:21257: 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 @@ -20303,6 +21264,7 @@ WITH_OVERWRITE=$with_overwrite NCURSES_TREE= ### predefined stuff for the test programs + cat >>confdefs.h <<\EOF #define HAVE_SLK_COLOR 1 EOF @@ -20310,7 +21272,7 @@ EOF ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:20313: checking for src modules" >&5 +echo "$as_me:21275: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -20375,7 +21337,7 @@ EOF fi fi done -echo "$as_me:20378: result: $cf_cv_src_modules" >&5 +echo "$as_me:21340: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -20393,7 +21355,9 @@ done if test "x$cf_with_tests" != "xno" ; then SRC_SUBDIRS="$SRC_SUBDIRS test" fi -test -z "$MAKE_TERMINFO" && SRC_SUBDIRS="$SRC_SUBDIRS misc" +if test "x$cf_with_db_install" = xyes; then + test -z "$MAKE_TERMINFO" && SRC_SUBDIRS="$SRC_SUBDIRS misc" +fi if test "$cf_with_cxx_binding" != no; then PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ncurses++${DFT_ARG_SUFFIX}" SRC_SUBDIRS="$SRC_SUBDIRS c++" @@ -20441,7 +21405,7 @@ do profile) cf_subdir='obj_p' ;; shared) case $cf_cv_system_name in #(vi - cygwin) #(vi + cygwin|msys) #(vi cf_subdir='objects' ;; *) cf_subdir='obj_s' ;; @@ -20463,6 +21427,7 @@ done NCURSES_SHLIB2='sh $(top_srcdir)/misc/shlib' # values to use as strings + cat >>confdefs.h <&5 +echo "$as_me:21561: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TIC_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20604,7 +21575,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_PATH="$ac_dir/$ac_word" - echo "$as_me:20607: found $ac_dir/$ac_word" >&5 + echo "$as_me:21578: found $ac_dir/$ac_word" >&5 break fi done @@ -20616,10 +21587,10 @@ fi TIC_PATH=$ac_cv_path_TIC_PATH if test -n "$TIC_PATH"; then - echo "$as_me:20619: result: $TIC_PATH" >&5 + echo "$as_me:21590: result: $TIC_PATH" >&5 echo "${ECHO_T}$TIC_PATH" >&6 else - echo "$as_me:20622: result: no" >&5 + echo "$as_me:21593: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20627,7 +21598,7 @@ if test -n "$FALLBACK_LIST" then if test "$TIC_PATH" = unknown then - { echo "$as_me:20630: WARNING: no tic program found for fallbacks" >&5 + { echo "$as_me:21601: WARNING: no tic program found for fallbacks" >&5 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} fi fi @@ -20640,6 +21611,54 @@ fi ADAHTML_DIR=../../doc/html/ada +# these could be configurable, but are not currently +PANEL_NAME=panel +MENU_NAME=menu +FORM_NAME=form +CXX_NAME=ncurses++ + +# workaround for g++ versus Solaris (20131116) +case $cf_cv_system_name in #(vi +solaris2*) #(vi + case "x$CPPFLAGS" in #(vi + *-D_XOPEN_SOURCE_EXTENDED*) + test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 + +echo "${as_me:-configure}:21627: 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//'` + ;; + esac + ;; +esac + +# AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. +case "x$NCURSES_OSPEED" in #(vi +*short*) #(vi + cf_compatible=1 + ;; +*) + cf_compatible=0 + ;; +esac + +cat >>confdefs.h <&5 +{ echo "$as_me:21745: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -20855,7 +21874,7 @@ EOF cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:20902: error: ambiguous option: $1 + { { echo "$as_me:21921: 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;} @@ -20918,7 +21937,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:20921: error: unrecognized option: $1 + -*) { { echo "$as_me:21940: 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;} @@ -20937,7 +21956,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20120310, executed with +This file was extended by $as_me 2.52.20121002, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -20985,7 +22004,7 @@ TINFO_NAME="$TINFO_NAME" TINFO_SUFFIX="$TINFO_SUFFIX" USE_OLD_MAKERULES="$USE_OLD_MAKERULES" WITH_CURSES_H="$with_curses_h" -WITH_ECHO="$with_echo" +WITH_ECHO="${enable_echo:=yes}" WITH_OVERWRITE="$with_overwrite" cf_LIST_MODELS="$cf_list_models" cf_cv_abi_version="$cf_cv_abi_version" @@ -21005,8 +22024,10 @@ cf_cv_system_name="$cf_cv_system_name" cf_cv_term_driver="$with_term_driver" cf_with_ada="$cf_with_ada" cf_with_cxx_binding="$cf_with_cxx_binding" +cf_with_db_install="$cf_with_db_install" cf_with_manpages="$cf_with_manpages" cf_with_tests="$cf_with_tests" +with_shared_cxx="$with_shared_cxx" host="$host" target="$target" @@ -21027,7 +22048,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:21030: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:22051: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -21086,6 +22107,7 @@ s,@program_transform_name@,$program_transform_name,;t t s,@bindir@,$bindir,;t t s,@sbindir@,$sbindir,;t t s,@libexecdir@,$libexecdir,;t t +s,@datarootdir@,$datarootdir,;t t s,@datadir@,$datadir,;t t s,@sysconfdir@,$sysconfdir,;t t s,@sharedstatedir@,$sharedstatedir,;t t @@ -21138,9 +22160,8 @@ s,@CPPFLAGS@,$CPPFLAGS,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t -s,@CPP@,$CPP,;t t s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t -s,@PROG_EXT@,$PROG_EXT,;t t +s,@CPP@,$CPP,;t t s,@LDCONFIG@,$LDCONFIG,;t t s,@CXX@,$CXX,;t t s,@CXXFLAGS@,$CXXFLAGS,;t t @@ -21167,6 +22188,8 @@ s,@LD@,$LD,;t t s,@ac_ct_LD@,$ac_ct_LD,;t t s,@AR@,$AR,;t t s,@ac_ct_AR@,$ac_ct_AR,;t t +s,@NM@,$NM,;t t +s,@ac_ct_NM@,$ac_ct_NM,;t t s,@ARFLAGS@,$ARFLAGS,;t t s,@DESTDIR@,$DESTDIR,;t t s,@BUILD_CC@,$BUILD_CC,;t t @@ -21180,6 +22203,7 @@ s,@BUILD_OBJEXT@,$BUILD_OBJEXT,;t t s,@cf_list_models@,$cf_list_models,;t t s,@LIBTOOL_VERSION@,$LIBTOOL_VERSION,;t t s,@LIBTOOL@,$LIBTOOL,;t t +s,@ac_ct_LIBTOOL@,$ac_ct_LIBTOOL,;t t s,@LT_UNDEF@,$LT_UNDEF,;t t s,@LIBTOOL_CXX@,$LIBTOOL_CXX,;t t s,@LIBTOOL_OPTS@,$LIBTOOL_OPTS,;t t @@ -21201,10 +22225,13 @@ s,@LIB_PREFIX@,$LIB_PREFIX,;t t s,@CC_G_OPT@,$CC_G_OPT,;t t s,@CXX_G_OPT@,$CXX_G_OPT,;t t s,@LD_MODEL@,$LD_MODEL,;t t +s,@shlibdir@,$shlibdir,;t t +s,@MAKE_DLLS@,$MAKE_DLLS,;t t s,@CC_SHARED_OPTS@,$CC_SHARED_OPTS,;t t s,@LD_RPATH_OPT@,$LD_RPATH_OPT,;t t s,@LD_SHARED_OPTS@,$LD_SHARED_OPTS,;t t s,@MK_SHARED_LIB@,$MK_SHARED_LIB,;t t +s,@RM_SHARED_OPTS@,$RM_SHARED_OPTS,;t t s,@LINK_PROGS@,$LINK_PROGS,;t t s,@LINK_TESTS@,$LINK_TESTS,;t t s,@EXTRA_LDFLAGS@,$EXTRA_LDFLAGS,;t t @@ -21214,6 +22241,7 @@ s,@INSTALL_LIB@,$INSTALL_LIB,;t t s,@RPATH_LIST@,$RPATH_LIST,;t t s,@cf_ldd_prog@,$cf_ldd_prog,;t t s,@TERMINFO_SRC@,$TERMINFO_SRC,;t t +s,@NCURSES_USE_DATABASE@,$NCURSES_USE_DATABASE,;t t s,@FALLBACK_LIST@,$FALLBACK_LIST,;t t s,@WHICH_XTERM@,$WHICH_XTERM,;t t s,@XTERM_KBS@,$XTERM_KBS,;t t @@ -21222,6 +22250,7 @@ s,@TERMINFO@,$TERMINFO,;t t s,@MAKE_TERMINFO@,$MAKE_TERMINFO,;t t s,@USE_BIG_STRINGS@,$USE_BIG_STRINGS,;t t s,@TERMPATH@,$TERMPATH,;t t +s,@NCURSES_USE_TERMCAP@,$NCURSES_USE_TERMCAP,;t t s,@BROKEN_LINKER@,$BROKEN_LINKER,;t t s,@NCURSES_CH_T@,$NCURSES_CH_T,;t t s,@NCURSES_LIBUTF8@,$NCURSES_LIBUTF8,;t t @@ -21285,7 +22314,6 @@ s,@cf_ada_make@,$cf_ada_make,;t t s,@cf_compile_generics@,$cf_compile_generics,;t t s,@cf_generic_objects@,$cf_generic_objects,;t t s,@USE_GNAT_SIGINT@,$USE_GNAT_SIGINT,;t t -s,@PRAGMA_UNREF@,$PRAGMA_UNREF,;t t s,@USE_OLD_MAKERULES@,$USE_OLD_MAKERULES,;t t s,@USE_GNAT_PROJECTS@,$USE_GNAT_PROJECTS,;t t s,@USE_GNAT_LIBRARIES@,$USE_GNAT_LIBRARIES,;t t @@ -21313,6 +22341,7 @@ s,@TINFO_LIBS@,$TINFO_LIBS,;t t s,@TINFO_LDFLAGS2@,$TINFO_LDFLAGS2,;t t s,@LDFLAGS_STATIC@,$LDFLAGS_STATIC,;t t s,@LDFLAGS_SHARED@,$LDFLAGS_SHARED,;t t +s,@includesubdir@,$includesubdir,;t t s,@WITH_OVERWRITE@,$WITH_OVERWRITE,;t t s,@TICS_LIST@,$TICS_LIST,;t t s,@TINFO_LIST@,$TINFO_LIST,;t t @@ -21327,6 +22356,7 @@ s,@ADA_SUBDIRS@,$ADA_SUBDIRS,;t t s,@DIRS_TO_MAKE@,$DIRS_TO_MAKE,;t t s,@NCURSES_SHLIB2@,$NCURSES_SHLIB2,;t t s,@HAVE_TCGETATTR@,$HAVE_TCGETATTR,;t t +s,@HAVE_STDINT_H@,$HAVE_STDINT_H,;t t s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t s,@HAVE_TERMIOS_H@,$HAVE_TERMIOS_H,;t t s,@MAKE_PC_FILES@,$MAKE_PC_FILES,;t t @@ -21334,6 +22364,10 @@ s,@cross_compiling@,$cross_compiling,;t t s,@TIC_PATH@,$TIC_PATH,;t t s,@MAKE_TESTS@,$MAKE_TESTS,;t t s,@ADAHTML_DIR@,$ADAHTML_DIR,;t t +s,@PANEL_NAME@,$PANEL_NAME,;t t +s,@MENU_NAME@,$MENU_NAME,;t t +s,@FORM_NAME@,$FORM_NAME,;t t +s,@CXX_NAME@,$CXX_NAME,;t t CEOF EOF @@ -21448,7 +22482,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:21451: creating $ac_file" >&5 + { echo "$as_me:22485: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -21466,7 +22500,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:21469: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:22503: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -21479,12 +22513,44 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:21482: error: cannot find input file: $f" >&5 + { { echo "$as_me:22516: 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 + 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` + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' $ac_item` + if test -z "$ac_used"; then + { echo "$as_me:22532: 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` + if test -n "$ac_seen"; then + { echo "$as_me:22541: 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;} + ac_warn_datarootdir=yes + fi + done + fi + +if test "x$ac_warn_datarootdir" = xyes; then + ac_sed_cmds="$ac_sed_cmds | sed -e 's,@datarootdir@,\${prefix}/share,g' -e 's,\${datarootdir},\${prefix}/share,g'" +fi + EOF cat >>$CONFIG_STATUS <$tmp/out rm -f $tmp/stdin if test x"$ac_file" != x-; then - mv $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` + if test -n "$ac_seen"; then + ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` + { echo "$as_me:22578: 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 + if test -s $tmp/out; then + ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` + { echo "$as_me:22589: WARNING: Some variables may not be substituted: +$ac_seen" >&5 +echo "$as_me: WARNING: Some variables may not be substituted: +$ac_seen" >&2;} + fi else cat $tmp/out - rm -f $tmp/out fi + rm -f $tmp/out done EOF @@ -21545,7 +22635,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:21548: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:22638: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -21556,7 +22646,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:21559: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:22649: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -21569,7 +22659,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:21572: error: cannot find input file: $f" >&5 + { { echo "$as_me:22662: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -21627,7 +22717,7 @@ cat >>$CONFIG_STATUS <<\EOF 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:21630: $ac_file is unchanged" >&5 + { echo "$as_me:22720: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -21694,7 +22784,7 @@ fi cf_prefix=$LIB_PREFIX case $cf_cv_shlib_version in #(vi -cygdll|mingw) +cygdll|msysdll|mingw) TINFO_NAME=$TINFO_ARG_SUFFIX TINFO_SUFFIX=.dll ;; @@ -21724,34 +22814,30 @@ do elif test -f $srcdir/$cf_dir/modules; then SHARED_LIB= - LIBS_TO_MAKE= + Libs_To_Make= for cf_item in $cf_LIST_MODELS do - case $cf_item in #(vi - libtool) #(vi + case X$cf_item in #(vi + Xlibtool) #(vi cf_suffix='.la' cf_depsuf=$cf_suffix ;; - normal) #(vi - cf_suffix='.a' - cf_depsuf=$cf_suffix - ;; - debug) #(vi + Xdebug) #(vi cf_suffix='_g.a' cf_depsuf=$cf_suffix ;; - profile) #(vi + Xprofile) #(vi cf_suffix='_p.a' cf_depsuf=$cf_suffix ;; - shared) #(vi + Xshared) #(vi case $cf_cv_system_name in aix[5-7]*) #(vi - cf_suffix='.a' + cf_suffix='.so' cf_depsuf=$cf_suffix ;; - cygwin*|mingw*) #(vi + cygwin*|msys*|mingw*) #(vi cf_suffix='.dll' cf_depsuf='.dll.a' ;; @@ -21771,90 +22857,88 @@ do ;; esac ;; - *) cf_suffix='.so' + *) #(vi + cf_suffix='.so' cf_depsuf=$cf_suffix ;; esac + ;; + *) + cf_suffix='.a' + cf_depsuf=$cf_suffix + ;; esac test -n "$LIB_SUFFIX" && cf_suffix="${LIB_SUFFIX}${cf_suffix}" test -n "$LIB_SUFFIX" && cf_depsuf="${LIB_SUFFIX}${cf_depsuf}" + cf_libname=$cf_dir + test "$cf_dir" = c++ && cf_libname=ncurses++ if test $cf_item = shared ; then - if test "$cf_cv_do_symlinks" = yes ; then - case "$cf_cv_shlib_version" in #(vi - rel) #(vi - case "$cf_cv_system_name" in #(vi - darwin*) - case .${LIB_SUFFIX} in - .tw*) - cf_suffix=`echo $cf_suffix | sed 's/^tw//'` - cf_suffix=tw'.${REL_VERSION}'"$cf_suffix" - ;; - .t*) - cf_suffix=`echo $cf_suffix | sed 's/^t//'` - cf_suffix=t'.${REL_VERSION}'"$cf_suffix" - ;; - .w*) - cf_suffix=`echo $cf_suffix | sed 's/^w//'` - cf_suffix=w'.${REL_VERSION}'"$cf_suffix" + if test -n "${LIB_SUFFIX}" + then + cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${LIB_SUFFIX}"'//'` + else + cf_shared_suffix="$cf_suffix" + fi + if test "$cf_cv_do_symlinks" = yes ; then + cf_version_name= + + case "$cf_cv_shlib_version" in #(vi + rel) #(vi + cf_version_name=REL_VERSION ;; - *) - cf_suffix='.${REL_VERSION}'"$cf_suffix" + abi) + cf_version_name=ABI_VERSION ;; esac - ;; #(vi - *) cf_suffix="$cf_suffix"'.${REL_VERSION}' ;; - esac + + if test -n "$cf_version_name" + then + case "$cf_cv_system_name" in #(vi + darwin*) + # "w", etc? + cf_suffix="${LIB_SUFFIX}"'.${'$cf_version_name'}'"$cf_shared_suffix" + ;; #(vi + *) + cf_suffix="$cf_suffix"'.${'$cf_version_name'}' + ;; + esac + fi + if test -n "${LIB_SUFFIX}" + then + cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${LIB_SUFFIX}"'//'` + else + cf_shared_suffix="$cf_suffix" + fi + fi + # 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 #(vi + cygdll) #(vi + cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` + Libs_To_Make="$Libs_To_Make ../lib/cyg${cf_libname}${cf_cygsuf}" + continue ;; - abi) - case "$cf_cv_system_name" in #(vi - darwin*) - case .${LIB_SUFFIX} in - .tw*) - cf_suffix=`echo $cf_suffix | sed 's/^tw//'` - cf_suffix=tw'.${ABI_VERSION}'"$cf_suffix" - ;; - .t*) - cf_suffix=`echo $cf_suffix | sed 's/^t//'` - cf_suffix=t'.${ABI_VERSION}'"$cf_suffix" - ;; - .w*) - cf_suffix=`echo $cf_suffix | sed 's/^w//'` - cf_suffix=w'.${ABI_VERSION}'"$cf_suffix" - ;; - *) - cf_suffix='.${ABI_VERSION}'"$cf_suffix" - ;; - esac - ;; #(vi - *) cf_suffix="$cf_suffix"'.${ABI_VERSION}' ;; - esac + msysdll) #(vi + cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` + Libs_To_Make="$Libs_To_Make ../lib/msys-${cf_libname}${cf_cygsuf}" + continue + ;; + mingw) + cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` + Libs_To_Make="$Libs_To_Make ../lib/lib${cf_libname}${cf_cygsuf}" + continue ;; esac fi - # 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 #(vi - cygdll) #(vi - cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` - LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}${cf_cygsuf}" - continue - ;; - mingw) - cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` - LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/lib${cf_dir}${cf_cygsuf}" - continue - ;; - esac - fi - LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/${cf_prefix}${cf_dir}${cf_suffix}" + Libs_To_Make="$Libs_To_Make ../lib/${cf_prefix}${cf_libname}${cf_suffix}" done if test $cf_dir = ncurses ; then cf_subsets="$LIB_SUBSETS" cf_r_parts="$cf_subsets" - cf_liblist="$LIBS_TO_MAKE" + cf_liblist="$Libs_To_Make" while test -n "$cf_r_parts" do @@ -21874,7 +22958,7 @@ do ;; esac if test -n "$cf_item"; then - LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE" + Libs_To_Make="$cf_item $Libs_To_Make" fi else break @@ -21884,13 +22968,40 @@ do cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib.* //'` fi - sed -e "s%@LIBS_TO_MAKE@%$LIBS_TO_MAKE%" \ + 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 + *.a) + ;; + *) + cf_item=`echo "$cf_item" | sed -e "s,"$cf_shared_suffix",.a,"` + ;; + esac + for cf_test in $cf_list + do + if test "$cf_test" = "$cf_item" + then + cf_LIST_MODELS=`echo "$cf_LIST_MODELS" | sed -e 's/normal//'` + cf_item= + break + fi + done + test -n "$cf_item" && cf_list="$cf_list $cf_item" + done + Libs_To_Make="$cf_list" + fi + fi + + 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 $AWK -f $srcdir/mk-0th.awk \ - libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" \ + libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" ticlib="$TICS_LIB_SUFFIX" termlib="$TINFO_LIB_SUFFIX" \ $srcdir/$cf_dir/modules >>$cf_dir/Makefile for cf_subset in $cf_subsets @@ -21898,34 +23009,47 @@ do cf_subdirs= for cf_item in $cf_LIST_MODELS do + echo "Appending rules for ${cf_item} model (${cf_dir}: ${cf_subset})" cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - case $cf_item in #(vi - libtool) #(vi + CXX_MODEL=$cf_ITEM + if test "$CXX_MODEL" = SHARED; then + case $cf_cv_shlib_version in #(vi + cygdll|msysdll|mingw) #(vi + test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 + +echo "${as_me:-configure}:23023: testing overriding CXX_MODEL to SHARED ..." 1>&5 + + with_shared_cxx=yes + ;; + *) + test "x$with_shared_cxx" = xno && CXX_MODEL=NORMAL + ;; + esac + fi + + case X$cf_item in #(vi + Xlibtool) #(vi cf_suffix='.la' cf_depsuf=$cf_suffix ;; - normal) #(vi - cf_suffix='.a' - cf_depsuf=$cf_suffix - ;; - debug) #(vi + Xdebug) #(vi cf_suffix='_g.a' cf_depsuf=$cf_suffix ;; - profile) #(vi + Xprofile) #(vi cf_suffix='_p.a' cf_depsuf=$cf_suffix ;; - shared) #(vi + Xshared) #(vi case $cf_cv_system_name in aix[5-7]*) #(vi - cf_suffix='.a' + cf_suffix='.so' cf_depsuf=$cf_suffix ;; - cygwin*|mingw*) #(vi + cygwin*|msys*|mingw*) #(vi cf_suffix='.dll' cf_depsuf='.dll.a' ;; @@ -21945,10 +23069,16 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ ;; esac ;; - *) cf_suffix='.so' + *) #(vi + cf_suffix='.so' cf_depsuf=$cf_suffix ;; esac + ;; + *) + cf_suffix='.a' + cf_depsuf=$cf_suffix + ;; esac test -n "$LIB_SUFFIX" && cf_suffix="${LIB_SUFFIX}${cf_suffix}" test -n "$LIB_SUFFIX" && cf_depsuf="${LIB_SUFFIX}${cf_depsuf}" @@ -21960,7 +23090,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ profile) cf_subdir='obj_p' ;; shared) case $cf_cv_system_name in #(vi - cygwin) #(vi + cygwin|msys) #(vi cf_subdir='objects' ;; *) cf_subdir='obj_s' ;; @@ -21981,6 +23111,8 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ cf_libname=$TICS_LIB_SUFFIX ;; esac + elif test $cf_dir = c++ ; then + cf_libname=ncurses++$LIB_SUFFIX else cf_libname=${cf_libname}$LIB_SUFFIX fi @@ -22032,6 +23164,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ name=${cf_libname}${cf_dir_suffix} \ traces=$LIB_TRACING \ MODEL=$cf_ITEM \ + CXX_MODEL=$CXX_MODEL \ model=$cf_subdir \ prefix=$cf_prefix \ suffix=$cf_suffix \ @@ -22075,7 +23208,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ done fi - echo ' cd '$cf_dir' && ${MAKE} ${CF_MFLAGS} $@' >>Makefile + echo ' cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} $@' >>Makefile done for cf_dir in $SRC_SUBDIRS @@ -22090,7 +23223,7 @@ do echo 'libs \' >> Makefile echo 'install.libs \' >> Makefile echo 'uninstall.libs ::' >> Makefile - echo ' cd '$cf_dir' && ${MAKE} ${CF_MFLAGS} $@' >> Makefile + echo ' cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} $@' >> Makefile ;; esac fi @@ -22113,7 +23246,7 @@ install.libs \\ uninstall.libs \\ install.$cf_dir \\ uninstall.$cf_dir :: - cd $cf_dir && \${MAKE} \${CF_MFLAGS} \$@ + cd $cf_dir && \${MAKE} \${TOP_MFLAGS} \$@ CF_EOF elif test -f $srcdir/$cf_dir/headers; then cat >> Makefile <> Makefile <> Makefile <> Makefile <