X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=configure;h=a32f9dff6d6ac11a54602a0fefb56ce033512376;hp=d3b3ac65af87e1dfbc49e8a9af71ef5cb64890a0;hb=5eb177874dea59107a1a2ea44f5d8f5bb99550b2;hpb=7b077b4a853fd84176d8057f263ed193210f632e diff --git a/configure b/configure index d3b3ac65..a32f9dff 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Revision: 1.590 . +# From configure.in Revision: 1.638 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20141204. +# Generated by Autoconf 2.52.20150926. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -747,7 +747,8 @@ Options to Specify the Libraries Built/Used: --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 + --with-extra-suffix=X append extra suffix to header/library paths + --disable-overwrite put headers in subdir, omit link to -lcurses --disable-database do not use terminfo, only fallbacks/termcap --with-database=XXX specify terminfo source to install --with-hashed-db specify hashed-database library @@ -772,6 +773,7 @@ Fine-Tuning Your Configuration: --disable-largefile omit support for large files --disable-tparm-varargs compile tparm() without varargs interface --disable-tic-depends link tic library without explicit dependency on ncurses library + --disable-wattr-macros suppress wattr* macros to help with ncurses5/ncurses6 transition --with-bool=TYPE override fallback type of bool variable --with-caps=alt compile with alternate Caps file --with-chtype=TYPE override type of chtype @@ -789,15 +791,25 @@ Options to Specify How Manpages are Installed: --with-manpage-tbl specify manpage processing with tbl Extensions: --disable-ext-funcs disable function-extensions - --enable-sp-funcs enable experimental SCREEN-extensions - --enable-term-driver enable experimental terminal-driver + --enable-sp-funcs enable SCREEN-extensions + --enable-term-driver enable terminal-driver --enable-const compile with extra/non-standard const --enable-ext-colors compile for 256-color support --enable-ext-mouse compile for extended mouse-encoding + --enable-ext-putwin compile with extended putwin/screendump --enable-no-padding compile with $NCURSES_NO_PADDING code --enable-signed-char compile using signed Boolean's in term.h --enable-sigwinch compile with SIGWINCH handler --enable-tcap-names compile with user-definable terminal capabilities + --with-pthread use POSIX thread library + --enable-pthreads-eintr enable EINTR in wgetch with pthreads + --enable-weak-symbols enable weak-symbols for pthreads + --enable-reentrant compile with reentrant code + --enable-opaque-curses make curses WINDOW, etc., "opaque" + --enable-opaque-form make form-library structures "opaque" + --enable-opaque-menu make menu-library structures "opaque" + --enable-opaque-panel make panel-library structures "opaque" + --with-wrap-prefix=XXX override prefix used for public variables Development Code: --without-develop disable development options --enable-hard-tabs compile with hard-tabs code @@ -806,15 +818,10 @@ Experimental Code: --disable-assumed-color do not assume anything about default-colors --disable-hashmap compile without hashmap scrolling-optimization --enable-colorfgbg compile-in experimental $COLORFGBG code - --enable-interop compile-in experimental interop bindings - --with-pthread use POSIX thread library - --enable-pthreads-eintr enable EINTR in wgetch with pthreads - --enable-weak-symbols enable weak-symbols for pthreads - --enable-reentrant compile with experimental reentrant code - --with-wrap-prefix=XXX override prefix used for public variables + --enable-interop compile-in interop bindings --enable-safe-sprintf compile with experimental safe-sprintf code --disable-scroll-hints compile without scroll-hints code - --enable-wgetch-events compile with experimental wgetch-events code + --enable-wgetch-events compile with wgetch-events code Testing/development Options: --disable-echo do not display "compiling" commands --enable-warnings build: turn on GCC compiler warnings @@ -905,7 +912,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.20141204. Invocation command line was +generated by GNU Autoconf 2.52.20150926. Invocation command line was $ $0 $@ @@ -1029,7 +1036,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:1032: loading site script $ac_site_file" >&5 + { echo "$as_me:1039: 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" @@ -1040,7 +1047,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:1043: loading cache $cache_file" >&5 + { echo "$as_me:1050: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1048,7 +1055,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:1051: creating cache $cache_file" >&5 + { echo "$as_me:1058: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1064,21 +1071,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:1067: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:1074: 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:1071: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:1078: 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:1077: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:1084: 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:1079: former value: $ac_old_val" >&5 + { echo "$as_me:1086: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:1081: current value: $ac_new_val" >&5 + { echo "$as_me:1088: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -1097,9 +1104,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if $ac_cache_corrupted; then - { echo "$as_me:1100: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1107: 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:1102: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1109: 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 @@ -1120,10 +1127,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1123: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1130: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1126: \$? = $ac_status" >&5 + echo "$as_me:1133: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -1136,21 +1143,21 @@ ac_config_headers="$ac_config_headers include/ncurses_cfg.h:include/ncurses_cfg. top_builddir=`pwd` -echo "$as_me:1139: checking for egrep" >&5 +echo "$as_me:1146: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_prog_egrep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' + fi fi -echo "$as_me:1149: result: $ac_cv_prog_egrep" >&5 +echo "$as_me:1156: result: $ac_cv_prog_egrep" >&5 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep + EGREP=$ac_cv_prog_egrep -test -z "$EGREP" && { { echo "$as_me:1153: error: No egrep program found" >&5 + test -z "$EGREP" && { { echo "$as_me:1160: error: No egrep program found" >&5 echo "$as_me: error: No egrep program found" >&2;} { (exit 1); exit 1; }; } @@ -1160,11 +1167,11 @@ 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:1163: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 +echo "$as_me:1170: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 if test -f $srcdir/VERSION ; then - echo "$as_me:1167: checking for package version" >&5 + echo "$as_me:1174: checking for package version" >&5 echo $ECHO_N "checking for package version... $ECHO_C" >&6 # if there are not enough fields, cut returns the last one... @@ -1176,39 +1183,39 @@ echo $ECHO_N "checking for package version... $ECHO_C" >&6 VERSION="$cf_field1" VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'` - test -z "$VERSION_MAJOR" && { { echo "$as_me:1179: error: missing major-version" >&5 + test -z "$VERSION_MAJOR" && { { echo "$as_me:1186: error: missing major-version" >&5 echo "$as_me: error: missing major-version" >&2;} { (exit 1); exit 1; }; } VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'` - test -z "$VERSION_MINOR" && { { echo "$as_me:1184: error: missing minor-version" >&5 + test -z "$VERSION_MINOR" && { { echo "$as_me:1191: error: missing minor-version" >&5 echo "$as_me: error: missing minor-version" >&2;} { (exit 1); exit 1; }; } - echo "$as_me:1188: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5 + echo "$as_me:1195: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5 echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6 - echo "$as_me:1191: checking for package patch date" >&5 + echo "$as_me:1198: checking for package patch date" >&5 echo $ECHO_N "checking for package patch date... $ECHO_C" >&6 VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'` case .$VERSION_PATCH in - .) - { { echo "$as_me:1196: error: missing patch-date $VERSION_PATCH" >&5 + (.) + { { echo "$as_me:1203: error: missing patch-date $VERSION_PATCH" >&5 echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;} { (exit 1); exit 1; }; } ;; - .[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]) + (.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]) ;; - *) - { { echo "$as_me:1203: error: illegal patch-date $VERSION_PATCH" >&5 + (*) + { { echo "$as_me:1210: error: illegal patch-date $VERSION_PATCH" >&5 echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;} { (exit 1); exit 1; }; } ;; esac - echo "$as_me:1208: result: $VERSION_PATCH" >&5 + echo "$as_me:1215: result: $VERSION_PATCH" >&5 echo "${ECHO_T}$VERSION_PATCH" >&6 else - { { echo "$as_me:1211: error: did not find $srcdir/VERSION" >&5 + { { echo "$as_me:1218: error: did not find $srcdir/VERSION" >&5 echo "$as_me: error: did not find $srcdir/VERSION" >&2;} { (exit 1); exit 1; }; } fi @@ -1216,19 +1223,19 @@ fi # show the actual data that we have for versions: test -n "$verbose" && echo " ABI VERSION $VERSION" 1>&6 -echo "${as_me:-configure}:1219: testing ABI VERSION $VERSION ..." 1>&5 +echo "${as_me:-configure}:1226: testing ABI VERSION $VERSION ..." 1>&5 test -n "$verbose" && echo " VERSION_MAJOR $VERSION_MAJOR" 1>&6 -echo "${as_me:-configure}:1223: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5 +echo "${as_me:-configure}:1230: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5 test -n "$verbose" && echo " VERSION_MINOR $VERSION_MINOR" 1>&6 -echo "${as_me:-configure}:1227: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5 +echo "${as_me:-configure}:1234: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5 test -n "$verbose" && echo " VERSION_PATCH $VERSION_PATCH" 1>&6 -echo "${as_me:-configure}:1231: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5 +echo "${as_me:-configure}:1238: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5 cf_PACKAGE=NCURSES PACKAGE=ncurses @@ -1252,7 +1259,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:1255: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 + { echo "$as_me:1262: 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; @@ -1261,33 +1268,33 @@ fi; NCURSES_MINOR=`echo "$cf_cv_rel_version" | sed -e 's/^[^.]*//' -e 's/^\.//' -e 's/\..*//'` if test -n "$NCURSES_MAJOR" ; then - case $NCURSES_MAJOR in #(vi - [0-9]*) #(vi + case $NCURSES_MAJOR in + ([0-9]*) ;; - *) - { { echo "$as_me:1268: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 + (*) + { { echo "$as_me:1275: 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:1274: error: Release major-version value is empty" >&5 + { { echo "$as_me:1281: error: Release major-version value is empty" >&5 echo "$as_me: error: Release major-version value is empty" >&2;} { (exit 1); exit 1; }; } fi if test -n "$NCURSES_MINOR" ; then - case $NCURSES_MINOR in #(vi - [0-9]*) #(vi + case $NCURSES_MINOR in + ([0-9]*) ;; - *) - { { echo "$as_me:1284: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 + (*) + { { echo "$as_me:1291: 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:1290: error: Release minor-version value is empty" >&5 + { { echo "$as_me:1297: error: Release minor-version value is empty" >&5 echo "$as_me: error: Release minor-version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -1297,27 +1304,48 @@ 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:1300: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 + + if test "x$cf_cv_abi_version" != "x$withval" + then + { echo "$as_me:1310: 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 + case $cf_cv_rel_version in + (5.*) + cf_cv_rel_version=$withval.0 + ;; + (6.*) + cf_cv_rel_version=$withval.9 # FIXME: should be 10 as of 6.0 release + ;; + esac + fi + cf_cv_abi_version=$withval fi; if test -n "$cf_cv_abi_version" ; then - case $cf_cv_abi_version in #(vi - [0-9]*) #(vi + case $cf_cv_abi_version in + ([0-9]*) ;; - *) - { { echo "$as_me:1310: error: ABI version is not a number: $cf_cv_abi_version" >&5 + (*) + { { echo "$as_me:1329: 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:1316: error: ABI version value is empty" >&5 + { { echo "$as_me:1335: error: ABI version value is empty" >&5 echo "$as_me: error: ABI version value is empty" >&2;} { (exit 1); exit 1; }; } fi +if test "x$cf_cv_abi_version" != "x$with_abi_version" +then + case $cf_cv_rel_version in + (5.*) + cf_cv_rel_version=$with_abi_version.0 + ;; + esac +fi + ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -1335,7 +1363,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1338: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1366: 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 @@ -1345,11 +1373,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:1348: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1376: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1352: checking build system type" >&5 +echo "$as_me:1380: 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 @@ -1358,23 +1386,23 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1361: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1389: 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:1365: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1393: 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:1370: result: $ac_cv_build" >&5 +echo "$as_me:1398: 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:1377: checking host system type" >&5 +echo "$as_me:1405: 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 @@ -1383,12 +1411,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:1386: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1414: 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:1391: result: $ac_cv_host" >&5 +echo "$as_me:1419: 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/'` @@ -1396,7 +1424,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:1399: checking target system type" >&5 + echo "$as_me:1427: 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 @@ -1405,12 +1433,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:1408: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + { { echo "$as_me:1436: 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:1413: result: $ac_cv_target" >&5 +echo "$as_me:1441: 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/'` @@ -1442,13 +1470,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1445: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1473: 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:1449: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1477: 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:1451: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1479: 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 @@ -1456,7 +1484,7 @@ fi # Check whether --with-system-type or --without-system-type was given. if test "${with_system_type+set}" = set; then withval="$with_system_type" - { echo "$as_me:1459: WARNING: overriding system type to $withval" >&5 + { echo "$as_me:1487: WARNING: overriding system type to $withval" >&5 echo "$as_me: WARNING: overriding system type to $withval" >&2;} cf_cv_system_name=$withval host_os=$withval @@ -1468,23 +1496,23 @@ cf_user_CFLAGS="$CFLAGS" ### Default install-location -echo "$as_me:1471: checking for prefix" >&5 +echo "$as_me:1499: 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*|msys*|k*bsd*-gnu|mingw*) + (openbsd*|freebsd*|mirbsd*|linux*|cygwin*|msys*|k*bsd*-gnu|mingw*) prefix=/usr ;; - *) prefix=$ac_default_prefix + (*) prefix=$ac_default_prefix ;; esac fi -echo "$as_me:1483: result: $prefix" >&5 +echo "$as_me:1511: result: $prefix" >&5 echo "${ECHO_T}$prefix" >&6 if test "x$prefix" = "xNONE" ; then -echo "$as_me:1487: checking for default include-directory" >&5 +echo "$as_me:1515: 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 \ @@ -1507,10 +1535,41 @@ do fi test -n "$verbose" && echo " tested $cf_dir" 1>&6 done -echo "$as_me:1510: result: $includedir" >&5 +echo "$as_me:1538: result: $includedir" >&5 echo "${ECHO_T}$includedir" >&6 fi +### Defaults for ncurses ABI + +case x$cf_cv_abi_version in +(x[6789]) + cf_dft_ext_colors=yes + cf_dft_ext_const=yes + cf_dft_ext_mouse=yes + cf_dft_ext_putwin=yes + cf_dft_ext_spfuncs=yes + cf_dft_filter_syms=yes + cf_dft_chtype=uint32_t + cf_dft_mmask_t=uint32_t + cf_dft_interop=yes + cf_dft_tparm_arg=intptr_t + cf_dft_with_lp64=yes + ;; +(*) + cf_dft_ext_colors=no + cf_dft_ext_const=no + cf_dft_ext_mouse=no + cf_dft_ext_putwin=no + cf_dft_ext_spfuncs=no + cf_dft_filter_syms=no + cf_dft_chtype=auto + cf_dft_mmask_t=auto + cf_dft_interop=no + cf_dft_tparm_arg=long + cf_dft_with_lp64=no + ;; +esac + ### Checks for programs. # Check whether --with-ada or --without-ada was given. @@ -1538,7 +1597,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:1541: checking for $ac_word" >&5 +echo "$as_me:1600: 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 @@ -1553,7 +1612,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:1556: found $ac_dir/$ac_word" >&5 +echo "$as_me:1615: found $ac_dir/$ac_word" >&5 break done @@ -1561,10 +1620,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1564: result: $CC" >&5 + echo "$as_me:1623: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1567: result: no" >&5 + echo "$as_me:1626: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1577,7 +1636,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1580: checking for $ac_word" >&5 +echo "$as_me:1639: 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 @@ -1592,7 +1651,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:1595: found $ac_dir/$ac_word" >&5 +echo "$as_me:1654: found $ac_dir/$ac_word" >&5 break done @@ -1600,10 +1659,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1603: result: $ac_ct_CC" >&5 + echo "$as_me:1662: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1606: result: no" >&5 + echo "$as_me:1665: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1613,32 +1672,32 @@ done CC=$ac_ct_CC fi -test -z "$CC" && { { echo "$as_me:1616: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1675: 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:1621:" \ +echo "$as_me:1680:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1624: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1683: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1627: \$? = $ac_status" >&5 + echo "$as_me:1686: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1629: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1688: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1632: \$? = $ac_status" >&5 + echo "$as_me:1691: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1634: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1693: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1637: \$? = $ac_status" >&5 + echo "$as_me:1696: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1641 "configure" +#line 1700 "configure" #include "confdefs.h" int @@ -1654,13 +1713,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:1657: checking for C compiler default output" >&5 +echo "$as_me:1716: 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:1660: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1719: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1663: \$? = $ac_status" >&5 + echo "$as_me:1722: \$? = $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 @@ -1683,34 +1742,34 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1686: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1745: 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:1692: result: $ac_file" >&5 +echo "$as_me:1751: 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:1697: checking whether the C compiler works" >&5 +echo "$as_me:1756: 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:1703: \"$ac_try\"") >&5 + { (eval echo "$as_me:1762: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1706: \$? = $ac_status" >&5 + echo "$as_me:1765: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1713: error: cannot run C compiled programs. + { { echo "$as_me:1772: 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;} @@ -1718,24 +1777,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1721: result: yes" >&5 +echo "$as_me:1780: 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:1728: checking whether we are cross compiling" >&5 +echo "$as_me:1787: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1730: result: $cross_compiling" >&5 +echo "$as_me:1789: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1733: checking for executable suffix" >&5 +echo "$as_me:1792: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1735: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1794: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1738: \$? = $ac_status" >&5 + echo "$as_me:1797: \$? = $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 @@ -1751,25 +1810,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1754: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1813: 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:1760: result: $ac_cv_exeext" >&5 +echo "$as_me:1819: 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:1766: checking for object suffix" >&5 +echo "$as_me:1825: 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 1772 "configure" +#line 1831 "configure" #include "confdefs.h" int @@ -1781,10 +1840,10 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1784: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1843: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1787: \$? = $ac_status" >&5 + echo "$as_me:1846: \$? = $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 @@ -1796,24 +1855,24 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1799: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1858: 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:1806: result: $ac_cv_objext" >&5 +echo "$as_me:1865: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1810: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1869: 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 1816 "configure" +#line 1875 "configure" #include "confdefs.h" int @@ -1828,16 +1887,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1831: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1890: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1834: \$? = $ac_status" >&5 + echo "$as_me:1893: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1837: \"$ac_try\"") >&5 + { (eval echo "$as_me:1896: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1840: \$? = $ac_status" >&5 + echo "$as_me:1899: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1849,19 +1908,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1852: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1911: 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:1858: checking whether $CC accepts -g" >&5 +echo "$as_me:1917: 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 1864 "configure" +#line 1923 "configure" #include "confdefs.h" int @@ -1873,16 +1932,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1876: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1935: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1879: \$? = $ac_status" >&5 + echo "$as_me:1938: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1882: \"$ac_try\"") >&5 + { (eval echo "$as_me:1941: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1885: \$? = $ac_status" >&5 + echo "$as_me:1944: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1892,7 +1951,7 @@ ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1895: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1954: 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 @@ -1919,16 +1978,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1922: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1981: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1925: \$? = $ac_status" >&5 + echo "$as_me:1984: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1928: \"$ac_try\"") >&5 + { (eval echo "$as_me:1987: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1931: \$? = $ac_status" >&5 + echo "$as_me:1990: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1940,7 +1999,7 @@ if { (eval echo "$as_me:1922: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1943 "configure" +#line 2002 "configure" #include "confdefs.h" #include $ac_declaration @@ -1953,16 +2012,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1956: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2015: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1959: \$? = $ac_status" >&5 + echo "$as_me:2018: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1962: \"$ac_try\"") >&5 + { (eval echo "$as_me:2021: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1965: \$? = $ac_status" >&5 + echo "$as_me:2024: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1972,7 +2031,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1975 "configure" +#line 2034 "configure" #include "confdefs.h" $ac_declaration int @@ -1984,16 +2043,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1987: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2046: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1990: \$? = $ac_status" >&5 + echo "$as_me:2049: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1993: \"$ac_try\"") >&5 + { (eval echo "$as_me:2052: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1996: \$? = $ac_status" >&5 + echo "$as_me:2055: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -2023,15 +2082,15 @@ ac_main_return=return GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:2026: checking version of $CC" >&5 + echo "$as_me:2085: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:2030: result: $GCC_VERSION" >&5 + echo "$as_me:2089: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi -echo "$as_me:2034: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:2093: 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 @@ -2039,7 +2098,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 2042 "configure" +#line 2101 "configure" #include "confdefs.h" #include #include @@ -2088,16 +2147,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:2091: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2150: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2094: \$? = $ac_status" >&5 + echo "$as_me:2153: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2097: \"$ac_try\"") >&5 + { (eval echo "$as_me:2156: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2100: \$? = $ac_status" >&5 + echo "$as_me:2159: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2114,10 +2173,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2117: result: none needed" >&5 + echo "$as_me:2176: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2120: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2179: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -2125,31 +2184,36 @@ esac # This should have been defined by AC_PROG_CC : ${CC:=cc} -echo "$as_me:2128: checking \$CC variable" >&5 +echo "$as_me:2187: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 -case "$CC" in #(vi -*[\ \ ]-[IUD]*) - echo "$as_me:2132: result: broken" >&5 +case "$CC" in +(*[\ \ ]-*) + echo "$as_me:2191: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2134: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2193: 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/^[^ ]*[ ]//'` - CC=`echo "$CC" | sed -e 's/[ ].*//'` + cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` + cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'` + CC="$cf_prog" + for cf_arg in $cf_flags + do + case "x$cf_arg" in + (x-[IUDfgOW]*) cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_flags +for cf_add_cflags in $cf_arg do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -2157,20 +2221,26 @@ no) && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue fi ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -2179,17 +2249,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + ;; esac ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + ;; esac ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` @@ -2202,22 +2280,46 @@ done if test -n "$cf_new_cflags" ; then - CFLAGS="$CFLAGS $cf_new_cflags" + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + fi if test -n "$cf_new_cppflags" ; then - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + fi if test -n "$cf_new_extra_cppflags" ; then - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + fi + ;; + (*) + CC="$CC $cf_arg" + ;; + esac + done + test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 + +echo "${as_me:-configure}:2310: testing resulting CC: '$CC' ..." 1>&5 + + test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 + +echo "${as_me:-configure}:2314: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 + + test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 + +echo "${as_me:-configure}:2318: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 + ;; -*) - echo "$as_me:2220: result: ok" >&5 +(*) + echo "$as_me:2322: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac @@ -2228,7 +2330,7 @@ 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:2231: checking how to run the C preprocessor" >&5 +echo "$as_me:2333: 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 @@ -2249,18 +2351,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 2252 "configure" +#line 2354 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2257: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2359: \"$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:2263: \$? = $ac_status" >&5 + echo "$as_me:2365: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2283,17 +2385,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 2286 "configure" +#line 2388 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2290: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2392: \"$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:2296: \$? = $ac_status" >&5 + echo "$as_me:2398: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2330,7 +2432,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2333: result: $CPP" >&5 +echo "$as_me:2435: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2340,18 +2442,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 2343 "configure" +#line 2445 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2348: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2450: \"$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:2354: \$? = $ac_status" >&5 + echo "$as_me:2456: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2374,17 +2476,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 2377 "configure" +#line 2479 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2381: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2483: \"$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:2387: \$? = $ac_status" >&5 + echo "$as_me:2489: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2412,7 +2514,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:2415: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2517: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2425,14 +2527,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:2428: checking whether $CC needs -traditional" >&5 + echo "$as_me:2530: 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 2435 "configure" +#line 2537 "configure" #include "confdefs.h" #include int Autoconf = TIOCGETP; @@ -2447,7 +2549,7 @@ rm -rf conftest* if test $ac_cv_prog_gcc_traditional = no; then cat >conftest.$ac_ext <<_ACEOF -#line 2450 "configure" +#line 2552 "configure" #include "confdefs.h" #include int Autoconf = TCGETA; @@ -2460,38 +2562,37 @@ rm -rf conftest* fi fi -echo "$as_me:2463: result: $ac_cv_prog_gcc_traditional" >&5 +echo "$as_me:2565: 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:2470: checking whether $CC understands -c and -o together" >&5 +echo "$as_me:2572: 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() +int main(void) { ${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:2486: \"$ac_try\"") >&5 +ac_try='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +if { (eval echo "$as_me:2587: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2489: \$? = $ac_status" >&5 + echo "$as_me:2590: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:2491: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:2592: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2494: \$? = $ac_status" >&5 + echo "$as_me:2595: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CC_c_o=yes @@ -2502,24 +2603,24 @@ rm -rf conftest* fi if test $cf_cv_prog_CC_c_o = yes; then - echo "$as_me:2505: result: yes" >&5 + echo "$as_me:2606: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2508: result: no" >&5 + echo "$as_me:2609: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cross_compiling" = yes ; then - LDCONFIG=: + LDCONFIG=: else -case "$cf_cv_system_name" in #(vi -dragonfly*|mirbsd*|freebsd*) #(vi - test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R" - ;; -*) LDPATH=$PATH:/sbin:/usr/sbin - # Extract the first word of "ldconfig", so it can be a program name with args. + case "$cf_cv_system_name" in + (dragonfly*|mirbsd*|freebsd*) + test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R" + ;; + (*) 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:2522: checking for $ac_word" >&5 +echo "$as_me:2623: 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 @@ -2536,7 +2637,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:2539: found $ac_dir/$ac_word" >&5 + echo "$as_me:2640: found $ac_dir/$ac_word" >&5 break fi done @@ -2547,18 +2648,18 @@ fi LDCONFIG=$ac_cv_path_LDCONFIG if test -n "$LDCONFIG"; then - echo "$as_me:2550: result: $LDCONFIG" >&5 + echo "$as_me:2651: result: $LDCONFIG" >&5 echo "${ECHO_T}$LDCONFIG" >&6 else - echo "$as_me:2553: result: no" >&5 + echo "$as_me:2654: result: no" >&5 echo "${ECHO_T}no" >&6 fi - ;; -esac + ;; + esac fi -echo "$as_me:2561: checking if you want to ensure bool is consistent with C++" >&5 +echo "$as_me:2662: 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. @@ -2568,7 +2669,7 @@ if test "${with_cxx+set}" = set; then else cf_with_cxx=yes fi; -echo "$as_me:2571: result: $cf_with_cxx" >&5 +echo "$as_me:2672: result: $cf_with_cxx" >&5 echo "${ECHO_T}$cf_with_cxx" >&6 if test "X$cf_with_cxx" = Xno ; then CXX="" @@ -2586,7 +2687,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:2589: checking for $ac_word" >&5 +echo "$as_me:2690: 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 @@ -2601,7 +2702,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:2604: found $ac_dir/$ac_word" >&5 +echo "$as_me:2705: found $ac_dir/$ac_word" >&5 break done @@ -2609,10 +2710,10 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:2612: result: $CXX" >&5 + echo "$as_me:2713: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:2615: result: no" >&5 + echo "$as_me:2716: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2625,7 +2726,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:2628: checking for $ac_word" >&5 +echo "$as_me:2729: 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 @@ -2640,7 +2741,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:2643: found $ac_dir/$ac_word" >&5 +echo "$as_me:2744: found $ac_dir/$ac_word" >&5 break done @@ -2648,10 +2749,10 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:2651: result: $ac_ct_CXX" >&5 + echo "$as_me:2752: result: $ac_ct_CXX" >&5 echo "${ECHO_T}$ac_ct_CXX" >&6 else - echo "$as_me:2654: result: no" >&5 + echo "$as_me:2755: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2663,32 +2764,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++" fi # Provide some information about the compiler. -echo "$as_me:2666:" \ +echo "$as_me:2767:" \ "checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:2669: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:2770: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:2672: \$? = $ac_status" >&5 + echo "$as_me:2773: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:2674: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:2775: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:2677: \$? = $ac_status" >&5 + echo "$as_me:2778: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:2679: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:2780: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:2682: \$? = $ac_status" >&5 + echo "$as_me:2783: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:2685: checking whether we are using the GNU C++ compiler" >&5 +echo "$as_me:2786: 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 2691 "configure" +#line 2792 "configure" #include "confdefs.h" int @@ -2703,16 +2804,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2706: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2807: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2709: \$? = $ac_status" >&5 + echo "$as_me:2810: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2712: \"$ac_try\"") >&5 + { (eval echo "$as_me:2813: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2715: \$? = $ac_status" >&5 + echo "$as_me:2816: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -2724,19 +2825,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:2727: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "$as_me:2828: 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:2733: checking whether $CXX accepts -g" >&5 +echo "$as_me:2834: 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 2739 "configure" +#line 2840 "configure" #include "confdefs.h" int @@ -2748,16 +2849,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2751: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2852: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2754: \$? = $ac_status" >&5 + echo "$as_me:2855: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2757: \"$ac_try\"") >&5 + { (eval echo "$as_me:2858: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2760: \$? = $ac_status" >&5 + echo "$as_me:2861: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else @@ -2767,7 +2868,7 @@ ac_cv_prog_cxx_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2770: result: $ac_cv_prog_cxx_g" >&5 +echo "$as_me:2871: 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 @@ -2794,7 +2895,7 @@ for ac_declaration in \ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 2797 "configure" +#line 2898 "configure" #include "confdefs.h" #include $ac_declaration @@ -2807,16 +2908,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2810: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2911: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2813: \$? = $ac_status" >&5 + echo "$as_me:2914: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2816: \"$ac_try\"") >&5 + { (eval echo "$as_me:2917: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2819: \$? = $ac_status" >&5 + echo "$as_me:2920: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2826,7 +2927,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2829 "configure" +#line 2930 "configure" #include "confdefs.h" $ac_declaration int @@ -2838,16 +2939,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2841: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2942: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2844: \$? = $ac_status" >&5 + echo "$as_me:2945: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2847: \"$ac_try\"") >&5 + { (eval echo "$as_me:2948: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2850: \$? = $ac_status" >&5 + echo "$as_me:2951: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -2881,7 +2982,7 @@ ac_main_return=return then # Several of the C++ configurations do not work, particularly when # cross-compiling (20140913 -TD) - echo "$as_me:2884: checking if $CXX works" >&5 + echo "$as_me:2985: checking if $CXX works" >&5 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6 save_CPPFLAGS="$CPPFLAGS" @@ -2889,7 +2990,7 @@ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6 CPPFLAGS="$CPPFLAGS -I${cf_includedir}" cat >conftest.$ac_ext <<_ACEOF -#line 2892 "configure" +#line 2993 "configure" #include "confdefs.h" #include @@ -2906,16 +3007,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2909: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3010: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2912: \$? = $ac_status" >&5 + echo "$as_me:3013: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2915: \"$ac_try\"") >&5 + { (eval echo "$as_me:3016: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2918: \$? = $ac_status" >&5 + echo "$as_me:3019: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_works=yes else @@ -2926,11 +3027,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$save_CPPFLAGS" - echo "$as_me:2929: result: $cf_cxx_works" >&5 + echo "$as_me:3030: result: $cf_cxx_works" >&5 echo "${ECHO_T}$cf_cxx_works" >&6 if test "x$cf_cxx_works" = xno then - { echo "$as_me:2933: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5 + { echo "$as_me:3034: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5 echo "$as_me: WARNING: Ignore $CXX, since it cannot compile hello-world." >&2;} cf_with_cxx=no; CXX=""; GXX=""; fi @@ -2946,7 +3047,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:2949: checking for $ac_word" >&5 +echo "$as_me:3050: 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 @@ -2963,7 +3064,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:2966: found $ac_dir/$ac_word" >&5 + echo "$as_me:3067: found $ac_dir/$ac_word" >&5 break fi done @@ -2974,17 +3075,17 @@ fi CXX=$ac_cv_path_CXX if test -n "$CXX"; then - echo "$as_me:2977: result: $CXX" >&5 + echo "$as_me:3078: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:2980: result: no" >&5 + echo "$as_me:3081: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi - case "x$CXX" in #(vi - x|xg++) - { echo "$as_me:2987: WARNING: You don't have any C++ compiler, too bad" >&5 + case "x$CXX" in + (x|xg++) + { echo "$as_me:3088: 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=""; ;; @@ -2993,24 +3094,28 @@ fi GXX_VERSION=none if test "$GXX" = yes; then - echo "$as_me:2996: checking version of ${CXX:-g++}" >&5 + echo "$as_me:3097: 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:3000: result: $GXX_VERSION" >&5 + if test -z "$GXX_VERSION" + then + GXX_VERSION=unknown + GXX=no + fi + echo "$as_me:3105: result: $GXX_VERSION" >&5 echo "${ECHO_T}$GXX_VERSION" >&6 fi case $GXX_VERSION in -1*|2.[0-6]*) +(1*|2.[0-6]*) # GXX=""; CXX=""; ac_cv_prog_gxx=no # cf_cxx_library=no - { echo "$as_me:3008: WARNING: templates do not work" >&5 + { echo "$as_me:3113: WARNING: templates do not work" >&5 echo "$as_me: WARNING: templates do not work" >&2;} ;; esac -echo "$as_me:3013: checking if you want to build C++ binding and demo" >&5 +echo "$as_me:3118: 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. @@ -3020,15 +3125,15 @@ if test "${with_cxx_binding+set}" = set; then else cf_with_cxx_binding=$cf_with_cxx fi; -echo "$as_me:3023: result: $cf_with_cxx_binding" >&5 +echo "$as_me:3128: result: $cf_with_cxx_binding" >&5 echo "${ECHO_T}$cf_with_cxx_binding" >&6 -echo "$as_me:3026: checking if you want to build with Ada95" >&5 +echo "$as_me:3131: 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:3028: result: $cf_with_ada" >&5 +echo "$as_me:3133: result: $cf_with_ada" >&5 echo "${ECHO_T}$cf_with_ada" >&6 -echo "$as_me:3031: checking if you want to install terminal database" >&5 +echo "$as_me:3136: 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. @@ -3038,10 +3143,10 @@ if test "${enable_db_install+set}" = set; then else cf_with_db_install=yes fi; -echo "$as_me:3041: result: $cf_with_db_install" >&5 +echo "$as_me:3146: result: $cf_with_db_install" >&5 echo "${ECHO_T}$cf_with_db_install" >&6 -echo "$as_me:3044: checking if you want to install manpages" >&5 +echo "$as_me:3149: 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. @@ -3051,10 +3156,10 @@ if test "${with_manpages+set}" = set; then else cf_with_manpages=yes fi; -echo "$as_me:3054: result: $cf_with_manpages" >&5 +echo "$as_me:3159: result: $cf_with_manpages" >&5 echo "${ECHO_T}$cf_with_manpages" >&6 -echo "$as_me:3057: checking if you want to build programs such as tic" >&5 +echo "$as_me:3162: 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. @@ -3064,10 +3169,10 @@ if test "${with_progs+set}" = set; then else cf_with_progs=yes fi; -echo "$as_me:3067: result: $cf_with_progs" >&5 +echo "$as_me:3172: result: $cf_with_progs" >&5 echo "${ECHO_T}$cf_with_progs" >&6 -echo "$as_me:3070: checking if you want to build test-programs" >&5 +echo "$as_me:3175: 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. @@ -3077,10 +3182,10 @@ if test "${with_tests+set}" = set; then else cf_with_tests=yes fi; -echo "$as_me:3080: result: $cf_with_tests" >&5 +echo "$as_me:3185: result: $cf_with_tests" >&5 echo "${ECHO_T}$cf_with_tests" >&6 -echo "$as_me:3083: checking if you wish to install curses.h" >&5 +echo "$as_me:3188: 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. @@ -3090,7 +3195,7 @@ if test "${with_curses_h+set}" = set; then else with_curses_h=yes fi; -echo "$as_me:3093: result: $with_curses_h" >&5 +echo "$as_me:3198: result: $with_curses_h" >&5 echo "${ECHO_T}$with_curses_h" >&6 modules_to_build="ncurses" @@ -3116,7 +3221,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:3119: checking for $ac_word" >&5 +echo "$as_me:3224: 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 @@ -3131,7 +3236,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:3134: found $ac_dir/$ac_word" >&5 +echo "$as_me:3239: found $ac_dir/$ac_word" >&5 break done @@ -3139,35 +3244,35 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:3142: result: $AWK" >&5 + echo "$as_me:3247: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:3145: result: no" >&5 + echo "$as_me:3250: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -test -z "$AWK" && { { echo "$as_me:3152: error: No awk program found" >&5 +test -z "$AWK" && { { echo "$as_me:3257: error: No awk program found" >&5 echo "$as_me: error: No awk program found" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:3156: checking for egrep" >&5 +echo "$as_me:3261: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_prog_egrep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' + fi fi -echo "$as_me:3166: result: $ac_cv_prog_egrep" >&5 +echo "$as_me:3271: result: $ac_cv_prog_egrep" >&5 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep + EGREP=$ac_cv_prog_egrep -test -z "$EGREP" && { { echo "$as_me:3170: error: No egrep program found" >&5 + test -z "$EGREP" && { { echo "$as_me:3275: error: No egrep program found" >&5 echo "$as_me: error: No egrep program found" >&2;} { (exit 1); exit 1; }; } @@ -3183,7 +3288,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:3186: checking for a BSD compatible install" >&5 +echo "$as_me:3291: 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 @@ -3232,7 +3337,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:3235: result: $INSTALL" >&5 +echo "$as_me:3340: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -3244,20 +3349,20 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' case $INSTALL in -/*) - ;; -*) - cf_dir=`echo $INSTALL | sed -e 's%/[^/]*$%%'` - test -z "$cf_dir" && cf_dir=. - INSTALL=`cd $cf_dir && pwd`/`echo $INSTALL | sed -e 's%^.*/%%'` - ;; +(/*) + ;; +(*) + cf_dir=`echo $INSTALL | sed -e 's%/[^/]*$%%'` + test -z "$cf_dir" && cf_dir=. + INSTALL=`cd $cf_dir && pwd`/`echo $INSTALL | sed -e 's%^.*/%%'` + ;; esac -for ac_prog in tdlint lint alint splint lclint +for ac_prog in lint cppcheck splint do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3260: checking for $ac_word" >&5 +echo "$as_me:3365: 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 @@ -3272,7 +3377,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:3275: found $ac_dir/$ac_word" >&5 +echo "$as_me:3380: found $ac_dir/$ac_word" >&5 break done @@ -3280,28 +3385,28 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:3283: result: $LINT" >&5 + echo "$as_me:3388: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:3286: result: no" >&5 + echo "$as_me:3391: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$LINT" && break done -echo "$as_me:3293: checking whether ln -s works" >&5 +echo "$as_me:3398: 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:3297: result: yes" >&5 + echo "$as_me:3402: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:3300: result: no, using $LN_S" >&5 + echo "$as_me:3405: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:3304: checking if $LN_S -f options work" >&5 +echo "$as_me:3409: 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 @@ -3313,12 +3418,12 @@ else cf_prog_ln_sf=no fi rm -f conf$$.dst conf$$src -echo "$as_me:3316: result: $cf_prog_ln_sf" >&5 +echo "$as_me:3421: 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:3321: checking for long file names" >&5 +echo "$as_me:3426: 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 @@ -3357,7 +3462,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:3360: result: $ac_cv_sys_long_file_names" >&5 +echo "$as_me:3465: 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 @@ -3369,7 +3474,7 @@ fi # if we find pkg-config, check if we should install the ".pc" files. -echo "$as_me:3372: checking if you want to use pkg-config" >&5 +echo "$as_me:3477: 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. @@ -3379,19 +3484,19 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:3382: result: $cf_pkg_config" >&5 +echo "$as_me:3487: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 -case $cf_pkg_config in #(vi -no) #(vi +case $cf_pkg_config in +(no) PKG_CONFIG=none ;; -yes) #(vi +(yes) 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:3394: checking for $ac_word" >&5 +echo "$as_me:3499: 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 @@ -3408,7 +3513,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:3411: found $ac_dir/$ac_word" >&5 + echo "$as_me:3516: found $ac_dir/$ac_word" >&5 break fi done @@ -3419,10 +3524,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:3422: result: $PKG_CONFIG" >&5 + echo "$as_me:3527: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:3425: result: no" >&5 + echo "$as_me:3530: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3431,7 +3536,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:3434: checking for $ac_word" >&5 +echo "$as_me:3539: 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 @@ -3448,7 +3553,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:3451: found $ac_dir/$ac_word" >&5 + echo "$as_me:3556: found $ac_dir/$ac_word" >&5 break fi done @@ -3460,10 +3565,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:3463: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:3568: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:3466: result: no" >&5 + echo "$as_me:3571: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3473,7 +3578,7 @@ else fi ;; -*) +(*) PKG_CONFIG=$withval ;; esac @@ -3482,56 +3587,66 @@ test -z "$PKG_CONFIG" && PKG_CONFIG=none if test "$PKG_CONFIG" != none ; then if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + cf_path_syntax="$ac_default_prefix" fi -case ".$PKG_CONFIG" in #(vi -.\$\(*\)*|.\'*\'*) #(vi - ;; -..|./*|.\\*) #(vi - ;; -.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX - ;; -.\${*prefix}*|.\${*dir}*) #(vi - eval PKG_CONFIG="$PKG_CONFIG" - case ".$PKG_CONFIG" in #(vi - .NONE/*) - PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; #(vi -.no|.NONE/*) - PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` - ;; -*) - { { echo "$as_me:3509: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 +case ".$PKG_CONFIG" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval PKG_CONFIG="$PKG_CONFIG" + case ".$PKG_CONFIG" in + (.NONE/*) + PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { { echo "$as_me:3614: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } - ;; + ;; esac -else - { echo "$as_me:3516: WARNING: pkg-config is not installed" >&5 +elif test "x$cf_pkg_config" != xno ; then + { echo "$as_me:3621: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi -echo "$as_me:3520: checking for $PKG_CONFIG library directory" >&5 +case $PKG_CONFIG in +(no|none|yes) + echo "$as_me:3627: checking for pkg-config library directory" >&5 +echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6 + ;; +(*) + echo "$as_me:3631: checking for $PKG_CONFIG library directory" >&5 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 + ;; +esac + +PKG_CONFIG_LIBDIR=no # Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given. if test "${with_pkg_config_libdir+set}" = set; then withval="$with_pkg_config_libdir" PKG_CONFIG_LIBDIR=$withval else - PKG_CONFIG_LIBDIR=yes + test "x$PKG_CONFIG" != xnone && PKG_CONFIG_LIBDIR=yes fi; -case x$PKG_CONFIG_LIBDIR in #(vi -x/*) #(vi +case x$PKG_CONFIG_LIBDIR in +(x/*) ;; -xyes) #(vi +(xyes) # Look for the library directory using the same prefix as the executable if test "x$PKG_CONFIG" = xnone then @@ -3547,8 +3662,8 @@ xyes) #(vi # most common variations before that point. Some other variants spell the # directory differently, e.g., "pkg-config", and put it in unusual places. # pkg-config has always been poorly standardized, which is ironic... - case x`(arch) 2>/dev/null` in #(vi - *64) #(vi + case x`(arch) 2>/dev/null` in + (*64) cf_search_path="\ $cf_path/lib/*64-linux-gnu \ $cf_path/share \ @@ -3556,47 +3671,50 @@ xyes) #(vi $cf_path/lib32 \ $cf_path/lib" ;; - *) + (*) cf_search_path="\ $cf_path/lib/*-linux-gnu \ $cf_path/share \ $cf_path/lib32 \ - $cf_path/lib" + $cf_path/lib \ + $cf_path/libdata" ;; esac test -n "$verbose" && echo " list..." 1>&6 -echo "${as_me:-configure}:3570: testing list... ..." 1>&5 +echo "${as_me:-configure}:3686: testing list... ..." 1>&5 for cf_config in $cf_search_path do test -n "$verbose" && echo " checking $cf_config/pkgconfig" 1>&6 -echo "${as_me:-configure}:3576: testing checking $cf_config/pkgconfig ..." 1>&5 +echo "${as_me:-configure}:3692: testing checking $cf_config/pkgconfig ..." 1>&5 if test -d $cf_config/pkgconfig then PKG_CONFIG_LIBDIR=$cf_config/pkgconfig - echo "$as_me:3581: checking done" >&5 + echo "$as_me:3697: checking done" >&5 echo $ECHO_N "checking done... $ECHO_C" >&6 break fi done ;; -*) +(*) ;; esac -echo "$as_me:3591: result: $PKG_CONFIG_LIBDIR" >&5 +if test "x$PKG_CONFIG_LIBDIR" != xno ; then + echo "$as_me:3708: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 +fi if test "x$PKG_CONFIG" != xnone then - echo "$as_me:3596: checking if we should install .pc files for $PKG_CONFIG" >&5 + echo "$as_me:3714: checking if we should install .pc files for $PKG_CONFIG" >&5 echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 else - echo "$as_me:3599: checking if we should install .pc files" >&5 + echo "$as_me:3717: checking if we should install .pc files" >&5 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6 fi @@ -3607,71 +3725,80 @@ if test "${enable_pc_files+set}" = set; then else enable_pc_files=no fi; -echo "$as_me:3610: result: $enable_pc_files" >&5 +echo "$as_me:3728: result: $enable_pc_files" >&5 echo "${ECHO_T}$enable_pc_files" >&6 + if test "x$enable_pc_files" != xno then + MAKE_PC_FILES= + case "x$PKG_CONFIG_LIBDIR" in + (xno|xyes) + { echo "$as_me:3736: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 +echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;} + ;; + (*) if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + 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:3640: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5 +case ".$PKG_CONFIG_LIBDIR" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" + case ".$PKG_CONFIG_LIBDIR" in + (.NONE/*) + PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { { echo "$as_me:3766: 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 - MAKE_PC_FILES= + ;; + esac else MAKE_PC_FILES="#" fi if test -z "$MAKE_PC_FILES" then - echo "$as_me:3653: checking for suffix to add to pc-files" >&5 + echo "$as_me:3780: checking for suffix to add to pc-files" >&5 echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6 # Check whether --with-pc-suffix or --without-pc-suffix was given. if test "${with_pc_suffix+set}" = set; then withval="$with_pc_suffix" - case "x$withval" in #(vi - xyes|xno) #(vi + case "x$withval" in + (xyes|xno) PC_MODULE_SUFFIX= ;; - *) PC_MODULE_SUFFIX="$withval" + (*) PC_MODULE_SUFFIX="$withval" ;; esac fi; test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none - echo "$as_me:3668: result: $PC_MODULE_SUFFIX" >&5 + echo "$as_me:3795: result: $PC_MODULE_SUFFIX" >&5 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6 test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX= fi -echo "$as_me:3674: checking if we should assume mixed-case filenames" >&5 +echo "$as_me:3801: 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. @@ -3681,22 +3808,22 @@ if test "${enable_mixed_case+set}" = set; then else enable_mixedcase=auto fi; -echo "$as_me:3684: result: $enable_mixedcase" >&5 +echo "$as_me:3811: result: $enable_mixedcase" >&5 echo "${ECHO_T}$enable_mixedcase" >&6 if test "$enable_mixedcase" = "auto" ; then -echo "$as_me:3688: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:3815: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes ; then - case $target_alias in #(vi - *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) #(vi + case $target_alias in + (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) cf_cv_mixedcase=no ;; - *) + (*) cf_cv_mixedcase=yes ;; esac @@ -3712,7 +3839,7 @@ else fi fi -echo "$as_me:3715: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3842: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -3720,18 +3847,18 @@ cat >>confdefs.h <<\EOF EOF else - cf_cv_mixedcase=$enable_mixedcase - if test "x$enable_mixedcase" = "xyes" ; then + cf_cv_mixedcase=$enable_mixedcase + if test "x$enable_mixedcase" = "xyes" ; then cat >>confdefs.h <<\EOF #define MIXEDCASE_FILENAMES 1 EOF - fi + fi fi # do this after mixed-case option (tags/TAGS is not as important as tic). -echo "$as_me:3734: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:3861: 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 @@ -3751,11 +3878,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:3754: result: yes" >&5 + echo "$as_me:3881: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:3758: result: no" >&5 + echo "$as_me:3885: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -3764,7 +3891,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:3767: checking for $ac_word" >&5 +echo "$as_me:3894: 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 @@ -3779,7 +3906,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:3782: found $ac_dir/$ac_word" >&5 +echo "$as_me:3909: found $ac_dir/$ac_word" >&5 break done @@ -3787,10 +3914,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:3790: result: $CTAGS" >&5 + echo "$as_me:3917: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:3793: result: no" >&5 + echo "$as_me:3920: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3801,7 +3928,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:3804: checking for $ac_word" >&5 +echo "$as_me:3931: 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 @@ -3816,7 +3943,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:3819: found $ac_dir/$ac_word" >&5 +echo "$as_me:3946: found $ac_dir/$ac_word" >&5 break done @@ -3824,10 +3951,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:3827: result: $ETAGS" >&5 + echo "$as_me:3954: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:3830: result: no" >&5 + echo "$as_me:3957: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3836,7 +3963,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:3839: checking for $ac_word" >&5 +echo "$as_me:3966: 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 @@ -3851,7 +3978,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:3854: found $ac_dir/$ac_word" >&5 +echo "$as_me:3981: found $ac_dir/$ac_word" >&5 break done @@ -3860,17 +3987,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:3863: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:3990: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:3866: result: no" >&5 + echo "$as_me:3993: 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:3873: checking for $ac_word" >&5 +echo "$as_me:4000: 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 @@ -3885,7 +4012,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:3888: found $ac_dir/$ac_word" >&5 +echo "$as_me:4015: found $ac_dir/$ac_word" >&5 break done @@ -3894,10 +4021,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:3897: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:4024: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:3900: result: no" >&5 + echo "$as_me:4027: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3917,7 +4044,7 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:3920: checking for makeflags variable" >&5 +echo "$as_me:4047: 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 @@ -3927,37 +4054,37 @@ else for cf_option in '-${MAKEFLAGS}' '${MFLAGS}' do cat >cf_makeflags.tmp </dev/null | fgrep -v "ing directory" | sed -e 's,[ ]*$,,'` case "$cf_result" in - .*k|.*kw) + (.*k|.*kw) cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` case "$cf_result" in - .*CC=*) cf_cv_makeflags= + (.*CC=*) cf_cv_makeflags= ;; - *) cf_cv_makeflags=$cf_option + (*) cf_cv_makeflags=$cf_option ;; esac break ;; - .-) ;; - *) echo "given option \"$cf_option\", no match \"$cf_result\"" + (.-) ;; + (*) echo "given option \"$cf_option\", no match \"$cf_result\"" ;; esac done rm -f cf_makeflags.tmp fi -echo "$as_me:3954: result: $cf_cv_makeflags" >&5 +echo "$as_me:4081: 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:3960: checking for $ac_word" >&5 +echo "$as_me:4087: 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 @@ -3972,7 +4099,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:3975: found $ac_dir/$ac_word" >&5 +echo "$as_me:4102: found $ac_dir/$ac_word" >&5 break done @@ -3980,10 +4107,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:3983: result: $RANLIB" >&5 + echo "$as_me:4110: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:3986: result: no" >&5 + echo "$as_me:4113: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3992,7 +4119,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:3995: checking for $ac_word" >&5 +echo "$as_me:4122: 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 @@ -4007,7 +4134,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:4010: found $ac_dir/$ac_word" >&5 +echo "$as_me:4137: found $ac_dir/$ac_word" >&5 break done @@ -4016,10 +4143,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:4019: result: $ac_ct_RANLIB" >&5 + echo "$as_me:4146: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:4022: result: no" >&5 + echo "$as_me:4149: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4031,7 +4158,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:4034: checking for $ac_word" >&5 +echo "$as_me:4161: 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 @@ -4046,7 +4173,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:4049: found $ac_dir/$ac_word" >&5 +echo "$as_me:4176: found $ac_dir/$ac_word" >&5 break done @@ -4054,10 +4181,10 @@ fi fi LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$as_me:4057: result: $LD" >&5 + echo "$as_me:4184: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:4060: result: no" >&5 + echo "$as_me:4187: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4066,7 +4193,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:4069: checking for $ac_word" >&5 +echo "$as_me:4196: 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 @@ -4081,7 +4208,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:4084: found $ac_dir/$ac_word" >&5 +echo "$as_me:4211: found $ac_dir/$ac_word" >&5 break done @@ -4090,10 +4217,10 @@ fi fi ac_ct_LD=$ac_cv_prog_ac_ct_LD if test -n "$ac_ct_LD"; then - echo "$as_me:4093: result: $ac_ct_LD" >&5 + echo "$as_me:4220: result: $ac_ct_LD" >&5 echo "${ECHO_T}$ac_ct_LD" >&6 else - echo "$as_me:4096: result: no" >&5 + echo "$as_me:4223: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4105,7 +4232,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:4108: checking for $ac_word" >&5 +echo "$as_me:4235: 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 @@ -4120,7 +4247,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:4123: found $ac_dir/$ac_word" >&5 +echo "$as_me:4250: found $ac_dir/$ac_word" >&5 break done @@ -4128,10 +4255,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:4131: result: $AR" >&5 + echo "$as_me:4258: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:4134: result: no" >&5 + echo "$as_me:4261: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4140,7 +4267,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:4143: checking for $ac_word" >&5 +echo "$as_me:4270: 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 @@ -4155,7 +4282,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:4158: found $ac_dir/$ac_word" >&5 +echo "$as_me:4285: found $ac_dir/$ac_word" >&5 break done @@ -4164,10 +4291,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:4167: result: $ac_ct_AR" >&5 + echo "$as_me:4294: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4170: result: no" >&5 + echo "$as_me:4297: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4179,7 +4306,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. set dummy ${ac_tool_prefix}nm; ac_word=$2 -echo "$as_me:4182: checking for $ac_word" >&5 +echo "$as_me:4309: 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 @@ -4194,7 +4321,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_NM="${ac_tool_prefix}nm" -echo "$as_me:4197: found $ac_dir/$ac_word" >&5 +echo "$as_me:4324: found $ac_dir/$ac_word" >&5 break done @@ -4202,10 +4329,10 @@ fi fi NM=$ac_cv_prog_NM if test -n "$NM"; then - echo "$as_me:4205: result: $NM" >&5 + echo "$as_me:4332: result: $NM" >&5 echo "${ECHO_T}$NM" >&6 else - echo "$as_me:4208: result: no" >&5 + echo "$as_me:4335: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4214,7 +4341,7 @@ if test -z "$ac_cv_prog_NM"; then ac_ct_NM=$NM # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 -echo "$as_me:4217: checking for $ac_word" >&5 +echo "$as_me:4344: 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 @@ -4229,7 +4356,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NM="nm" -echo "$as_me:4232: found $ac_dir/$ac_word" >&5 +echo "$as_me:4359: found $ac_dir/$ac_word" >&5 break done @@ -4238,10 +4365,10 @@ fi fi ac_ct_NM=$ac_cv_prog_ac_ct_NM if test -n "$ac_ct_NM"; then - echo "$as_me:4241: result: $ac_ct_NM" >&5 + echo "$as_me:4368: result: $ac_ct_NM" >&5 echo "${ECHO_T}$ac_ct_NM" >&6 else - echo "$as_me:4244: result: no" >&5 + echo "$as_me:4371: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4253,7 +4380,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:4256: checking for $ac_word" >&5 +echo "$as_me:4383: 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 @@ -4268,7 +4395,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:4271: found $ac_dir/$ac_word" >&5 +echo "$as_me:4398: found $ac_dir/$ac_word" >&5 break done @@ -4276,10 +4403,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:4279: result: $AR" >&5 + echo "$as_me:4406: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:4282: result: no" >&5 + echo "$as_me:4409: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4288,7 +4415,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:4291: checking for $ac_word" >&5 +echo "$as_me:4418: 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 @@ -4303,7 +4430,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:4306: found $ac_dir/$ac_word" >&5 +echo "$as_me:4433: found $ac_dir/$ac_word" >&5 break done @@ -4312,10 +4439,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:4315: result: $ac_ct_AR" >&5 + echo "$as_me:4442: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4318: result: no" >&5 + echo "$as_me:4445: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4324,14 +4451,14 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:4327: checking for options to update archives" >&5 +echo "$as_me:4454: checking for options to update archives" >&5 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 if test "${cf_cv_ar_flags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cf_cv_ar_flags=unknown - for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv + for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv do # check if $ARFLAGS already contains this choice @@ -4347,13 +4474,13 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:4480: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4356: \$? = $ac_status" >&5 + echo "$as_me:4483: \$? = $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 @@ -4364,7 +4491,7 @@ EOF else test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me:-configure}:4367: testing cannot compile test-program ..." 1>&5 +echo "${as_me:-configure}:4494: testing cannot compile test-program ..." 1>&5 break fi @@ -4372,7 +4499,7 @@ echo "${as_me:-configure}:4367: testing cannot compile test-program ..." 1>&5 rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext fi -echo "$as_me:4375: result: $cf_cv_ar_flags" >&5 +echo "$as_me:4502: result: $cf_cv_ar_flags" >&5 echo "${ECHO_T}$cf_cv_ar_flags" >&6 if test -n "$ARFLAGS" ; then @@ -4383,20 +4510,20 @@ else ARFLAGS=$cf_cv_ar_flags fi -echo "$as_me:4386: checking if you have specified an install-prefix" >&5 +echo "$as_me:4513: 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 "x$withval" in #(vi - xyes|xno) #(vi + case "x$withval" in + (xyes|xno) ;; - *) DESTDIR="$withval" + (*) DESTDIR="$withval" ;; esac fi; -echo "$as_me:4399: result: $DESTDIR" >&5 +echo "$as_me:4526: result: $DESTDIR" >&5 echo "${ECHO_T}$DESTDIR" >&6 ############################################################################### @@ -4424,7 +4551,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:4427: checking for $ac_word" >&5 +echo "$as_me:4554: 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 @@ -4439,7 +4566,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:4442: found $ac_dir/$ac_word" >&5 +echo "$as_me:4569: found $ac_dir/$ac_word" >&5 break done @@ -4447,10 +4574,10 @@ fi fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - echo "$as_me:4450: result: $BUILD_CC" >&5 + echo "$as_me:4577: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 else - echo "$as_me:4453: result: no" >&5 + echo "$as_me:4580: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4458,12 +4585,12 @@ fi done fi; - echo "$as_me:4461: checking for native build C compiler" >&5 + echo "$as_me:4588: checking for native build C compiler" >&5 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 - echo "$as_me:4463: result: $BUILD_CC" >&5 + echo "$as_me:4590: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 - echo "$as_me:4466: checking for native build C preprocessor" >&5 + echo "$as_me:4593: 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. @@ -4473,10 +4600,10 @@ if test "${with_build_cpp+set}" = set; then else BUILD_CPP='${BUILD_CC} -E' fi; - echo "$as_me:4476: result: $BUILD_CPP" >&5 + echo "$as_me:4603: result: $BUILD_CPP" >&5 echo "${ECHO_T}$BUILD_CPP" >&6 - echo "$as_me:4479: checking for native build C flags" >&5 + echo "$as_me:4606: 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. @@ -4484,10 +4611,10 @@ if test "${with_build_cflags+set}" = set; then withval="$with_build_cflags" BUILD_CFLAGS="$withval" fi; - echo "$as_me:4487: result: $BUILD_CFLAGS" >&5 + echo "$as_me:4614: result: $BUILD_CFLAGS" >&5 echo "${ECHO_T}$BUILD_CFLAGS" >&6 - echo "$as_me:4490: checking for native build C preprocessor-flags" >&5 + echo "$as_me:4617: 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. @@ -4495,10 +4622,10 @@ if test "${with_build_cppflags+set}" = set; then withval="$with_build_cppflags" BUILD_CPPFLAGS="$withval" fi; - echo "$as_me:4498: result: $BUILD_CPPFLAGS" >&5 + echo "$as_me:4625: result: $BUILD_CPPFLAGS" >&5 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - echo "$as_me:4501: checking for native build linker-flags" >&5 + echo "$as_me:4628: 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. @@ -4506,10 +4633,10 @@ if test "${with_build_ldflags+set}" = set; then withval="$with_build_ldflags" BUILD_LDFLAGS="$withval" fi; - echo "$as_me:4509: result: $BUILD_LDFLAGS" >&5 + echo "$as_me:4636: result: $BUILD_LDFLAGS" >&5 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - echo "$as_me:4512: checking for native build linker-libraries" >&5 + echo "$as_me:4639: 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. @@ -4517,7 +4644,7 @@ if test "${with_build_libs+set}" = set; then withval="$with_build_libs" BUILD_LIBS="$withval" fi; - echo "$as_me:4520: result: $BUILD_LIBS" >&5 + echo "$as_me:4647: result: $BUILD_LIBS" >&5 echo "${ECHO_T}$BUILD_LIBS" >&6 # this assumes we're on Unix. @@ -4527,7 +4654,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6 : ${BUILD_CC:='${CC}'} if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then - { { echo "$as_me:4530: error: Cross-build requires two compilers. + { { echo "$as_me:4657: 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;} @@ -4552,51 +4679,51 @@ fi ### shared, for example. cf_list_models="" -echo "$as_me:4555: checking if libtool -version-number should be used" >&5 +echo "$as_me:4682: 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. if test "${enable_libtool_version+set}" = set; then enableval="$enable_libtool_version" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then cf_libtool_version=no - else - cf_libtool_version=yes - fi + else + cf_libtool_version=yes + fi else enableval=yes - cf_libtool_version=yes + cf_libtool_version=yes fi; -echo "$as_me:4572: result: $cf_libtool_version" >&5 +echo "$as_me:4699: result: $cf_libtool_version" >&5 echo "${ECHO_T}$cf_libtool_version" >&6 if test "$cf_libtool_version" = yes ; then LIBTOOL_VERSION="-version-number" else LIBTOOL_VERSION="-version-info" - case "x$VERSION" in #(vi - x) #(vi - { echo "$as_me:4581: WARNING: VERSION was not set" >&5 + case "x$VERSION" in + (x) + { echo "$as_me:4708: WARNING: VERSION was not set" >&5 echo "$as_me: WARNING: VERSION was not set" >&2;} ;; - x*.*.*) + (x*.*.*) ABI_VERSION="$VERSION" test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 -echo "${as_me:-configure}:4588: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 +echo "${as_me:-configure}:4715: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ;; - x*:*:*) + (x*:*:*) ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'` test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 -echo "${as_me:-configure}:4595: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 +echo "${as_me:-configure}:4722: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ;; - *) - { echo "$as_me:4599: WARNING: unexpected VERSION value: $VERSION" >&5 + (*) + { echo "$as_me:4726: WARNING: unexpected VERSION value: $VERSION" >&5 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;} ;; esac @@ -4618,7 +4745,7 @@ LIB_LINK='${CC}' LIB_INSTALL= LIB_UNINSTALL= -echo "$as_me:4621: checking if you want to build libraries with libtool" >&5 +echo "$as_me:4748: 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. @@ -4628,41 +4755,41 @@ if test "${with_libtool+set}" = set; then else with_libtool=no fi; -echo "$as_me:4631: result: $with_libtool" >&5 +echo "$as_me:4758: result: $with_libtool" >&5 echo "${ECHO_T}$with_libtool" >&6 if test "$with_libtool" != "no"; then if test "$with_libtool" != "yes" ; then if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + cf_path_syntax="$ac_default_prefix" fi -case ".$with_libtool" in #(vi -.\$\(*\)*|.\'*\'*) #(vi - ;; -..|./*|.\\*) #(vi - ;; -.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX - ;; -.\${*prefix}*|.\${*dir}*) #(vi - eval with_libtool="$with_libtool" - case ".$with_libtool" in #(vi - .NONE/*) - with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; #(vi -.no|.NONE/*) - with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` - ;; -*) - { { echo "$as_me:4662: error: expected a pathname, not \"$with_libtool\"" >&5 +case ".$with_libtool" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval with_libtool="$with_libtool" + case ".$with_libtool" in + (.NONE/*) + with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { { echo "$as_me:4789: error: expected a pathname, not \"$with_libtool\"" >&5 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} { (exit 1); exit 1; }; } - ;; + ;; esac LIBTOOL=$with_libtool @@ -4672,7 +4799,7 @@ esac do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:4675: checking for $ac_word" >&5 +echo "$as_me:4802: 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 @@ -4687,7 +4814,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog" -echo "$as_me:4690: found $ac_dir/$ac_word" >&5 +echo "$as_me:4817: found $ac_dir/$ac_word" >&5 break done @@ -4695,10 +4822,10 @@ fi fi LIBTOOL=$ac_cv_prog_LIBTOOL if test -n "$LIBTOOL"; then - echo "$as_me:4698: result: $LIBTOOL" >&5 + echo "$as_me:4825: result: $LIBTOOL" >&5 echo "${ECHO_T}$LIBTOOL" >&6 else - echo "$as_me:4701: result: no" >&5 + echo "$as_me:4828: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4711,7 +4838,7 @@ if test -z "$LIBTOOL"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4714: checking for $ac_word" >&5 +echo "$as_me:4841: 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 @@ -4726,7 +4853,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" -echo "$as_me:4729: found $ac_dir/$ac_word" >&5 +echo "$as_me:4856: found $ac_dir/$ac_word" >&5 break done @@ -4734,10 +4861,10 @@ fi fi ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL if test -n "$ac_ct_LIBTOOL"; then - echo "$as_me:4737: result: $ac_ct_LIBTOOL" >&5 + echo "$as_me:4864: result: $ac_ct_LIBTOOL" >&5 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 else - echo "$as_me:4740: result: no" >&5 + echo "$as_me:4867: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4768,7 +4895,7 @@ unset LIBTOOL do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:4771: checking for $ac_word" >&5 +echo "$as_me:4898: 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 @@ -4783,7 +4910,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog" -echo "$as_me:4786: found $ac_dir/$ac_word" >&5 +echo "$as_me:4913: found $ac_dir/$ac_word" >&5 break done @@ -4791,10 +4918,10 @@ fi fi LIBTOOL=$ac_cv_prog_LIBTOOL if test -n "$LIBTOOL"; then - echo "$as_me:4794: result: $LIBTOOL" >&5 + echo "$as_me:4921: result: $LIBTOOL" >&5 echo "${ECHO_T}$LIBTOOL" >&6 else - echo "$as_me:4797: result: no" >&5 + echo "$as_me:4924: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4807,7 +4934,7 @@ if test -z "$LIBTOOL"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4810: checking for $ac_word" >&5 +echo "$as_me:4937: 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 @@ -4822,7 +4949,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" -echo "$as_me:4825: found $ac_dir/$ac_word" >&5 +echo "$as_me:4952: found $ac_dir/$ac_word" >&5 break done @@ -4830,10 +4957,10 @@ fi fi ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL if test -n "$ac_ct_LIBTOOL"; then - echo "$as_me:4833: result: $ac_ct_LIBTOOL" >&5 + echo "$as_me:4960: result: $ac_ct_LIBTOOL" >&5 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 else - echo "$as_me:4836: result: no" >&5 + echo "$as_me:4963: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4855,11 +4982,11 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version fi fi if test -z "$LIBTOOL" ; then - { { echo "$as_me:4858: error: Cannot find libtool" >&5 + { { echo "$as_me:4985: error: Cannot find libtool" >&5 echo "$as_me: error: Cannot find libtool" >&2;} { (exit 1); exit 1; }; } fi - LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${top_srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o' + LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${libdir} ${LIBTOOL_VERSION} `cut -f1 ${top_srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o' LIB_OBJECT='${OBJECTS:.o=.lo}' LIB_SUFFIX=.la LIB_CLEAN='${LIBTOOL} --mode=clean' @@ -4871,7 +4998,7 @@ echo "$as_me: error: Cannot find libtool" >&2;} if test -n "$LIBTOOL" && test "$LIBTOOL" != none then - echo "$as_me:4874: checking version of $LIBTOOL" >&5 + echo "$as_me:5001: checking version of $LIBTOOL" >&5 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6 if test -n "$LIBTOOL" && test "$LIBTOOL" != none @@ -4882,34 +5009,34 @@ else fi test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version - echo "$as_me:4885: result: $cf_cv_libtool_version" >&5 + echo "$as_me:5012: 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:4888: error: This is not GNU libtool" >&5 + { { echo "$as_me:5015: 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:4893: error: GNU libtool has not been found" >&5 + { { echo "$as_me:5020: 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*|msys*|mingw32*|uwin*|aix[4-7]) #(vi + case "$cf_cv_system_name" in + (cygwin*|msys*|mingw32*|os2*|uwin*|aix[4-7]) LT_UNDEF=-no-undefined ;; esac # special hack to add --tag option for C++ compiler - case $cf_cv_libtool_version in #(vi - 1.[5-9]*|[2-9].[0-9.a-z]*) #(vi + case $cf_cv_libtool_version in + (1.[5-9]*|[2-9].[0-9.a-z]*) LIBTOOL_CXX="$LIBTOOL --tag=CXX" LIBTOOL="$LIBTOOL --tag=CC" ;; - *) + (*) LIBTOOL_CXX="$LIBTOOL" ;; esac @@ -4926,7 +5053,7 @@ cf_list_models="$cf_list_models libtool" else -echo "$as_me:4929: checking if you want to build shared libraries" >&5 +echo "$as_me:5056: 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. @@ -4936,11 +5063,11 @@ if test "${with_shared+set}" = set; then else with_shared=no fi; -echo "$as_me:4939: result: $with_shared" >&5 +echo "$as_me:5066: result: $with_shared" >&5 echo "${ECHO_T}$with_shared" >&6 test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared" -echo "$as_me:4943: checking if you want to build static libraries" >&5 +echo "$as_me:5070: 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. @@ -4950,11 +5077,11 @@ if test "${with_normal+set}" = set; then else with_normal=yes fi; -echo "$as_me:4953: result: $with_normal" >&5 +echo "$as_me:5080: result: $with_normal" >&5 echo "${ECHO_T}$with_normal" >&6 test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal" -echo "$as_me:4957: checking if you want to build debug libraries" >&5 +echo "$as_me:5084: 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. @@ -4964,11 +5091,11 @@ if test "${with_debug+set}" = set; then else with_debug=yes fi; -echo "$as_me:4967: result: $with_debug" >&5 +echo "$as_me:5094: result: $with_debug" >&5 echo "${ECHO_T}$with_debug" >&6 test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug" -echo "$as_me:4971: checking if you want to build profiling libraries" >&5 +echo "$as_me:5098: 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. @@ -4978,7 +5105,7 @@ if test "${with_profile+set}" = set; then else with_profile=no fi; -echo "$as_me:4981: result: $with_profile" >&5 +echo "$as_me:5108: result: $with_profile" >&5 echo "${ECHO_T}$with_profile" >&6 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile" @@ -4986,7 +5113,7 @@ fi if test "X$cf_with_cxx_binding" != Xno; then if test "x$with_shared" = "xyes"; then -echo "$as_me:4989: checking if you want to build C++ shared libraries" >&5 +echo "$as_me:5116: 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. @@ -4996,26 +5123,26 @@ if test "${with_cxx_shared+set}" = set; then else with_shared_cxx=no fi; -echo "$as_me:4999: result: $with_shared_cxx" >&5 +echo "$as_me:5126: result: $with_shared_cxx" >&5 echo "${ECHO_T}$with_shared_cxx" >&6 fi fi ############################################################################### -echo "$as_me:5006: checking for specified models" >&5 +echo "$as_me:5133: 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:5010: result: $cf_list_models" >&5 +echo "$as_me:5137: 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:5015: checking for default model" >&5 +echo "$as_me:5142: 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:5018: result: $DFT_LWR_MODEL" >&5 +echo "$as_me:5145: result: $DFT_LWR_MODEL" >&5 echo "${ECHO_T}$DFT_LWR_MODEL" >&6 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -5029,7 +5156,7 @@ LIB_NAME=ncurses LIB_DIR=../lib LIB_2ND=../../lib -echo "$as_me:5032: checking if you want to have a library-prefix" >&5 +echo "$as_me:5159: 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. @@ -5039,18 +5166,22 @@ if test "${with_lib_prefix+set}" = set; then else with_lib_prefix=auto fi; -echo "$as_me:5042: result: $with_lib_prefix" >&5 +echo "$as_me:5169: result: $with_lib_prefix" >&5 echo "${ECHO_T}$with_lib_prefix" >&6 if test $with_lib_prefix = auto then - case $cf_cv_system_name in #(vi - OS/2*|os2*) #(vi - LIB_PREFIX='' - ;; - *) LIB_PREFIX='lib' - ;; + case $cf_cv_system_name in + (OS/2*|os2*) + if test "$DFT_LWR_MODEL" = libtool; then + LIB_PREFIX='lib' + else + LIB_PREFIX='' + fi + ;; + (*) LIB_PREFIX='lib' + ;; esac cf_prefix=$LIB_PREFIX @@ -5063,19 +5194,19 @@ fi LIB_SUFFIX= - echo "$as_me:5066: checking for PATH separator" >&5 + echo "$as_me:5197: 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:=':'} ;; + (os2*) PATH_SEPARATOR=';' ;; + (*) ${PATH_SEPARATOR:=':'} ;; esac - echo "$as_me:5073: result: $PATH_SEPARATOR" >&5 + echo "$as_me:5204: result: $PATH_SEPARATOR" >&5 echo "${ECHO_T}$PATH_SEPARATOR" >&6 ############################################################################### -echo "$as_me:5078: checking if you want to build a separate terminfo library" >&5 +echo "$as_me:5209: 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. @@ -5085,10 +5216,10 @@ if test "${with_termlib+set}" = set; then else with_termlib=no fi; -echo "$as_me:5088: result: $with_termlib" >&5 +echo "$as_me:5219: result: $with_termlib" >&5 echo "${ECHO_T}$with_termlib" >&6 -echo "$as_me:5091: checking if you want to build a separate tic library" >&5 +echo "$as_me:5222: 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. @@ -5098,13 +5229,13 @@ if test "${with_ticlib+set}" = set; then else with_ticlib=no fi; -echo "$as_me:5101: result: $with_ticlib" >&5 +echo "$as_me:5232: result: $with_ticlib" >&5 echo "${ECHO_T}$with_ticlib" >&6 ### Checks for special libraries, must be done up-front. SHLIB_LIST="" -echo "$as_me:5107: checking if you want to link with the GPM mouse library" >&5 +echo "$as_me:5238: 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. @@ -5114,27 +5245,27 @@ if test "${with_gpm+set}" = set; then else with_gpm=maybe fi; -echo "$as_me:5117: result: $with_gpm" >&5 +echo "$as_me:5248: result: $with_gpm" >&5 echo "${ECHO_T}$with_gpm" >&6 if test "$with_gpm" != no ; then - echo "$as_me:5121: checking for gpm.h" >&5 + echo "$as_me:5252: 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 5127 "configure" +#line 5258 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:5131: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5262: \"$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:5137: \$? = $ac_status" >&5 + echo "$as_me:5268: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5153,7 +5284,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5156: result: $ac_cv_header_gpm_h" >&5 +echo "$as_me:5287: 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 @@ -5164,14 +5295,15 @@ 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}:5167: testing assuming we really have GPM library ..." 1>&5 +echo "${as_me:-configure}:5298: testing assuming we really have GPM library ..." 1>&5 cat >>confdefs.h <<\EOF #define HAVE_LIBGPM 1 EOF + with_gpm=yes else - echo "$as_me:5174: checking for Gpm_Open in -lgpm" >&5 + echo "$as_me:5306: 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 @@ -5179,7 +5311,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5182 "configure" +#line 5314 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5198,16 +5330,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5201: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5333: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5204: \$? = $ac_status" >&5 + echo "$as_me:5336: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5207: \"$ac_try\"") >&5 + { (eval echo "$as_me:5339: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5210: \$? = $ac_status" >&5 + echo "$as_me:5342: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -5218,23 +5350,29 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5221: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:5353: 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:5227: error: Cannot link with GPM library" >&5 + if test "$with_gpm" = maybe; then + { echo "$as_me:5360: WARNING: Cannot link with GPM library" >&5 +echo "$as_me: WARNING: Cannot link with GPM library" >&2;} + with_gpm=no + else + { { echo "$as_me:5364: error: Cannot link with GPM library" >&5 echo "$as_me: error: Cannot link with GPM library" >&2;} { (exit 1); exit 1; }; } - fi - with_gpm=yes + fi fi + fi + else - test "$with_gpm" != maybe && { echo "$as_me:5237: WARNING: Cannot find GPM header" >&5 + test "$with_gpm" != maybe && { echo "$as_me:5375: WARNING: Cannot find GPM header" >&5 echo "$as_me: WARNING: Cannot find GPM header" >&2;} with_gpm=no @@ -5243,7 +5381,7 @@ fi fi if test "$with_gpm" != no ; then - echo "$as_me:5246: checking if you want to load GPM dynamically" >&5 + echo "$as_me:5384: 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. @@ -5253,18 +5391,18 @@ if test "${with_dlsym+set}" = set; then else with_dlsym=yes fi; - echo "$as_me:5256: result: $with_dlsym" >&5 + echo "$as_me:5394: result: $with_dlsym" >&5 echo "${ECHO_T}$with_dlsym" >&6 if test "x$with_dlsym" = xyes ; then cf_have_dlsym=no -echo "$as_me:5261: checking for dlsym" >&5 +echo "$as_me:5399: 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 5267 "configure" +#line 5405 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlsym (); below. */ @@ -5295,16 +5433,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:5298: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5436: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5301: \$? = $ac_status" >&5 + echo "$as_me:5439: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5304: \"$ac_try\"") >&5 + { (eval echo "$as_me:5442: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5307: \$? = $ac_status" >&5 + echo "$as_me:5445: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_dlsym=yes else @@ -5314,14 +5452,14 @@ ac_cv_func_dlsym=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5317: result: $ac_cv_func_dlsym" >&5 +echo "$as_me:5455: 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:5324: checking for dlsym in -ldl" >&5 +echo "$as_me:5462: 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 @@ -5329,7 +5467,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5332 "configure" +#line 5470 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5348,16 +5486,16 @@ dlsym (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5351: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5489: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5354: \$? = $ac_status" >&5 + echo "$as_me:5492: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5357: \"$ac_try\"") >&5 + { (eval echo "$as_me:5495: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5360: \$? = $ac_status" >&5 + echo "$as_me:5498: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dl_dlsym=yes else @@ -5368,7 +5506,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5371: result: $ac_cv_lib_dl_dlsym" >&5 +echo "$as_me:5509: 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 @@ -5379,7 +5517,7 @@ fi fi if test "$cf_have_dlsym" = yes ; then - test "$cf_have_libdl" = yes && + 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 @@ -5395,11 +5533,12 @@ do test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" done LIBS="$cf_add_libs" + } - echo "$as_me:5399: checking whether able to link to dl*() functions" >&5 + echo "$as_me:5538: 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 5402 "configure" +#line 5541 "configure" #include "confdefs.h" #include int @@ -5417,16 +5556,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5420: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5559: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5423: \$? = $ac_status" >&5 + echo "$as_me:5562: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5426: \"$ac_try\"") >&5 + { (eval echo "$as_me:5565: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5429: \$? = $ac_status" >&5 + echo "$as_me:5568: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\EOF @@ -5437,15 +5576,15 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - { { echo "$as_me:5440: error: Cannot link test program for libdl" >&5 + { { echo "$as_me:5579: 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:5445: result: ok" >&5 + echo "$as_me:5584: result: ok" >&5 echo "${ECHO_T}ok" >&6 else - { { echo "$as_me:5448: error: Cannot find dlsym function" >&5 + { { echo "$as_me:5587: error: Cannot find dlsym function" >&5 echo "$as_me: error: Cannot find dlsym function" >&2;} { (exit 1); exit 1; }; } fi @@ -5453,12 +5592,12 @@ fi if test "x$with_gpm" != xyes ; then test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 -echo "${as_me:-configure}:5456: testing assuming soname for gpm is $with_gpm ..." 1>&5 +echo "${as_me:-configure}:5595: testing assuming soname for gpm is $with_gpm ..." 1>&5 cf_cv_gpm_soname="$with_gpm" else -echo "$as_me:5461: checking for soname of gpm library" >&5 +echo "$as_me:5600: 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 @@ -5468,7 +5607,7 @@ cf_cv_gpm_soname=unknown if test "$cross_compiling" != yes ; then cat >conftest.$ac_ext < -int main() +int main(void) { if (Gpm_Open(0,0)) Gpm_Close(); ${cf_cv_main_return:-return}(0); @@ -5492,15 +5631,15 @@ do done LIBS="$cf_add_libs" - if { (eval echo "$as_me:5495: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5634: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5498: \$? = $ac_status" >&5 + echo "$as_me:5637: \$? = $ac_status" >&5 (exit $ac_status); } ; then - if { (eval echo "$as_me:5500: \"$ac_link\"") >&5 + if { (eval echo "$as_me:5639: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5503: \$? = $ac_status" >&5 + echo "$as_me:5642: \$? = $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 @@ -5511,7 +5650,7 @@ LIBS="$cf_save_LIBS" fi fi -echo "$as_me:5514: result: $cf_cv_gpm_soname" >&5 +echo "$as_me:5653: result: $cf_cv_gpm_soname" >&5 echo "${ECHO_T}$cf_cv_gpm_soname" >&6 fi @@ -5546,7 +5685,7 @@ cat >>confdefs.h <<\EOF #define HAVE_LIBGPM 1 EOF -echo "$as_me:5549: checking for Gpm_Wgetch in -lgpm" >&5 +echo "$as_me:5688: 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 @@ -5554,7 +5693,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5557 "configure" +#line 5696 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5573,16 +5712,16 @@ Gpm_Wgetch (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5576: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5715: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5579: \$? = $ac_status" >&5 + echo "$as_me:5718: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5582: \"$ac_try\"") >&5 + { (eval echo "$as_me:5721: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5585: \$? = $ac_status" >&5 + echo "$as_me:5724: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Wgetch=yes else @@ -5593,11 +5732,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5596: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 +echo "$as_me:5735: 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:5600: checking if GPM is weakly bound to curses library" >&5 +echo "$as_me:5739: 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 @@ -5608,7 +5747,7 @@ if test "$cross_compiling" != yes ; then cat >conftest.$ac_ext < -int main() +int main(void) { Gpm_Wgetch(); ${cf_cv_main_return:-return}(0); @@ -5621,15 +5760,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:5624: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5763: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5627: \$? = $ac_status" >&5 + echo "$as_me:5766: \$? = $ac_status" >&5 (exit $ac_status); } ; then - if { (eval echo "$as_me:5629: \"$ac_link\"") >&5 + if { (eval echo "$as_me:5768: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5632: \$? = $ac_status" >&5 + echo "$as_me:5771: \$? = $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 @@ -5641,11 +5780,11 @@ CF_EOF fi fi -echo "$as_me:5644: result: $cf_cv_check_gpm_wgetch" >&5 +echo "$as_me:5783: 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:5648: WARNING: GPM library is already linked with curses - read the FAQ" >&5 + { echo "$as_me:5787: 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 @@ -5655,7 +5794,7 @@ fi # not everyone has "test -c" if test -c /dev/sysmouse 2>/dev/null ; then -echo "$as_me:5658: checking if you want to use sysmouse" >&5 +echo "$as_me:5797: 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. @@ -5667,7 +5806,7 @@ else fi; if test "$cf_with_sysmouse" != no ; then cat >conftest.$ac_ext <<_ACEOF -#line 5670 "configure" +#line 5809 "configure" #include "confdefs.h" #include @@ -5690,16 +5829,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5693: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5832: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5696: \$? = $ac_status" >&5 + echo "$as_me:5835: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5699: \"$ac_try\"") >&5 + { (eval echo "$as_me:5838: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5702: \$? = $ac_status" >&5 + echo "$as_me:5841: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_with_sysmouse=yes else @@ -5709,7 +5848,7 @@ cf_with_sysmouse=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5712: result: $cf_with_sysmouse" >&5 +echo "$as_me:5851: result: $cf_with_sysmouse" >&5 echo "${ECHO_T}$cf_with_sysmouse" >&6 test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF @@ -5728,22 +5867,22 @@ if test X"$CXX_G_OPT" = X"" ; then test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT='' fi -echo "$as_me:5731: checking for default loader flags" >&5 +echo "$as_me:5870: 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='' ;; -normal) LD_MODEL='' ;; -debug) LD_MODEL=$CC_G_OPT ;; -profile) LD_MODEL='-pg';; -shared) LD_MODEL='' ;; +(libtool) LD_MODEL='' ;; +(normal) LD_MODEL='' ;; +(debug) LD_MODEL=$CC_G_OPT ;; +(profile) LD_MODEL='-pg';; +(shared) LD_MODEL='' ;; esac -echo "$as_me:5740: result: $LD_MODEL" >&5 +echo "$as_me:5879: result: $LD_MODEL" >&5 echo "${ECHO_T}$LD_MODEL" >&6 case $DFT_LWR_MODEL in -shared) +(shared) -echo "$as_me:5746: checking if rpath option should be used" >&5 +echo "$as_me:5885: 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. @@ -5753,10 +5892,10 @@ if test "${enable_rpath+set}" = set; then else cf_cv_enable_rpath=no fi; -echo "$as_me:5756: result: $cf_cv_enable_rpath" >&5 +echo "$as_me:5895: result: $cf_cv_enable_rpath" >&5 echo "${ECHO_T}$cf_cv_enable_rpath" >&6 -echo "$as_me:5759: checking if shared libraries should be relinked during install" >&5 +echo "$as_me:5898: 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. @@ -5766,7 +5905,7 @@ if test "${enable_relink+set}" = set; then else cf_cv_do_relink=yes fi; -echo "$as_me:5769: result: $cf_cv_do_relink" >&5 +echo "$as_me:5908: result: $cf_cv_do_relink" >&5 echo "${ECHO_T}$cf_cv_do_relink" >&6 ;; esac @@ -5775,43 +5914,43 @@ esac rel_builddir=.. LD_RPATH_OPT= -echo "$as_me:5778: checking for an rpath option" >&5 +echo "$as_me:5917: 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 +case $cf_cv_system_name in +(irix*) if test "$GCC" = yes; then LD_RPATH_OPT="-Wl,-rpath," else LD_RPATH_OPT="-rpath " fi ;; -linux*|gnu*|k*bsd*-gnu) #(vi +(linux*|gnu*|k*bsd*-gnu|freebsd*) LD_RPATH_OPT="-Wl,-rpath," ;; -openbsd[2-9].*|mirbsd*) #(vi +(openbsd[2-9].*|mirbsd*) LD_RPATH_OPT="-Wl,-rpath," ;; -dragonfly*|freebsd*) #(vi +(dragonfly*) LD_RPATH_OPT="-rpath " ;; -netbsd*) #(vi +(netbsd*) LD_RPATH_OPT="-Wl,-rpath," ;; -osf*|mls+*) #(vi +(osf*|mls+*) LD_RPATH_OPT="-rpath " ;; -solaris2*) #(vi +(solaris2*) LD_RPATH_OPT="-R" ;; -*) +(*) ;; esac -echo "$as_me:5809: result: $LD_RPATH_OPT" >&5 +echo "$as_me:5948: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 -case "x$LD_RPATH_OPT" in #(vi -x-R*) - echo "$as_me:5814: checking if we need a space after rpath option" >&5 +case "x$LD_RPATH_OPT" in +(x-R*) + echo "$as_me:5953: 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" @@ -5832,7 +5971,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 5835 "configure" +#line 5974 "configure" #include "confdefs.h" int @@ -5844,16 +5983,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5847: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5986: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5850: \$? = $ac_status" >&5 + echo "$as_me:5989: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5853: \"$ac_try\"") >&5 + { (eval echo "$as_me:5992: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5856: \$? = $ac_status" >&5 + echo "$as_me:5995: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_space=no else @@ -5863,7 +6002,7 @@ cf_rpath_space=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:5866: result: $cf_rpath_space" >&5 + echo "$as_me:6005: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; @@ -5884,23 +6023,25 @@ esac cf_ld_rpath_opt= test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - echo "$as_me:5887: checking if release/abi version should be used for shared libs" >&5 + echo "$as_me:6026: checking if release/abi version should be used for shared libs" >&5 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 # Check whether --with-shlib-version or --without-shlib-version was given. if test "${with_shlib_version+set}" = set; then withval="$with_shlib_version" test -z "$withval" && withval=auto - case $withval in #(vi - yes) #(vi + case $withval in + (yes) cf_cv_shlib_version=auto ;; - rel|abi|auto|no) #(vi + (rel|abi|auto) cf_cv_shlib_version=$withval ;; - *) - { { echo "$as_me:5902: 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;} + (*) + echo "$as_me:6041: result: $withval" >&5 +echo "${ECHO_T}$withval" >&6 + { { echo "$as_me:6043: error: option value must be one of: rel, abi, or auto" >&5 +echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} { (exit 1); exit 1; }; } ;; esac @@ -5908,7 +6049,7 @@ 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:5911: result: $cf_cv_shlib_version" >&5 + echo "$as_me:6052: result: $cf_cv_shlib_version" >&5 echo "${ECHO_T}$cf_cv_shlib_version" >&6 cf_cv_rm_so_locs=no @@ -5916,16 +6057,29 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 # Some less-capable ports of gcc support only -fpic CC_SHARED_OPTS= + + cf_try_fPIC=no if test "$GCC" = yes then - echo "$as_me:5921: checking which $CC option to use" >&5 + cf_try_fPIC=yes + else + case $cf_cv_system_name in + (*linux*) # e.g., PGI compiler + cf_try_fPIC=yes + ;; + esac + fi + + if test "$cf_try_fPIC" = yes + then + echo "$as_me:6075: 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 5928 "configure" +#line 6082 "configure" #include "confdefs.h" #include int @@ -5937,16 +6091,16 @@ int x = 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5940: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6094: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5943: \$? = $ac_status" >&5 + echo "$as_me:6097: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5946: \"$ac_try\"") >&5 + { (eval echo "$as_me:6100: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5949: \$? = $ac_status" >&5 + echo "$as_me:6103: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -5955,37 +6109,37 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done - echo "$as_me:5958: result: $CC_SHARED_OPTS" >&5 + echo "$as_me:6112: result: $CC_SHARED_OPTS" >&5 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 CFLAGS="$cf_save_CFLAGS" fi cf_cv_shlib_version_infix=no - case $cf_cv_system_name in #(vi - aix4.3-9*|aix[5-7]*) #(vi + case $cf_cv_system_name in + (aix4.3-9*|aix[5-7]*) if test "$GCC" = yes; then - CC_SHARED_OPTS= + CC_SHARED_OPTS='-Wl,-brtl' MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@' else - # CC_SHARED_OPTS='-qpic=large -G' - # perhaps "-bM:SRE -bnoentry -bexpall" + CC_SHARED_OPTS='-brtl' + # as well as '-qpic=large -G' or perhaps "-bM:SRE -bnoentry -bexpall" MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@' fi ;; - beos*) #(vi + (beos*) MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0' ;; - cygwin*) #(vi + (cygwin*) CC_SHARED_OPTS= - MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}' + MK_SHARED_LIB=$SHELL' '$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 + #!$SHELL SHARED_LIB=\$1 IMPORT_LIB=\`echo "\$1" | sed -e 's/cyg/lib/' -e 's/[0-9]*\.dll$/.dll.a/'\` shift @@ -5998,16 +6152,16 @@ EOF CF_EOF chmod +x mk_shared_lib.sh ;; - msys*) #(vi + (msys*) CC_SHARED_OPTS= - MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}' + MK_SHARED_LIB=$SHELL' '$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 + #!$SHELL SHARED_LIB=\$1 IMPORT_LIB=\`echo "\$1" | sed -e 's/msys-/lib/' -e 's/[0-9]*\.dll$/.dll.a/'\` shift @@ -6020,13 +6174,13 @@ EOF CF_EOF chmod +x mk_shared_lib.sh ;; - darwin*) #(vi + (darwin*) 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:6029: checking if ld -search_paths_first works" >&5 + echo "$as_me:6183: 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 @@ -6035,7 +6189,7 @@ else cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" cat >conftest.$ac_ext <<_ACEOF -#line 6038 "configure" +#line 6192 "configure" #include "confdefs.h" int @@ -6047,16 +6201,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6050: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6204: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6053: \$? = $ac_status" >&5 + echo "$as_me:6207: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6056: \"$ac_try\"") >&5 + { (eval echo "$as_me:6210: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6059: \$? = $ac_status" >&5 + echo "$as_me:6213: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ldflags_search_paths_first=yes else @@ -6067,13 +6221,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS=$cf_save_LDFLAGS fi -echo "$as_me:6070: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "$as_me:6224: 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 + (hpux[7-8]*) # HP-UX 8.07 ld lacks "+b" option used for libdir search-list if test "$GCC" != yes; then CC_SHARED_OPTS='+Z' @@ -6081,7 +6235,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 MK_SHARED_LIB='${LD} -b -o $@' INSTALL_LIB="-m 555" ;; - hpux*) #(vi + (hpux*) # (tested with gcc 2.7.2 -- I don't have c89) if test "$GCC" = yes; then LD_SHARED_OPTS='-Xlinker +b -Xlinker ${libdir}' @@ -6094,7 +6248,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 # readonly to exploit a quirk in the memory manager. INSTALL_LIB="-m 555" ;; - interix*) + (interix*) test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel if test "$cf_cv_shlib_version" = rel; then cf_shared_soname='`basename .${REL_VERSION}`.${ABI_VERSION}' @@ -6104,7 +6258,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 CC_SHARED_OPTS= MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o ' ;; - irix*) #(vi + (irix*) if test "$cf_cv_enable_rpath" = yes ; then EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" fi @@ -6117,7 +6271,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 fi cf_cv_rm_so_locs=yes ;; - linux*|gnu*|k*bsd*-gnu) #(vi + (linux*|gnu*|k*bsd*-gnu) if test "$DFT_LWR_MODEL" = "shared" ; then LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" @@ -6135,7 +6289,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' ;; - mingw*) #(vi + (mingw*) cf_cv_shlib_version=mingw cf_cv_shlib_version_infix=mingw shlibdir=$bindir @@ -6146,10 +6300,10 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 EXTRA_LDFLAGS="-Wl,--enable-auto-import $EXTRA_LDFLAGS" fi CC_SHARED_OPTS= - MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}' + MK_SHARED_LIB=$SHELL' '$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 + #!$SHELL SHARED_LIB=\$1 IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$/.dll.a/'\` shift @@ -6162,7 +6316,7 @@ EOF CF_EOF chmod +x mk_shared_lib.sh ;; - openbsd[2-9].*|mirbsd*) #(vi + (openbsd[2-9].*|mirbsd*) if test "$DFT_LWR_MODEL" = "shared" ; then LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" @@ -6181,12 +6335,12 @@ CF_EOF MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' ;; - nto-qnx*|openbsd*|freebsd[12].*) #(vi + (nto-qnx*|openbsd*|freebsd[12].*) CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" MK_SHARED_LIB='${LD} -Bshareable -o $@' test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel ;; - dragonfly*|freebsd*) #(vi + (dragonfly*|freebsd*) CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" @@ -6201,9 +6355,9 @@ CF_EOF cf_cv_shared_soname='`basename $@`' fi - MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $@` -o $@' + MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' ;; - netbsd*) #(vi + (netbsd*) CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" @@ -6229,13 +6383,13 @@ CF_EOF MK_SHARED_LIB='${CC} -Wl,-shared -Wl,-Bshareable -o $@' fi ;; - osf*|mls+*) #(vi + (osf*|mls+*) # tested with OSF/1 V3.2 and 'cc' # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't # link with shared libs). MK_SHARED_LIB='${LD} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $@`' - case $host_os in #(vi - osf4*) + case $host_os in + (osf4*) MK_SHARED_LIB="${MK_SHARED_LIB} -msym" ;; esac @@ -6246,7 +6400,7 @@ CF_EOF fi cf_cv_rm_so_locs=yes ;; - sco3.2v5*) # (also uw2* and UW7: hops 13-Apr-98 + (sco3.2v5*) # also uw2* and UW7: hops 13-Apr-98 # tested with osr5.0.5 if test "$GCC" != yes; then CC_SHARED_OPTS='-belf -KPIC' @@ -6260,7 +6414,7 @@ CF_EOF LINK_PROGS='LD_RUN_PATH=${libdir}' LINK_TESTS='Pwd=`pwd`;LD_RUN_PATH=`dirname $${Pwd}`/lib' ;; - sunos4*) #(vi + (sunos4*) # tested with SunOS 4.1.1 and gcc 2.7.0 if test "$GCC" != yes; then CC_SHARED_OPTS='-KPIC' @@ -6268,7 +6422,7 @@ CF_EOF MK_SHARED_LIB='${LD} -assert pure-text -o $@' test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel ;; - solaris2*) #(vi + (solaris2*) # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2 # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3 if test "$DFT_LWR_MODEL" = "shared" ; then @@ -6292,7 +6446,7 @@ CF_EOF do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" cat >conftest.$ac_ext <<_ACEOF -#line 6295 "configure" +#line 6449 "configure" #include "confdefs.h" #include int @@ -6304,16 +6458,16 @@ printf("Hello\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6307: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6461: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6310: \$? = $ac_status" >&5 + echo "$as_me:6464: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6313: \"$ac_try\"") >&5 + { (eval echo "$as_me:6467: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6316: \$? = $ac_status" >&5 + echo "$as_me:6470: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -6329,28 +6483,28 @@ rm -f conftest.$ac_objext conftest.$ac_ext MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@' fi ;; - sysv5uw7*|unix_sv*) #(vi + (sysv5uw7*|unix_sv*) # tested with UnixWare 7.1.0 (gcc 2.95.2 and cc) if test "$GCC" != yes; then CC_SHARED_OPTS='-KPIC' fi MK_SHARED_LIB='${LD} -d y -G -o $@' ;; - *) + (*) CC_SHARED_OPTS='unknown' MK_SHARED_LIB='echo unknown' ;; esac # This works if the last tokens in $MK_SHARED_LIB are the -o target. - case "$cf_cv_shlib_version" in #(vi - rel|abi) - case "$MK_SHARED_LIB" in #(vi - *'-o $@') #(vi + case "$cf_cv_shlib_version" in + (rel|abi) + case "$MK_SHARED_LIB" in + (*'-o $@') test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes ;; - *) - { echo "$as_me:6353: WARNING: ignored --with-shlib-version" >&5 + (*) + { echo "$as_me:6507: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac @@ -6360,7 +6514,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} if test -n "$cf_try_cflags" then cat > conftest.$ac_ext < int main(int argc, char *argv[]) { @@ -6372,18 +6526,18 @@ EOF for cf_opt in $cf_try_cflags do CFLAGS="$cf_save_CFLAGS -$cf_opt" - echo "$as_me:6375: checking if CFLAGS option -$cf_opt works" >&5 + echo "$as_me:6529: 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:6377: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:6531: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6380: \$? = $ac_status" >&5 + echo "$as_me:6534: \$? = $ac_status" >&5 (exit $ac_status); }; then - echo "$as_me:6382: result: yes" >&5 + echo "$as_me:6536: result: yes" >&5 echo "${ECHO_T}yes" >&6 cf_save_CFLAGS="$CFLAGS" else - echo "$as_me:6386: result: no" >&5 + echo "$as_me:6540: result: no" >&5 echo "${ECHO_T}no" >&6 fi done @@ -6398,17 +6552,17 @@ echo "${ECHO_T}no" >&6 test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 -echo "${as_me:-configure}:6401: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 +echo "${as_me:-configure}:6555: 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}:6405: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:6559: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 for model in $cf_list_models; do - case $model in #(vi - libtool) + case $model in + (libtool) -echo "$as_me:6411: checking for additional libtool options" >&5 +echo "$as_me:6565: checking for additional libtool options" >&5 echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6 # Check whether --with-libtool-opts or --without-libtool-opts was given. @@ -6418,18 +6572,18 @@ if test "${with_libtool_opts+set}" = set; then else with_libtool_opts=no fi; -echo "$as_me:6421: result: $with_libtool_opts" >&5 +echo "$as_me:6575: result: $with_libtool_opts" >&5 echo "${ECHO_T}$with_libtool_opts" >&6 case .$with_libtool_opts in -.yes|.no|.) +(.yes|.no|.) ;; -*) +(*) LIBTOOL_OPTS="$LIBTOOL_OPTS $with_libtool_opts" ;; esac -echo "$as_me:6432: checking if exported-symbols file should be used" >&5 +echo "$as_me:6586: checking if exported-symbols file should be used" >&5 echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6 # Check whether --with-export-syms or --without-export-syms was given. @@ -6444,23 +6598,67 @@ then with_export_syms='${top_srcdir}/package/${PACKAGE}.sym' fi -echo "$as_me:6447: result: $with_export_syms" >&5 +echo "$as_me:6601: result: $with_export_syms" >&5 echo "${ECHO_T}$with_export_syms" >&6 if test "x$with_export_syms" != xno then - EXPORT_SYMS="$EXPORT_SYMS -export-symbols $with_export_syms" + EXPORT_SYMS="-export-symbols $with_export_syms" fi ;; - shared) #(vi + (shared) if test "$CC_SHARED_OPTS" = "unknown"; then - { { echo "$as_me:6458: error: Shared libraries are not supported in this version" >&5 + { { echo "$as_me:6612: error: Shared libraries are not supported in this version" >&5 echo "$as_me: error: Shared libraries are not supported in this version" >&2;} { (exit 1); exit 1; }; } fi + # workaround for inept transition to PIE vs PIC... + echo "$as_me:6617: checking if current CFLAGS link properly" >&5 +echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 6620 "configure" +#include "confdefs.h" +#include +int +main () +{ +printf("Hello work\n"); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6632: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6635: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6638: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6641: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cflags_work=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cflags_work=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:6650: result: $cf_cflags_work" >&5 +echo "${ECHO_T}$cf_cflags_work" >&6 + if test "$cf_cflags_work" = no + then + test -n "$verbose" && echo " try to work around by appending shared-options" 1>&6 + +echo "${as_me:-configure}:6656: testing try to work around by appending shared-options ..." 1>&5 + + CFLAGS="$CFLAGS $CC_SHARED_OPTS" + fi -echo "$as_me:6463: checking if versioned-symbols file should be used" >&5 +echo "$as_me:6661: checking if versioned-symbols file should be used" >&5 echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6 # Check whether --with-versioned-syms or --without-versioned-syms was given. @@ -6475,34 +6673,118 @@ then with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map' fi -echo "$as_me:6478: result: $with_versioned_syms" >&5 +echo "$as_me:6676: result: $with_versioned_syms" >&5 echo "${ECHO_T}$with_versioned_syms" >&6 +RESULTING_SYMS= +VERSIONED_SYMS= +WILDCARD_SYMS= + if test "x$with_versioned_syms" != xno then - + RESULTING_SYMS=$with_versioned_syms case "x$MK_SHARED_LIB" in - *-Wl,*) #(vi - VERSIONED_SYMS="-Wl,--version-script,$with_versioned_syms" + (*-Wl,*) + VERSIONED_SYMS="-Wl,--version-script,\${RESULTING_SYMS}" MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"` test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:6490: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:6692: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ;; - *-dy*) #(vi - VERSIONED_SYMS="-Wl,-M,$with_versioned_syms" + (*-dy\ *) + VERSIONED_SYMS="-Wl,-M,\${RESULTING_SYMS}" MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"` test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:6498: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:6700: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ;; - *) - { echo "$as_me:6502: WARNING: this system does not support versioned-symbols" >&5 + (*) + { echo "$as_me:6704: WARNING: this system does not support versioned-symbols" >&5 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;} ;; esac + + # Linux ld can selectively override scope, e.g., of symbols beginning with + # "_" by first declaring some as global, and then using a wildcard to + # declare the others as local. Some other loaders cannot do this. Check + # by constructing a (very) simple shared library and inspecting its + # symbols. + if test "x$VERSIONED_SYMS" != "x" + then + echo "$as_me:6716: checking if wildcards can be used to selectively omit symbols" >&5 +echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6 + WILDCARD_SYMS=no + + # make sources + rm -f conftest.* + + cat >conftest.ver <conftest.$ac_ext <conftest.mk <&5 >/dev/null + then + # test for missing symbol in either Data or Text section + cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ ][DT][ ]'` + test -n "$cf_missing" && WILDCARD_SYMS=yes + fi + echo "$as_me:6784: result: $WILDCARD_SYMS" >&5 +echo "${ECHO_T}$WILDCARD_SYMS" >&6 + rm -f conftest.* + fi fi ;; @@ -6510,54 +6792,61 @@ fi done # pretend that ncurses==ncursesw==ncursest -echo "$as_me:6513: checking if you want to disable library suffixes" >&5 +echo "$as_me:6795: 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 + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + disable_lib_suffixes=yes + else + disable_lib_suffixes=no + fi else - disable_lib_suffixes=no + enableval=yes + disable_lib_suffixes=no + fi; -echo "$as_me:6523: result: $disable_lib_suffixes" >&5 +echo "$as_me:6812: 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:6529: checking if rpath-hack should be disabled" >&5 +echo "$as_me:6818: 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. if test "${enable_rpath_hack+set}" = set; then enableval="$enable_rpath_hack" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then cf_disable_rpath_hack=yes - else - cf_disable_rpath_hack=no - fi + else + cf_disable_rpath_hack=no + fi else enableval=yes - cf_disable_rpath_hack=no + cf_disable_rpath_hack=no fi; -echo "$as_me:6546: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:6835: 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:6550: checking for updated LDFLAGS" >&5 +echo "$as_me:6839: 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:6553: result: maybe" >&5 + echo "$as_me:6842: 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:6560: checking for $ac_word" >&5 +echo "$as_me:6849: 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 @@ -6572,7 +6861,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:6575: found $ac_dir/$ac_word" >&5 +echo "$as_me:6864: found $ac_dir/$ac_word" >&5 break done @@ -6580,10 +6869,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:6583: result: $cf_ldd_prog" >&5 + echo "$as_me:6872: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:6586: result: no" >&5 + echo "$as_me:6875: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6597,7 +6886,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >conftest.$ac_ext <<_ACEOF -#line 6600 "configure" +#line 6889 "configure" #include "confdefs.h" #include int @@ -6609,16 +6898,16 @@ printf("Hello"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6612: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6901: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6615: \$? = $ac_status" >&5 + echo "$as_me:6904: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6618: \"$ac_try\"") >&5 + { (eval echo "$as_me:6907: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6621: \$? = $ac_status" >&5 + echo "$as_me:6910: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq` cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` @@ -6646,7 +6935,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}:6649: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:6938: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -6658,17 +6947,17 @@ echo "${as_me:-configure}:6649: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:6661: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:6950: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:6665: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:6954: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS do - case $cf_rpath_src in #(vi - -L*) #(vi + case $cf_rpath_src in + (-L*) # check if this refers to a directory which we will ignore cf_rpath_skip=no @@ -6699,7 +6988,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:6702: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:6991: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -6712,17 +7001,17 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:6715: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:7004: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:6719: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:7008: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS do - case $cf_rpath_src in #(vi - -L*) #(vi + case $cf_rpath_src in + (-L*) # check if this refers to a directory which we will ignore cf_rpath_skip=no @@ -6753,7 +7042,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:6756: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:7045: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -6766,14 +7055,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:6769: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:7058: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:6773: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:7062: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:6776: result: no" >&5 + echo "$as_me:7065: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6783,8 +7072,31 @@ fi ############################################################################### +### use option --with-extra-suffix to append suffix to headers and libraries +echo "$as_me:7076: checking if you wish to append extra suffix to header/library paths" >&5 +echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6 +EXTRA_SUFFIX= + +# Check whether --with-extra-suffix or --without-extra-suffix was given. +if test "${with_extra_suffix+set}" = set; then + withval="$with_extra_suffix" + case x$withval in + (no) + ;; + (xyes|x) + EXTRA_SUFFIX=$cf_cv_abi_version + ;; + (*) + EXTRA_SUFFIX=$withval + ;; + esac + +fi; +echo "$as_me:7095: result: $EXTRA_SUFFIX" >&5 +echo "${ECHO_T}$EXTRA_SUFFIX" >&6 + ### use option --disable-overwrite to leave out the link to -lcurses -echo "$as_me:6787: checking if you wish to install ncurses overwriting curses" >&5 +echo "$as_me:7099: 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. @@ -6794,10 +7106,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:6797: result: $with_overwrite" >&5 +echo "$as_me:7109: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 -echo "$as_me:6800: checking if external terminfo-database is used" >&5 +echo "$as_me:7112: 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. @@ -6807,14 +7119,14 @@ if test "${enable_database+set}" = set; then else use_database=yes fi; -echo "$as_me:6810: result: $use_database" >&5 +echo "$as_me:7122: result: $use_database" >&5 echo "${ECHO_T}$use_database" >&6 -case $host_os in #(vi -os2*) #(vi +case $host_os in +(os2*) TERMINFO_SRC='${top_srcdir}/misc/emx.src' ;; -*) #(vi +(*) TERMINFO_SRC='${top_srcdir}/misc/terminfo.src' ;; esac @@ -6823,7 +7135,7 @@ NCURSES_USE_DATABASE=0 if test "$use_database" != no ; then NCURSES_USE_DATABASE=1 - echo "$as_me:6826: checking which terminfo source-file will be installed" >&5 + echo "$as_me:7138: 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. @@ -6831,10 +7143,10 @@ if test "${with_database+set}" = set; then withval="$with_database" TERMINFO_SRC=$withval fi; - echo "$as_me:6834: result: $TERMINFO_SRC" >&5 + echo "$as_me:7146: result: $TERMINFO_SRC" >&5 echo "${ECHO_T}$TERMINFO_SRC" >&6 - echo "$as_me:6837: checking whether to use hashed database instead of directory/tree" >&5 + echo "$as_me:7149: 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. @@ -6844,13 +7156,13 @@ if test "${with_hashed_db+set}" = set; then else with_hashed_db=no fi; - echo "$as_me:6847: result: $with_hashed_db" >&5 + echo "$as_me:7159: result: $with_hashed_db" >&5 echo "${ECHO_T}$with_hashed_db" >&6 else with_hashed_db=no fi -echo "$as_me:6853: checking for list of fallback descriptions" >&5 +echo "$as_me:7165: 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. @@ -6860,11 +7172,11 @@ if test "${with_fallbacks+set}" = set; then else with_fallback= fi; -echo "$as_me:6863: result: $with_fallback" >&5 +echo "$as_me:7175: result: $with_fallback" >&5 echo "${ECHO_T}$with_fallback" >&6 -FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'` +FALLBACK_LIST=`test "$with_fallback" != no && echo "$with_fallback" | sed -e 's/,/ /g'` -echo "$as_me:6867: checking if you want modern xterm or antique" >&5 +echo "$as_me:7179: 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. @@ -6875,14 +7187,14 @@ else with_xterm_new=yes fi; case $with_xterm_new in -no) with_xterm_new=xterm-old;; -*) with_xterm_new=xterm-new;; +(no) with_xterm_new=xterm-old;; +(*) with_xterm_new=xterm-new;; esac -echo "$as_me:6881: result: $with_xterm_new" >&5 +echo "$as_me:7193: result: $with_xterm_new" >&5 echo "${ECHO_T}$with_xterm_new" >&6 WHICH_XTERM=$with_xterm_new -echo "$as_me:6885: checking if xterm backspace sends BS or DEL" >&5 +echo "$as_me:7197: 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. @@ -6893,17 +7205,17 @@ else with_xterm_kbs=BS fi; case x$with_xterm_kbs in -xyes|xno|xBS|xbs|x8) +(xyes|xno|xBS|xbs|x8) with_xterm_kbs=BS ;; -xDEL|xdel|x127) +(xDEL|xdel|x127) with_xterm_kbs=DEL ;; -*) +(*) with_xterm_kbs=$withval ;; esac -echo "$as_me:6906: result: $with_xterm_kbs" >&5 +echo "$as_me:7218: result: $with_xterm_kbs" >&5 echo "${ECHO_T}$with_xterm_kbs" >&6 XTERM_KBS=$with_xterm_kbs @@ -6913,7 +7225,7 @@ if test "$use_database" = no ; then MAKE_TERMINFO="#" else -echo "$as_me:6916: checking for list of terminfo directories" >&5 +echo "$as_me:7228: checking for list of terminfo directories" >&5 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. @@ -6929,34 +7241,34 @@ for cf_src_path in $withval do if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + cf_path_syntax="$ac_default_prefix" fi -case ".$cf_src_path" in #(vi -.\$\(*\)*|.\'*\'*) #(vi - ;; -..|./*|.\\*) #(vi - ;; -.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX - ;; -.\${*prefix}*|.\${*dir}*) #(vi - eval cf_src_path="$cf_src_path" - case ".$cf_src_path" in #(vi - .NONE/*) - cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; #(vi -.no|.NONE/*) - cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` - ;; -*) - { { echo "$as_me:6956: error: expected a pathname, not \"$cf_src_path\"" >&5 +case ".$cf_src_path" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval cf_src_path="$cf_src_path" + case ".$cf_src_path" in + (.NONE/*) + cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { { echo "$as_me:7268: 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}$PATH_SEPARATOR" @@ -6967,23 +7279,23 @@ IFS="$ac_save_ifs" # 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 +case "x$cf_dst_eval" in +(xNONE*) TERMINFO_DIRS=$cf_dst_path ;; -*) +(*) TERMINFO_DIRS="$cf_dst_eval" ;; esac -echo "$as_me:6979: result: $TERMINFO_DIRS" >&5 +echo "$as_me:7291: result: $TERMINFO_DIRS" >&5 echo "${ECHO_T}$TERMINFO_DIRS" >&6 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <&5 +echo "$as_me:7298: 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. @@ -6995,40 +7307,40 @@ else fi; if test -n "${datadir}/terminfo" ; then if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + 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/*) - 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:7022: error: expected a pathname, not \"$withval\"" >&5 +case ".$withval" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval withval="$withval" + case ".$withval" in + (.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { { echo "$as_me:7334: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } - ;; + ;; esac fi eval TERMINFO="$withval" -echo "$as_me:7031: result: $TERMINFO" >&5 +echo "$as_me:7343: result: $TERMINFO" >&5 echo "${ECHO_T}$TERMINFO" >&6 cat >>confdefs.h <&5 +echo "$as_me:7354: 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. @@ -7051,7 +7363,7 @@ else with_big_core=no else cat >conftest.$ac_ext <<_ACEOF -#line 7054 "configure" +#line 7366 "configure" #include "confdefs.h" #include @@ -7065,15 +7377,15 @@ int main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:7068: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7380: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7071: \$? = $ac_status" >&5 + echo "$as_me:7383: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7073: \"$ac_try\"") >&5 + { (eval echo "$as_me:7385: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7076: \$? = $ac_status" >&5 + echo "$as_me:7388: \$? = $ac_status" >&5 (exit $ac_status); }; }; then with_big_core=yes else @@ -7085,7 +7397,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi; -echo "$as_me:7088: result: $with_big_core" >&5 +echo "$as_me:7400: result: $with_big_core" >&5 echo "${ECHO_T}$with_big_core" >&6 test "x$with_big_core" = "xyes" && cat >>confdefs.h <<\EOF @@ -7095,7 +7407,7 @@ EOF ### ISO C only guarantees 512-char strings, we have tables which load faster ### when constructed using "big" strings. More than the C compiler, the awk ### program is a limit on most vendor UNIX systems. Check that we can build. -echo "$as_me:7098: checking if big-strings option selected" >&5 +echo "$as_me:7410: 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. @@ -7104,11 +7416,11 @@ if test "${enable_big_strings+set}" = set; then with_big_strings=$enableval else - case x$AWK in #(vi - x) + case x$AWK in + (x) eval with_big_strings=no ;; - *) #(vi + (*) if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < 12000) { xx = xx "x"; }; printf("%s\n", xx); }' 2>/dev/null \ | $AWK '{ printf "%d\n", length($0); }' 2>/dev/null | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ($0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then eval with_big_strings=yes @@ -7119,14 +7431,14 @@ else esac fi; -echo "$as_me:7122: result: $with_big_strings" >&5 +echo "$as_me:7434: result: $with_big_strings" >&5 echo "${ECHO_T}$with_big_strings" >&6 USE_BIG_STRINGS=0 test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1 ### use option --enable-termcap to compile in the termcap fallback support -echo "$as_me:7129: checking if you want termcap-fallback support" >&5 +echo "$as_me:7441: 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. @@ -7136,14 +7448,14 @@ if test "${enable_termcap+set}" = set; then else with_termcap=no fi; -echo "$as_me:7139: result: $with_termcap" >&5 +echo "$as_me:7451: result: $with_termcap" >&5 echo "${ECHO_T}$with_termcap" >&6 NCURSES_USE_TERMCAP=0 if test "x$with_termcap" != "xyes" ; then if test "$use_database" = no ; then if test -z "$with_fallback" ; then - { { echo "$as_me:7146: error: You have disabled the database w/o specifying fallbacks" >&5 + { { echo "$as_me:7458: 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 @@ -7156,13 +7468,13 @@ EOF else if test "$with_ticlib" != no ; then - { { echo "$as_me:7159: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 + { { echo "$as_me:7471: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} { (exit 1); exit 1; }; } fi NCURSES_USE_TERMCAP=1 - echo "$as_me:7165: checking for list of termcap files" >&5 + echo "$as_me:7477: 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. @@ -7178,34 +7490,34 @@ for cf_src_path in $withval do if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + cf_path_syntax="$ac_default_prefix" fi -case ".$cf_src_path" in #(vi -.\$\(*\)*|.\'*\'*) #(vi - ;; -..|./*|.\\*) #(vi - ;; -.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX - ;; -.\${*prefix}*|.\${*dir}*) #(vi - eval cf_src_path="$cf_src_path" - case ".$cf_src_path" in #(vi - .NONE/*) - cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; #(vi -.no|.NONE/*) - cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` - ;; -*) - { { echo "$as_me:7205: error: expected a pathname, not \"$cf_src_path\"" >&5 -echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} +case ".$cf_src_path" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval cf_src_path="$cf_src_path" + case ".$cf_src_path" in + (.NONE/*) + cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { { echo "$as_me:7517: 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}$PATH_SEPARATOR" @@ -7216,16 +7528,16 @@ IFS="$ac_save_ifs" # 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 +case "x$cf_dst_eval" in +(xNONE*) TERMPATH=$cf_dst_path ;; -*) +(*) TERMPATH="$cf_dst_eval" ;; esac - echo "$as_me:7228: result: $TERMPATH" >&5 + echo "$as_me:7540: result: $TERMPATH" >&5 echo "${ECHO_T}$TERMPATH" >&6 test -n "$TERMPATH" && cat >>confdefs.h <>confdefs.h <&5 + echo "$as_me:7548: 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. @@ -7243,14 +7555,14 @@ if test "${enable_getcap+set}" = set; then else with_getcap=no fi; - echo "$as_me:7246: result: $with_getcap" >&5 + echo "$as_me:7558: result: $with_getcap" >&5 echo "${ECHO_T}$with_getcap" >&6 test "x$with_getcap" = "xyes" && cat >>confdefs.h <<\EOF #define USE_GETCAP 1 EOF - echo "$as_me:7253: checking if translated termcaps will be cached in ~/.terminfo" >&5 + echo "$as_me:7565: 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. @@ -7260,7 +7572,7 @@ if test "${enable_getcap_cache+set}" = set; then else with_getcap_cache=no fi; - echo "$as_me:7263: result: $with_getcap_cache" >&5 + echo "$as_me:7575: result: $with_getcap_cache" >&5 echo "${ECHO_T}$with_getcap_cache" >&6 test "x$with_getcap_cache" = "xyes" && cat >>confdefs.h <<\EOF @@ -7270,7 +7582,7 @@ EOF fi ### Use option --disable-home-terminfo to completely remove ~/.terminfo -echo "$as_me:7273: checking if ~/.terminfo is wanted" >&5 +echo "$as_me:7585: 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. @@ -7280,14 +7592,14 @@ if test "${enable_home_terminfo+set}" = set; then else with_home_terminfo=yes fi; -echo "$as_me:7283: result: $with_home_terminfo" >&5 +echo "$as_me:7595: result: $with_home_terminfo" >&5 echo "${ECHO_T}$with_home_terminfo" >&6 test "x$with_home_terminfo" = "xyes" && cat >>confdefs.h <<\EOF #define USE_HOME_TERMINFO 1 EOF -echo "$as_me:7290: checking if you want to use restricted environment when running as root" >&5 +echo "$as_me:7602: 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. @@ -7297,7 +7609,7 @@ if test "${enable_root_environ+set}" = set; then else with_root_environ=yes fi; -echo "$as_me:7300: result: $with_root_environ" >&5 +echo "$as_me:7612: result: $with_root_environ" >&5 echo "${ECHO_T}$with_root_environ" >&6 test "x$with_root_environ" = xyes && cat >>confdefs.h <<\EOF @@ -7307,18 +7619,68 @@ EOF ### Use option --enable-symlinks to make tic use symlinks, not hard links ### to reduce storage requirements for the terminfo database. +for ac_header in \ +unistd.h \ + +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:7627: 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 7633 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:7637: \"$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:7643: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:7662: 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:7677: 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 7321 "configure" +#line 7683 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7349,16 +7711,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:7352: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7714: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7355: \$? = $ac_status" >&5 + echo "$as_me:7717: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7358: \"$ac_try\"") >&5 + { (eval echo "$as_me:7720: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7361: \$? = $ac_status" >&5 + echo "$as_me:7723: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7368,7 +7730,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7371: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:7733: 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:7750: 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 7394 "configure" +#line 7756 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7422,16 +7784,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:7425: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7787: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7428: \$? = $ac_status" >&5 + echo "$as_me:7790: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7431: \"$ac_try\"") >&5 + { (eval echo "$as_me:7793: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7434: \$? = $ac_status" >&5 + echo "$as_me:7796: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7441,7 +7803,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7444: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:7806: 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:7817: 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 @@ -7465,7 +7827,7 @@ else eval 'ac_cv_func_'$cf_func'=error' else cat >conftest.$ac_ext <<_ACEOF -#line 7468 "configure" +#line 7830 "configure" #include "confdefs.h" #include @@ -7473,7 +7835,7 @@ else #ifdef HAVE_UNISTD_H #include #endif -int main() +int main(void) { int fail = 0; char *src = "config.log"; @@ -7495,15 +7857,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:7498: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7860: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7501: \$? = $ac_status" >&5 + echo "$as_me:7863: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7503: \"$ac_try\"") >&5 + { (eval echo "$as_me:7865: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7506: \$? = $ac_status" >&5 + echo "$as_me:7868: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" @@ -7521,7 +7883,7 @@ fi test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no fi -echo "$as_me:7524: result: $cf_cv_link_funcs" >&5 +echo "$as_me:7886: result: $cf_cv_link_funcs" >&5 echo "${ECHO_T}$cf_cv_link_funcs" >&6 test "$ac_cv_func_link" = yes && cat >>confdefs.h <<\EOF @@ -7541,7 +7903,7 @@ with_symlinks=no # soft links (symbolic links) are useful for some systems where hard links do # not work, or to make it simpler to copy terminfo trees around. if test "x$ac_cv_func_symlink" = xyes ; then - echo "$as_me:7544: checking if tic should use symbolic links" >&5 + echo "$as_me:7906: 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. @@ -7551,21 +7913,21 @@ if test "${enable_symlinks+set}" = set; then else with_symlinks=no fi; - echo "$as_me:7554: result: $with_symlinks" >&5 + echo "$as_me:7916: 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:7561: checking if tic should use hard links" >&5 + echo "$as_me:7923: checking if tic should use hard links" >&5 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 - if test "x$ac_cv_func_link" = xyes ; then - with_links=yes - else - with_links=no - fi - echo "$as_me:7568: result: $with_links" >&5 + if test "x$ac_cv_func_link" = xyes ; then + with_links=yes + else + with_links=no + fi + echo "$as_me:7930: result: $with_links" >&5 echo "${ECHO_T}$with_links" >&6 fi @@ -7580,7 +7942,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-broken-linker to force on use of broken-linker support -echo "$as_me:7583: checking if you want broken-linker support code" >&5 +echo "$as_me:7945: 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. @@ -7590,7 +7952,7 @@ if test "${enable_broken_linker+set}" = set; then else with_broken_linker=${BROKEN_LINKER:-no} fi; -echo "$as_me:7593: result: $with_broken_linker" >&5 +echo "$as_me:7955: result: $with_broken_linker" >&5 echo "${ECHO_T}$with_broken_linker" >&6 BROKEN_LINKER=0 @@ -7602,8 +7964,8 @@ EOF BROKEN_LINKER=1 elif test "$DFT_LWR_MODEL" = shared ; then - case $cf_cv_system_name in #(vi - cygwin*) + case $cf_cv_system_name in + (cygwin*) cat >>confdefs.h <<\EOF #define BROKEN_LINKER 1 @@ -7612,14 +7974,14 @@ EOF BROKEN_LINKER=1 test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 -echo "${as_me:-configure}:7615: testing cygwin linker is broken anyway ..." 1>&5 +echo "${as_me:-configure}:7977: 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:7622: checking if tputs should process BSD-style prefix padding" >&5 +echo "$as_me:7984: 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. @@ -7629,7 +7991,7 @@ if test "${enable_bsdpad+set}" = set; then else with_bsdpad=no fi; -echo "$as_me:7632: result: $with_bsdpad" >&5 +echo "$as_me:7994: result: $with_bsdpad" >&5 echo "${ECHO_T}$with_bsdpad" >&6 test "x$with_bsdpad" = xyes && cat >>confdefs.h <<\EOF @@ -7646,26 +8008,27 @@ NCURSES_WCHAR_T=0 NCURSES_WINT_T=0 # Check to define _XOPEN_SOURCE "automatically" +CPPFLAGS_before_XOPEN="$CPPFLAGS" cf_XOPEN_SOURCE=500 cf_POSIX_C_SOURCE=199506L cf_xopen_source= -case $host_os in #(vi -aix[4-7]*) #(vi +case $host_os in +(aix[4-7]*) cf_xopen_source="-D_ALL_SOURCE" ;; -cygwin|msys) #(vi +(msys) cf_XOPEN_SOURCE=600 ;; -darwin[0-8].*) #(vi +(darwin[0-8].*) cf_xopen_source="-D_APPLE_C_SOURCE" ;; -darwin*) #(vi +(darwin*) cf_xopen_source="-D_DARWIN_C_SOURCE" cf_XOPEN_SOURCE= ;; -freebsd*|dragonfly*) #(vi +(freebsd*|dragonfly*) # 5.x headers associate # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L @@ -7673,26 +8036,26 @@ freebsd*|dragonfly*) #(vi cf_XOPEN_SOURCE=600 cf_xopen_source="-D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" ;; -hpux11*) #(vi +(hpux11*) cf_xopen_source="-D_HPUX_SOURCE -D_XOPEN_SOURCE=500" ;; -hpux*) #(vi +(hpux*) cf_xopen_source="-D_HPUX_SOURCE" ;; -irix[56].*) #(vi +(irix[56].*) cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -linux*|gnu*|mint*|k*bsd*-gnu) #(vi +(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) -echo "$as_me:7688: checking if we must define _GNU_SOURCE" >&5 +echo "$as_me:8051: 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 7695 "configure" +#line 8058 "configure" #include "confdefs.h" #include int @@ -7707,16 +8070,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7710: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8073: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7713: \$? = $ac_status" >&5 + echo "$as_me:8076: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7716: \"$ac_try\"") >&5 + { (eval echo "$as_me:8079: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7719: \$? = $ac_status" >&5 + echo "$as_me:8082: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -7725,7 +8088,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 7728 "configure" +#line 8091 "configure" #include "confdefs.h" #include int @@ -7740,16 +8103,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7743: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8106: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7746: \$? = $ac_status" >&5 + echo "$as_me:8109: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7749: \"$ac_try\"") >&5 + { (eval echo "$as_me:8112: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7752: \$? = $ac_status" >&5 + echo "$as_me:8115: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -7764,15 +8127,64 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7767: result: $cf_cv_gnu_source" >&5 +echo "$as_me:8130: 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" + +if test "$cf_cv_gnu_source" = yes +then +echo "$as_me:8135: checking if we should also define _DEFAULT_SOURCE" >&5 +echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 +if test "${cf_cv_default_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + cat >conftest.$ac_ext <<_ACEOF +#line 8143 "configure" +#include "confdefs.h" +#include +int +main () +{ + +#ifdef _DEFAULT_SOURCE +make an error +#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:8158: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:8161: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:8164: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8167: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_default_source=no +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_default_source=yes +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:8178: result: $cf_cv_default_source" >&5 +echo "${ECHO_T}$cf_cv_default_source" >&6 +test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE" +fi ;; -minix*) #(vi +(minix*) cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... ;; -mirbsd*) #(vi +(mirbsd*) # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks and other headers which use u_int / u_short types cf_XOPEN_SOURCE= @@ -7789,16 +8201,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:7792: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:8204: 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}:7798: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:8210: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 7801 "configure" +#line 8213 "configure" #include "confdefs.h" #include int @@ -7813,37 +8225,37 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7816: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8228: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7819: \$? = $ac_status" >&5 + echo "$as_me:8231: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7822: \"$ac_try\"") >&5 + { (eval echo "$as_me:8234: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7825: \$? = $ac_status" >&5 + echo "$as_me:8237: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cf_want_posix_source=no - case .$cf_POSIX_C_SOURCE in #(vi - .[12]??*) #(vi + case .$cf_POSIX_C_SOURCE in + (.[12]??*) cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" ;; - .2) #(vi + (.2) cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" cf_want_posix_source=yes ;; - .*) + (.*) cf_want_posix_source=yes ;; esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 7846 "configure" +#line 8258 "configure" #include "confdefs.h" #include int @@ -7858,16 +8270,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7861: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8273: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7864: \$? = $ac_status" >&5 + echo "$as_me:8276: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7867: \"$ac_try\"") >&5 + { (eval echo "$as_me:8279: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7870: \$? = $ac_status" >&5 + echo "$as_me:8282: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7878,15 +8290,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:7881: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:8293: 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}:7886: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:8298: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 7889 "configure" +#line 8301 "configure" #include "confdefs.h" #include int @@ -7901,16 +8313,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7904: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8316: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7907: \$? = $ac_status" >&5 + echo "$as_me:8319: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7910: \"$ac_try\"") >&5 + { (eval echo "$as_me:8322: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7913: \$? = $ac_status" >&5 + echo "$as_me:8325: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7926,7 +8338,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7929: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:8341: 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 @@ -7941,11 +8353,11 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_cv_posix_c_source do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -7953,20 +8365,26 @@ no) && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue fi ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -7975,17 +8393,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + ;; esac ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + ;; esac ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` @@ -7998,60 +8424,66 @@ done if test -n "$cf_new_cflags" ; then - CFLAGS="$CFLAGS $cf_new_cflags" + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + fi if test -n "$cf_new_cppflags" ; then - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + fi if test -n "$cf_new_extra_cppflags" ; then - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + fi fi ;; -netbsd*) #(vi +(netbsd*) cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ;; -openbsd[4-9]*) #(vi +(openbsd[4-9]*) # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw cf_xopen_source="-D_BSD_SOURCE" cf_XOPEN_SOURCE=600 ;; -openbsd*) #(vi +(openbsd*) # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw ;; -osf[45]*) #(vi +(osf[45]*) cf_xopen_source="-D_OSF_SOURCE" ;; -nto-qnx*) #(vi +(nto-qnx*) cf_xopen_source="-D_QNX_SOURCE" ;; -sco*) #(vi +(sco*) # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ;; -solaris2.*) #(vi +(solaris2.*) cf_xopen_source="-D__EXTENSIONS__" cf_cv_xopen_source=broken ;; -sysv4.2uw2.*) # Novell/SCO UnixWare 2.x (tested on 2.1.2) +(sysv4.2uw2.*) # Novell/SCO UnixWare 2.x (tested on 2.1.2) cf_XOPEN_SOURCE= cf_POSIX_C_SOURCE= ;; -*) +(*) -echo "$as_me:8047: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:8479: 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 8054 "configure" +#line 8486 "configure" #include "confdefs.h" #include @@ -8070,16 +8502,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8073: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8505: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8076: \$? = $ac_status" >&5 + echo "$as_me:8508: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8079: \"$ac_try\"") >&5 + { (eval echo "$as_me:8511: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8082: \$? = $ac_status" >&5 + echo "$as_me:8514: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8088,7 +8520,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 8091 "configure" +#line 8523 "configure" #include "confdefs.h" #include @@ -8107,16 +8539,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8110: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8542: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8113: \$? = $ac_status" >&5 + echo "$as_me:8545: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8116: \"$ac_try\"") >&5 + { (eval echo "$as_me:8548: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8119: \$? = $ac_status" >&5 + echo "$as_me:8551: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8131,7 +8563,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8134: result: $cf_cv_xopen_source" >&5 +echo "$as_me:8566: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -8154,11 +8586,11 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_temp_xopen_source do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -8166,20 +8598,26 @@ no) && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue fi ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -8188,17 +8626,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + ;; esac ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + ;; esac ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` @@ -8211,17 +8657,23 @@ done if test -n "$cf_new_cflags" ; then - CFLAGS="$CFLAGS $cf_new_cflags" + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + fi if test -n "$cf_new_cppflags" ; then - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + fi if test -n "$cf_new_extra_cppflags" ; then - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + fi fi @@ -8239,16 +8691,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:8242: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:8694: 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}:8248: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:8700: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 8251 "configure" +#line 8703 "configure" #include "confdefs.h" #include int @@ -8263,37 +8715,37 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8266: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8718: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8269: \$? = $ac_status" >&5 + echo "$as_me:8721: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8272: \"$ac_try\"") >&5 + { (eval echo "$as_me:8724: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8275: \$? = $ac_status" >&5 + echo "$as_me:8727: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cf_want_posix_source=no - case .$cf_POSIX_C_SOURCE in #(vi - .[12]??*) #(vi + case .$cf_POSIX_C_SOURCE in + (.[12]??*) cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" ;; - .2) #(vi + (.2) cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" cf_want_posix_source=yes ;; - .*) + (.*) cf_want_posix_source=yes ;; esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 8296 "configure" +#line 8748 "configure" #include "confdefs.h" #include int @@ -8308,16 +8760,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8311: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8763: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8314: \$? = $ac_status" >&5 + echo "$as_me:8766: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8317: \"$ac_try\"") >&5 + { (eval echo "$as_me:8769: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8320: \$? = $ac_status" >&5 + echo "$as_me:8772: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8328,15 +8780,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:8331: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:8783: 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}:8336: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:8788: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 8339 "configure" +#line 8791 "configure" #include "confdefs.h" #include int @@ -8351,16 +8803,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8354: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8806: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8357: \$? = $ac_status" >&5 + echo "$as_me:8809: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8360: \"$ac_try\"") >&5 + { (eval echo "$as_me:8812: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8363: \$? = $ac_status" >&5 + echo "$as_me:8815: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8376,7 +8828,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8379: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:8831: 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 @@ -8391,11 +8843,11 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_cv_posix_c_source do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -8403,20 +8855,26 @@ no) && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue fi ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -8425,17 +8883,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + ;; esac ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + ;; esac ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` @@ -8448,17 +8914,23 @@ done if test -n "$cf_new_cflags" ; then - CFLAGS="$CFLAGS $cf_new_cflags" + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + fi if test -n "$cf_new_cppflags" ; then - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + fi if test -n "$cf_new_extra_cppflags" ; then - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + fi fi @@ -8476,11 +8948,11 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_xopen_source do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -8488,20 +8960,26 @@ no) && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue fi ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -8510,17 +8988,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + ;; esac ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + ;; esac ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` @@ -8534,34 +9020,40 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:8537: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:9023: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" - CFLAGS="$CFLAGS $cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:8545: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:9033: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:8553: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:9043: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:8561: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:9053: 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 8564 "configure" +#line 9056 "configure" #include "confdefs.h" #include int @@ -8576,16 +9068,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8579: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9071: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8582: \$? = $ac_status" >&5 + echo "$as_me:9074: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8585: \"$ac_try\"") >&5 + { (eval echo "$as_me:9077: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8588: \$? = $ac_status" >&5 + echo "$as_me:9080: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -8594,12 +9086,12 @@ cat conftest.$ac_ext >&5 cf_XOPEN_SOURCE_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:8597: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:9089: 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 8602 "configure" +#line 9094 "configure" #include "confdefs.h" #include int @@ -8614,16 +9106,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8617: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9109: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8620: \$? = $ac_status" >&5 + echo "$as_me:9112: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8623: \"$ac_try\"") >&5 + { (eval echo "$as_me:9115: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8626: \$? = $ac_status" >&5 + echo "$as_me:9118: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -8634,19 +9126,19 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext if test $cf_XOPEN_SOURCE_set_ok = no then - { echo "$as_me:8637: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:9129: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:8642: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:9134: 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 8649 "configure" +#line 9141 "configure" #include "confdefs.h" #include @@ -8665,16 +9157,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8668: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9160: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8671: \$? = $ac_status" >&5 + echo "$as_me:9163: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8674: \"$ac_try\"") >&5 + { (eval echo "$as_me:9166: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8677: \$? = $ac_status" >&5 + echo "$as_me:9169: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8683,7 +9175,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 8686 "configure" +#line 9178 "configure" #include "confdefs.h" #include @@ -8702,16 +9194,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8705: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9197: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8708: \$? = $ac_status" >&5 + echo "$as_me:9200: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8711: \"$ac_try\"") >&5 + { (eval echo "$as_me:9203: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8714: \$? = $ac_status" >&5 + echo "$as_me:9206: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8726,7 +9218,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8729: result: $cf_cv_xopen_source" >&5 +echo "$as_me:9221: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -8749,11 +9241,11 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_temp_xopen_source do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -8761,20 +9253,26 @@ no) && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue fi ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -8783,17 +9281,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + ;; esac ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + ;; esac ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` @@ -8806,17 +9312,23 @@ done if test -n "$cf_new_cflags" ; then - CFLAGS="$CFLAGS $cf_new_cflags" + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + fi if test -n "$cf_new_cppflags" ; then - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + fi if test -n "$cf_new_extra_cppflags" ; then - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + fi fi @@ -8824,16 +9336,18 @@ fi fi fi +CPPFLAGS_after_XOPEN="$CPPFLAGS" + # Work around breakage on OS X -echo "$as_me:8829: checking if SIGWINCH is defined" >&5 +echo "$as_me:9343: 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 8836 "configure" +#line 9350 "configure" #include "confdefs.h" #include @@ -8848,23 +9362,23 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8851: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9365: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8854: \$? = $ac_status" >&5 + echo "$as_me:9368: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8857: \"$ac_try\"") >&5 + { (eval echo "$as_me:9371: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8860: \$? = $ac_status" >&5 + echo "$as_me:9374: \$? = $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 8867 "configure" +#line 9381 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -8882,16 +9396,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8885: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9399: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8888: \$? = $ac_status" >&5 + echo "$as_me:9402: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8891: \"$ac_try\"") >&5 + { (eval echo "$as_me:9405: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8894: \$? = $ac_status" >&5 + echo "$as_me:9408: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=maybe else @@ -8905,11 +9419,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8908: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:9422: 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:8912: checking for actual SIGWINCH definition" >&5 +echo "$as_me:9426: 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 @@ -8920,7 +9434,7 @@ cf_sigwinch=32 while test $cf_sigwinch != 1 do cat >conftest.$ac_ext <<_ACEOF -#line 8923 "configure" +#line 9437 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -8942,16 +9456,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8945: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9459: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8948: \$? = $ac_status" >&5 + echo "$as_me:9462: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8951: \"$ac_try\"") >&5 + { (eval echo "$as_me:9465: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8954: \$? = $ac_status" >&5 + echo "$as_me:9468: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -8965,7 +9479,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1` done fi -echo "$as_me:8968: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:9482: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -8975,13 +9489,13 @@ fi # Checks for CODESET support. - echo "$as_me:8978: checking for nl_langinfo and CODESET" >&5 +echo "$as_me:9492: 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 8984 "configure" +#line 9498 "configure" #include "confdefs.h" #include int @@ -8993,16 +9507,16 @@ char* cs = nl_langinfo(CODESET); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8996: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9510: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8999: \$? = $ac_status" >&5 + echo "$as_me:9513: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9002: \"$ac_try\"") >&5 + { (eval echo "$as_me:9516: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9005: \$? = $ac_status" >&5 + echo "$as_me:9519: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else @@ -9013,21 +9527,21 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9016: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:9530: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 - if test $am_cv_langinfo_codeset = yes; then + if test $am_cv_langinfo_codeset = yes; then cat >>confdefs.h <<\EOF #define HAVE_LANGINFO_CODESET 1 EOF - fi + fi # use these variables to work around a defect in gcc's fixincludes. NCURSES_OK_WCHAR_T= NCURSES_OK_WINT_T= -echo "$as_me:9030: checking if you want wide-character code" >&5 +echo "$as_me:9544: 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. @@ -9037,8 +9551,11 @@ if test "${enable_widec+set}" = set; then else with_widec=no fi; -echo "$as_me:9040: result: $with_widec" >&5 +echo "$as_me:9554: result: $with_widec" >&5 echo "${ECHO_T}$with_widec" >&6 + +NCURSES_WCWIDTH_GRAPHICS=1 + if test "x$with_widec" = xyes ; then if test "x$disable_lib_suffixes" = xno ; then LIB_SUFFIX="w${LIB_SUFFIX}" @@ -9052,18 +9569,74 @@ cat >>confdefs.h <<\EOF #define NCURSES_WIDECHAR 1 EOF -echo "$as_me:9055: checking if wchar.h can be used as is" >&5 +for ac_header in \ +wchar.h \ +wctype.h \ + +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:9578: 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 9584 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:9588: \"$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:9594: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:9613: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 echo $ECHO_N "checking 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 9062 "configure" +#line 9630 "configure" #include "confdefs.h" #include +#ifdef HAVE_WCHAR_H #include +#endif +#ifdef HAVE_WCTYPE_H +#include +#endif int main () @@ -9076,16 +9649,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9079: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9652: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9082: \$? = $ac_status" >&5 + echo "$as_me:9655: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9085: \"$ac_try\"") >&5 + { (eval echo "$as_me:9658: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9088: \$? = $ac_status" >&5 + echo "$as_me:9661: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_h_okay=yes else @@ -9095,16 +9668,16 @@ cf_cv_wchar_h_okay=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9098: result: $cf_cv_wchar_h_okay" >&5 +echo "$as_me:9671: 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:9104: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "$as_me:9677: 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 9107 "configure" +#line 9680 "configure" #include "confdefs.h" #include @@ -9120,16 +9693,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9123: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9696: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9126: \$? = $ac_status" >&5 + echo "$as_me:9699: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9129: \"$ac_try\"") >&5 + { (eval echo "$as_me:9702: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9132: \$? = $ac_status" >&5 + echo "$as_me:9705: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=no else @@ -9138,16 +9711,16 @@ cat conftest.$ac_ext >&5 cf_result=yes fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:9141: result: $cf_result" >&5 +echo "$as_me:9714: 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:9147: checking checking for compatible value versus " >&5 + echo "$as_me:9720: 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 9150 "configure" +#line 9723 "configure" #include "confdefs.h" #include @@ -9163,16 +9736,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9166: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9739: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9169: \$? = $ac_status" >&5 + echo "$as_me:9742: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9172: \"$ac_try\"") >&5 + { (eval echo "$as_me:9745: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9175: \$? = $ac_status" >&5 + echo "$as_me:9748: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -9181,7 +9754,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:9184: result: $cf_result" >&5 + echo "$as_me:9757: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then # perhaps we can override it - try... @@ -9191,59 +9764,200 @@ fi fi - # with_overwrite=no - NCURSES_CH_T=cchar_t - -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:9200: 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 "$as_me:9767: checking if wcwidth agrees graphics are single-width" >&5 +echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6 +if test "${cf_cv_wcwidth_graphics+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + +cat >conftest.in <conftest.$ac_ext <<_ACEOF -#line 9206 "configure" +#line 9838 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -char (*f) (); + +#include +#include +#include + +#define MY_LEN 80 int -main () +main(void) { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; -#endif - - ; + FILE *fp; + int value; + char buffer[MY_LEN + 1]; + char notes[MY_LEN + 1]; + int totals = 0; + int passed = 0; + + if (setlocale(LC_ALL, "en_US.UTF8") || + setlocale(LC_ALL, "en_US.UTF-8") || + setlocale(LC_ALL, "en_US.utf8") || + setlocale(LC_ALL, "en_US.utf-8")) { + if ((fp = fopen("conftest.in", "r")) != 0) { + while (fgets(buffer, MY_LEN, fp) != 0) { + if (*buffer == '-') { + fprintf(stderr, "\t%s", buffer); + } else if (sscanf(buffer, "%x %s", &value, notes) == 2) { + ++totals; + if (wcwidth(value) == 1) + ++passed; + fprintf(stderr, "%d\t%s", wcwidth(value), buffer); + } else { + fprintf(stderr, "?\t%s", buffer); + } + } + } + } + fprintf(stderr, "%d/%d passed wcwidth/graphics check\n", passed, totals); + return (totals == passed) ? 0 : 1; +} + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:9882: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9885: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:9887: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9890: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wcwidth_graphics=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_wcwidth_graphics=no +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + +fi +echo "$as_me:9903: result: $cf_cv_wcwidth_graphics" >&5 +echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6 + + test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0 + + # with_overwrite=no + NCURSES_CH_T=cchar_t + +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:9914: 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 9920 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +#include +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); + +int +main () +{ +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#endif + + ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9237: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9951: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9240: \$? = $ac_status" >&5 + echo "$as_me:9954: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9243: \"$ac_try\"") >&5 + { (eval echo "$as_me:9957: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9246: \$? = $ac_status" >&5 + echo "$as_me:9960: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -9253,7 +9967,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9256: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:9970: 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:9982: 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 @@ -9273,7 +9987,7 @@ else cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9276 "configure" +#line 9990 "configure" #include "confdefs.h" #include @@ -9286,16 +10000,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9289: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10003: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9292: \$? = $ac_status" >&5 + echo "$as_me:10006: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9295: \"$ac_try\"") >&5 + { (eval echo "$as_me:10009: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9298: \$? = $ac_status" >&5 + echo "$as_me:10012: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_utf8_lib=yes else @@ -9307,12 +10021,12 @@ cat conftest.$ac_ext >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:9310: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:10024: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9315 "configure" +#line 10029 "configure" #include "confdefs.h" #include @@ -9325,16 +10039,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9328: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10042: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9331: \$? = $ac_status" >&5 + echo "$as_me:10045: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9334: \"$ac_try\"") >&5 + { (eval echo "$as_me:10048: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9337: \$? = $ac_status" >&5 + echo "$as_me:10051: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -9348,7 +10062,7 @@ cat conftest.$ac_ext >&5 LIBS="-lutf8 $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9351 "configure" +#line 10065 "configure" #include "confdefs.h" #include @@ -9361,16 +10075,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9364: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10078: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9367: \$? = $ac_status" >&5 + echo "$as_me:10081: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9370: \"$ac_try\"") >&5 + { (eval echo "$as_me:10084: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9373: \$? = $ac_status" >&5 + echo "$as_me:10087: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -9385,14 +10099,14 @@ cat conftest.$ac_ext >&5 cf_cv_find_linkage_utf8=no LIBS="$cf_save_LIBS" - test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:9390: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:10104: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:9392: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:10106: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 - cf_save_CPPFLAGS="$CPPFLAGS" - cf_test_CPPFLAGS="$CPPFLAGS" + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" cf_search= @@ -9401,8 +10115,8 @@ cf_header_path_list="" if test -n "${CFLAGS}${CPPFLAGS}" ; then for cf_header_path in $CPPFLAGS $CFLAGS do - case $cf_header_path in #(vi - -I*) + case $cf_header_path in + (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` test "x$cf_header_path" != "xNONE" && \ @@ -9475,16 +10189,16 @@ test -d "$oldincludedir" && { cf_search="$cf_search $cf_header_path_list" - for cf_cv_header_path_utf8 in $cf_search - do - if test -d $cf_cv_header_path_utf8 ; then - test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 + for cf_cv_header_path_utf8 in $cf_search + do + 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}:9483: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:10197: 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 9487 "configure" + CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" + cat >conftest.$ac_ext <<_ACEOF +#line 10201 "configure" #include "confdefs.h" #include @@ -9497,52 +10211,52 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9500: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10214: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9503: \$? = $ac_status" >&5 + echo "$as_me:10217: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9506: \"$ac_try\"") >&5 + { (eval echo "$as_me:10220: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9509: \$? = $ac_status" >&5 + echo "$as_me:10223: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 + test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:9514: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:10228: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 - cf_cv_find_linkage_utf8=maybe - cf_test_CPPFLAGS="$CPPFLAGS" - break + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" + break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - CPPFLAGS="$cf_save_CPPFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" fi rm -f conftest.$ac_objext conftest.$ac_ext - fi - done + fi + done - if test "$cf_cv_find_linkage_utf8" = maybe ; then + if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:9532: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:10246: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 - cf_save_LIBS="$LIBS" - cf_save_LDFLAGS="$LDFLAGS" + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" - if test "$cf_cv_find_linkage_utf8" != yes ; then + if test "$cf_cv_find_linkage_utf8" != yes ; then cf_search= cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS do - case $cf_library_path in #(vi - -L*) + case $cf_library_path in + (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` test "x$cf_library_path" != "xNONE" && \ @@ -9599,18 +10313,18 @@ done cf_search="$cf_library_path_list $cf_search" - for cf_cv_library_path_utf8 in $cf_search - do - if test -d $cf_cv_library_path_utf8 ; then - test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 + for cf_cv_library_path_utf8 in $cf_search + do + 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}:9607: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:10321: 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 9613 "configure" + 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 10327 "configure" #include "confdefs.h" #include @@ -9623,44 +10337,44 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9626: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10340: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9629: \$? = $ac_status" >&5 + echo "$as_me:10343: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9632: \"$ac_try\"") >&5 + { (eval echo "$as_me:10346: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9635: \$? = $ac_status" >&5 + echo "$as_me:10349: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 + test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:9640: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:10354: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 - cf_cv_find_linkage_utf8=yes - cf_cv_library_file_utf8="-lutf8" - break + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" + break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - LDFLAGS="$cf_save_LDFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi - done - CPPFLAGS="$cf_save_CPPFLAGS" - LDFLAGS="$cf_save_LDFLAGS" - fi + fi + done + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi - else - cf_cv_find_linkage_utf8=no - fi + else + cf_cv_find_linkage_utf8=no + fi fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -9679,7 +10393,7 @@ fi fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9682: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:10396: 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 @@ -9714,7 +10428,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 9717 "configure" +#line 10431 "configure" #include "confdefs.h" #include int @@ -9726,16 +10440,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9729: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10443: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9732: \$? = $ac_status" >&5 + echo "$as_me:10446: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9735: \"$ac_try\"") >&5 + { (eval echo "$as_me:10449: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9738: \$? = $ac_status" >&5 + echo "$as_me:10452: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9752,7 +10466,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}:9755: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10469: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9762,36 +10476,38 @@ echo "${as_me:-configure}:9755: testing adding $cf_add_incdir to include-path .. else break fi + else + break fi done done fi if test -n "$cf_cv_library_path_utf8" ; then - for cf_add_libdir in $cf_cv_library_path_utf8 - do - if test $cf_add_libdir = /usr/lib ; then - : - 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 + for cf_add_libdir in $cf_cv_library_path_utf8 + 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}:9789: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:10505: testing adding $cf_add_libdir to library-path ..." 1>&5 - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi cf_add_libs="$cf_cv_library_file_utf8" @@ -9818,14 +10534,14 @@ fi fi # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:9821: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:10537: 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 9828 "configure" +#line 10544 "configure" #include "confdefs.h" #include @@ -9843,23 +10559,23 @@ mbstate_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9846: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10562: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9849: \$? = $ac_status" >&5 + echo "$as_me:10565: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9852: \"$ac_try\"") >&5 + { (eval echo "$as_me:10568: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9855: \$? = $ac_status" >&5 + echo "$as_me:10571: \$? = $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 9862 "configure" +#line 10578 "configure" #include "confdefs.h" #include @@ -9878,16 +10594,16 @@ mbstate_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9881: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10597: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9884: \$? = $ac_status" >&5 + echo "$as_me:10600: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9887: \"$ac_try\"") >&5 + { (eval echo "$as_me:10603: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9890: \$? = $ac_status" >&5 + echo "$as_me:10606: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=yes else @@ -9899,7 +10615,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9902: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:10618: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -9917,14 +10633,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:9920: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:10636: 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 9927 "configure" +#line 10643 "configure" #include "confdefs.h" #include @@ -9942,23 +10658,23 @@ wchar_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9945: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10661: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9948: \$? = $ac_status" >&5 + echo "$as_me:10664: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9951: \"$ac_try\"") >&5 + { (eval echo "$as_me:10667: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9954: \$? = $ac_status" >&5 + echo "$as_me:10670: \$? = $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 9961 "configure" +#line 10677 "configure" #include "confdefs.h" #include @@ -9977,16 +10693,16 @@ wchar_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9980: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10696: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9983: \$? = $ac_status" >&5 + echo "$as_me:10699: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9986: \"$ac_try\"") >&5 + { (eval echo "$as_me:10702: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9989: \$? = $ac_status" >&5 + echo "$as_me:10705: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_t=yes else @@ -9998,7 +10714,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10001: result: $cf_cv_wchar_t" >&5 +echo "$as_me:10717: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -10021,14 +10737,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:10024: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:10740: 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 10031 "configure" +#line 10747 "configure" #include "confdefs.h" #include @@ -10046,23 +10762,23 @@ wint_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10049: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10765: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10052: \$? = $ac_status" >&5 + echo "$as_me:10768: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10055: \"$ac_try\"") >&5 + { (eval echo "$as_me:10771: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10058: \$? = $ac_status" >&5 + echo "$as_me:10774: \$? = $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 10065 "configure" +#line 10781 "configure" #include "confdefs.h" #include @@ -10081,16 +10797,16 @@ wint_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10084: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10800: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10087: \$? = $ac_status" >&5 + echo "$as_me:10803: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10090: \"$ac_try\"") >&5 + { (eval echo "$as_me:10806: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10093: \$? = $ac_status" >&5 + echo "$as_me:10809: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wint_t=yes else @@ -10102,7 +10818,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10105: result: $cf_cv_wint_t" >&5 +echo "$as_me:10821: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -10134,16 +10850,7 @@ EOF fi ### use option --disable-lp64 to allow long chtype -case $cf_cv_abi_version in -[345]*) - default_with_lp64=no - ;; -*) - default_with_lp64=yes - ;; -esac - -echo "$as_me:10146: checking whether to enable _LP64 definition in curses.h" >&5 +echo "$as_me:10853: 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. @@ -10151,9 +10858,9 @@ if test "${enable_lp64+set}" = set; then enableval="$enable_lp64" with_lp64=$enableval else - with_lp64=$default_with_lp64 + with_lp64=$cf_dft_with_lp64 fi; -echo "$as_me:10156: result: $with_lp64" >&5 +echo "$as_me:10863: result: $with_lp64" >&5 echo "${ECHO_T}$with_lp64" >&6 if test "x$with_lp64" = xyes ; then @@ -10169,7 +10876,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:10172: checking for special C compiler options needed for large files" >&5 + echo "$as_me:10879: 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 @@ -10181,7 +10888,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 10184 "configure" +#line 10891 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -10201,16 +10908,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10204: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10911: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10207: \$? = $ac_status" >&5 + echo "$as_me:10914: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10210: \"$ac_try\"") >&5 + { (eval echo "$as_me:10917: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10213: \$? = $ac_status" >&5 + echo "$as_me:10920: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -10220,16 +10927,16 @@ fi rm -f conftest.$ac_objext CC="$CC -n32" rm -f conftest.$ac_objext -if { (eval echo "$as_me:10223: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10930: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10226: \$? = $ac_status" >&5 + echo "$as_me:10933: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10229: \"$ac_try\"") >&5 + { (eval echo "$as_me:10936: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10232: \$? = $ac_status" >&5 + echo "$as_me:10939: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -10243,13 +10950,13 @@ rm -f conftest.$ac_objext rm -f conftest.$ac_ext fi fi -echo "$as_me:10246: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:10953: 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:10252: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:10959: 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 @@ -10257,7 +10964,7 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF -#line 10260 "configure" +#line 10967 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -10277,16 +10984,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10280: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10987: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10283: \$? = $ac_status" >&5 + echo "$as_me:10990: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10286: \"$ac_try\"") >&5 + { (eval echo "$as_me:10993: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10289: \$? = $ac_status" >&5 + echo "$as_me:10996: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -10295,7 +11002,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 10298 "configure" +#line 11005 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -10316,16 +11023,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10319: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11026: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10322: \$? = $ac_status" >&5 + echo "$as_me:11029: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10325: \"$ac_try\"") >&5 + { (eval echo "$as_me:11032: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10328: \$? = $ac_status" >&5 + echo "$as_me:11035: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -10336,7 +11043,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:10339: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:11046: 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 @@ -10346,7 +11053,7 @@ EOF fi rm -rf conftest* - echo "$as_me:10349: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:11056: 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 @@ -10354,7 +11061,7 @@ else while :; do ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF -#line 10357 "configure" +#line 11064 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -10374,16 +11081,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10377: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11084: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10380: \$? = $ac_status" >&5 + echo "$as_me:11087: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10383: \"$ac_try\"") >&5 + { (eval echo "$as_me:11090: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10386: \$? = $ac_status" >&5 + echo "$as_me:11093: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -10392,7 +11099,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 10395 "configure" +#line 11102 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -10413,16 +11120,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10416: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11123: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10419: \$? = $ac_status" >&5 + echo "$as_me:11126: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10422: \"$ac_try\"") >&5 + { (eval echo "$as_me:11129: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10425: \$? = $ac_status" >&5 + echo "$as_me:11132: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_large_files=1; break else @@ -10433,7 +11140,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:10436: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:11143: 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 @@ -10445,8 +11152,8 @@ fi rm -rf conftest* fi - if test "$enable_largefile" != no ; then - echo "$as_me:10449: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + if test "$enable_largefile" != no ; then + echo "$as_me:11156: 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 @@ -10454,7 +11161,7 @@ else while :; do ac_cv_sys_largefile_source=no cat >conftest.$ac_ext <<_ACEOF -#line 10457 "configure" +#line 11164 "configure" #include "confdefs.h" #include int @@ -10466,16 +11173,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10469: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11176: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10472: \$? = $ac_status" >&5 + echo "$as_me:11179: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10475: \"$ac_try\"") >&5 + { (eval echo "$as_me:11182: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10478: \$? = $ac_status" >&5 + echo "$as_me:11185: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -10484,7 +11191,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 10487 "configure" +#line 11194 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include @@ -10497,16 +11204,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10500: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11207: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10503: \$? = $ac_status" >&5 + echo "$as_me:11210: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10506: \"$ac_try\"") >&5 + { (eval echo "$as_me:11213: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10509: \$? = $ac_status" >&5 + echo "$as_me:11216: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_source=1; break else @@ -10517,7 +11224,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:10520: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:11227: 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 @@ -10531,13 +11238,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:10534: checking for fseeko" >&5 +echo "$as_me:11241: 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 10540 "configure" +#line 11247 "configure" #include "confdefs.h" #include int @@ -10549,16 +11256,16 @@ return fseeko && fseeko (stdin, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10552: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11259: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10555: \$? = $ac_status" >&5 + echo "$as_me:11262: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10558: \"$ac_try\"") >&5 + { (eval echo "$as_me:11265: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10561: \$? = $ac_status" >&5 + echo "$as_me:11268: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fseeko=yes else @@ -10568,7 +11275,7 @@ ac_cv_func_fseeko=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10571: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:11278: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -10589,16 +11296,17 @@ 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:10592: checking whether to use struct dirent64" >&5 + echo "$as_me:11299: 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 10599 "configure" +#line 11306 "configure" #include "confdefs.h" +#pragma GCC diagnostic error "-Wincompatible-pointer-types" #include #include @@ -10617,16 +11325,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10620: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11328: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10623: \$? = $ac_status" >&5 + echo "$as_me:11331: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10626: \"$ac_try\"") >&5 + { (eval echo "$as_me:11334: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10629: \$? = $ac_status" >&5 + echo "$as_me:11337: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_struct_dirent64=yes else @@ -10637,17 +11345,17 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10640: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:11348: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF #define HAVE_STRUCT_DIRENT64 1 EOF - fi + fi ### use option --disable-tparm-varargs to make tparm() conform to X/Open -echo "$as_me:10650: checking if you want tparm not to use X/Open fixed-parameter list" >&5 +echo "$as_me:11358: 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. @@ -10657,14 +11365,14 @@ if test "${enable_tparm_varargs+set}" = set; then else with_tparm_varargs=yes fi; -echo "$as_me:10660: result: $with_tparm_varargs" >&5 +echo "$as_me:11368: result: $with_tparm_varargs" >&5 echo "${ECHO_T}$with_tparm_varargs" >&6 NCURSES_TPARM_VARARGS=0 test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1 ### use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw if test "$with_ticlib" != no ; then -echo "$as_me:10667: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 +echo "$as_me:11375: 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. @@ -10674,14 +11382,35 @@ if test "${enable_tic_depends+set}" = set; then else with_tic_depends=yes fi; -echo "$as_me:10677: result: $with_tic_depends" >&5 +echo "$as_me:11385: result: $with_tic_depends" >&5 echo "${ECHO_T}$with_tic_depends" >&6 else with_tic_depends=no fi +### use option --disable-wattr-macros to suppress wattr* macros from curses.h +echo "$as_me:11392: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5 +echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6 + +# Check whether --enable-wattr-macros or --disable-wattr-macros was given. +if test "${enable_wattr_macros+set}" = set; then + enableval="$enable_wattr_macros" + with_wattr_macros=$enableval +else + with_wattr_macros=yes +fi; +if [ "x$with_wattr_macros" != xyes ]; then + NCURSES_WATTR_MACROS=0 + echo "$as_me:11404: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + NCURSES_WATTR_MACROS=1 + echo "$as_me:11408: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ### use option --with-bool to override bool's type -echo "$as_me:10684: checking for type of bool" >&5 +echo "$as_me:11413: 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. @@ -10691,10 +11420,10 @@ if test "${with_bool+set}" = set; then else NCURSES_BOOL=auto fi; -echo "$as_me:10694: result: $NCURSES_BOOL" >&5 +echo "$as_me:11423: result: $NCURSES_BOOL" >&5 echo "${ECHO_T}$NCURSES_BOOL" >&6 -echo "$as_me:10697: checking for alternate terminal capabilities file" >&5 +echo "$as_me:11426: 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. @@ -10705,11 +11434,11 @@ else TERMINFO_CAPS=Caps fi; test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps -echo "$as_me:10708: result: $TERMINFO_CAPS" >&5 +echo "$as_me:11437: result: $TERMINFO_CAPS" >&5 echo "${ECHO_T}$TERMINFO_CAPS" >&6 ### use option --with-chtype to override chtype's type -echo "$as_me:10712: checking for type of chtype" >&5 +echo "$as_me:11441: 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. @@ -10717,13 +11446,13 @@ if test "${with_chtype+set}" = set; then withval="$with_chtype" NCURSES_CHTYPE="$withval" else - NCURSES_CHTYPE=auto + NCURSES_CHTYPE=$cf_dft_chtype fi; -echo "$as_me:10722: result: $NCURSES_CHTYPE" >&5 +echo "$as_me:11451: result: $NCURSES_CHTYPE" >&5 echo "${ECHO_T}$NCURSES_CHTYPE" >&6 ### use option --with-ospeed to override ospeed's type -echo "$as_me:10726: checking for type of ospeed" >&5 +echo "$as_me:11455: 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. @@ -10733,11 +11462,11 @@ if test "${with_ospeed+set}" = set; then else NCURSES_OSPEED=short fi; -echo "$as_me:10736: result: $NCURSES_OSPEED" >&5 +echo "$as_me:11465: result: $NCURSES_OSPEED" >&5 echo "${ECHO_T}$NCURSES_OSPEED" >&6 ### use option --with-mmask-t to override mmask_t's type -echo "$as_me:10740: checking for type of mmask_t" >&5 +echo "$as_me:11469: 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. @@ -10745,13 +11474,13 @@ if test "${with_mmask_t+set}" = set; then withval="$with_mmask_t" NCURSES_MMASK_T="$withval" else - NCURSES_MMASK_T=auto + NCURSES_MMASK_T=$cf_dft_mmask_t fi; -echo "$as_me:10750: result: $NCURSES_MMASK_T" >&5 +echo "$as_me:11479: 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:10754: checking for size CCHARW_MAX" >&5 +echo "$as_me:11483: 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. @@ -10761,11 +11490,11 @@ if test "${with_ccharw_max+set}" = set; then else NCURSES_CCHARW_MAX=5 fi; -echo "$as_me:10764: result: $NCURSES_CCHARW_MAX" >&5 +echo "$as_me:11493: 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:10768: checking for type of tparm args" >&5 +echo "$as_me:11497: 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. @@ -10773,13 +11502,13 @@ if test "${with_tparm_arg+set}" = set; then withval="$with_tparm_arg" NCURSES_TPARM_ARG="$withval" else - NCURSES_TPARM_ARG=long + NCURSES_TPARM_ARG=$cf_dft_tparm_arg fi; -echo "$as_me:10778: result: $NCURSES_TPARM_ARG" >&5 +echo "$as_me:11507: result: $NCURSES_TPARM_ARG" >&5 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6 ### Enable compiling-in rcs id's -echo "$as_me:10782: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:11511: 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. @@ -10789,7 +11518,7 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:10792: result: $with_rcs_ids" >&5 +echo "$as_me:11521: result: $with_rcs_ids" >&5 echo "${ECHO_T}$with_rcs_ids" >&6 test "x$with_rcs_ids" = xyes && cat >>confdefs.h <<\EOF @@ -10798,7 +11527,7 @@ EOF ############################################################################### -echo "$as_me:10801: checking format of man-pages" >&5 +echo "$as_me:11530: 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. @@ -10815,86 +11544,86 @@ MANPAGE_FORMAT=`echo "$MANPAGE_FORMAT" | sed -e 's/,/ /g'` cf_unknown= case $MANPAGE_FORMAT in -unknown) - if test -z "$MANPATH" ; then - MANPATH="/usr/man:/usr/share/man" - fi +(unknown) + if test -z "$MANPATH" ; then + MANPATH="/usr/man:/usr/share/man" + fi - # look for the 'date' man-page (it's most likely to be installed!) - MANPAGE_FORMAT= - cf_preform=no - cf_catonly=yes - cf_example=date + # look for the 'date' man-page (it's most likely to be installed!) + MANPAGE_FORMAT= + cf_preform=no + cf_catonly=yes + cf_example=date - IFS="${IFS:- }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" - for cf_dir in $MANPATH; do - test -z "$cf_dir" && cf_dir=/usr/man - for cf_name in $cf_dir/man*/$cf_example.[01]* $cf_dir/cat*/$cf_example.[01]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example - do - cf_test=`echo $cf_name | sed -e 's/*//'` - if test "x$cf_test" = "x$cf_name" ; then - - case "$cf_name" in - *.gz) MANPAGE_FORMAT="$MANPAGE_FORMAT gzip";; - *.Z) MANPAGE_FORMAT="$MANPAGE_FORMAT compress";; - *.0) MANPAGE_FORMAT="$MANPAGE_FORMAT BSDI";; - *) MANPAGE_FORMAT="$MANPAGE_FORMAT normal";; - esac + IFS="${IFS:- }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + for cf_dir in $MANPATH; do + test -z "$cf_dir" && cf_dir=/usr/man + for cf_name in $cf_dir/man*/$cf_example.[01]* $cf_dir/cat*/$cf_example.[01]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example + do + cf_test=`echo $cf_name | sed -e 's/*//'` + if test "x$cf_test" = "x$cf_name" ; then + + case "$cf_name" in + (*.gz) MANPAGE_FORMAT="$MANPAGE_FORMAT gzip";; + (*.Z) MANPAGE_FORMAT="$MANPAGE_FORMAT compress";; + (*.0) MANPAGE_FORMAT="$MANPAGE_FORMAT BSDI";; + (*) MANPAGE_FORMAT="$MANPAGE_FORMAT normal";; + esac - case "$cf_name" in - $cf_dir/man*) - cf_catonly=no - ;; - $cf_dir/cat*) - cf_preform=yes - ;; - esac - break - fi + case "$cf_name" in + ($cf_dir/man*) + cf_catonly=no + ;; + ($cf_dir/cat*) + cf_preform=yes + ;; + esac + break + fi - # if we found a match in either man* or cat*, stop looking - if test -n "$MANPAGE_FORMAT" ; then - cf_found=no - test "$cf_preform" = yes && MANPAGE_FORMAT="$MANPAGE_FORMAT formatted" - test "$cf_catonly" = yes && MANPAGE_FORMAT="$MANPAGE_FORMAT catonly" - case "$cf_name" in - $cf_dir/cat*) - cf_found=yes - ;; + # if we found a match in either man* or cat*, stop looking + if test -n "$MANPAGE_FORMAT" ; then + cf_found=no + test "$cf_preform" = yes && MANPAGE_FORMAT="$MANPAGE_FORMAT formatted" + test "$cf_catonly" = yes && MANPAGE_FORMAT="$MANPAGE_FORMAT catonly" + case "$cf_name" in + ($cf_dir/cat*) + cf_found=yes + ;; + esac + test $cf_found=yes && break + fi + done + # only check the first directory in $MANPATH where we find manpages + if test -n "$MANPAGE_FORMAT" ; then + break + fi + done + # if we did not find the example, just assume it is normal + test -z "$MANPAGE_FORMAT" && MANPAGE_FORMAT=normal + IFS="$ac_save_ifs" + ;; +(*) + for cf_option in $MANPAGE_FORMAT; do + case $cf_option in + (gzip|compress|BSDI|normal|formatted|catonly) + ;; + (*) + cf_unknown="$cf_unknown $cf_option" + ;; esac - test $cf_found=yes && break - fi - done - # only check the first directory in $MANPATH where we find manpages - if test -n "$MANPAGE_FORMAT" ; then - break - fi - done - # if we did not find the example, just assume it is normal - test -z "$MANPAGE_FORMAT" && MANPAGE_FORMAT=normal - IFS="$ac_save_ifs" - ;; -*) - for cf_option in $MANPAGE_FORMAT; do - case $cf_option in #(vi - gzip|compress|BSDI|normal|formatted|catonly) - ;; - *) - cf_unknown="$cf_unknown $cf_option" - ;; - esac - done - ;; + done + ;; esac -echo "$as_me:10890: result: $MANPAGE_FORMAT" >&5 +echo "$as_me:11619: result: $MANPAGE_FORMAT" >&5 echo "${ECHO_T}$MANPAGE_FORMAT" >&6 if test -n "$cf_unknown" ; then - { echo "$as_me:10893: WARNING: Unexpected manpage-format $cf_unknown" >&5 + { echo "$as_me:11622: WARNING: Unexpected manpage-format $cf_unknown" >&5 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} fi -echo "$as_me:10897: checking for manpage renaming" >&5 +echo "$as_me:11626: 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. @@ -10905,41 +11634,41 @@ else MANPAGE_RENAMES=yes fi; -case ".$MANPAGE_RENAMES" in #(vi -.no) #(vi - ;; -.|.yes) - # Debian 'man' program? - if test -f /etc/debian_version ; then - MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames - else - MANPAGE_RENAMES=no - fi - ;; +case ".$MANPAGE_RENAMES" in +(.no) + ;; +(.|.yes) + # Debian 'man' program? + if test -f /etc/debian_version ; then + MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames + else + MANPAGE_RENAMES=no + fi + ;; esac if test "$MANPAGE_RENAMES" != no ; then - if test -f $srcdir/man/$MANPAGE_RENAMES ; then - MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES - elif test ! -f $MANPAGE_RENAMES ; then - { { echo "$as_me:10925: error: not a filename: $MANPAGE_RENAMES" >&5 + if test -f $srcdir/man/$MANPAGE_RENAMES ; then + MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES + elif test ! -f $MANPAGE_RENAMES ; then + { { echo "$as_me:11654: error: not a filename: $MANPAGE_RENAMES" >&5 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} { (exit 1); exit 1; }; } - fi + fi - test ! -d man && mkdir man + test ! -d man && mkdir man - # Construct a sed-script to perform renaming within man-pages - if test -n "$MANPAGE_RENAMES" ; then - test ! -d man && mkdir man - sh $srcdir/man/make_sed.sh $MANPAGE_RENAMES >./edit_man.sed - fi + # Construct a sed-script to perform renaming within man-pages + if test -n "$MANPAGE_RENAMES" ; then + test ! -d man && mkdir man + $SHELL $srcdir/man/make_sed.sh $MANPAGE_RENAMES >./edit_man.sed + fi fi -echo "$as_me:10939: result: $MANPAGE_RENAMES" >&5 +echo "$as_me:11668: result: $MANPAGE_RENAMES" >&5 echo "${ECHO_T}$MANPAGE_RENAMES" >&6 -echo "$as_me:10942: checking if manpage aliases will be installed" >&5 +echo "$as_me:11671: 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. @@ -10950,21 +11679,21 @@ else MANPAGE_ALIASES=yes fi; -echo "$as_me:10953: result: $MANPAGE_ALIASES" >&5 +echo "$as_me:11682: result: $MANPAGE_ALIASES" >&5 echo "${ECHO_T}$MANPAGE_ALIASES" >&6 -case "x$LN_S" in #(vi -xln*) #(vi +case "x$LN_S" in +(xln*) cf_use_symlinks=yes ;; -*) +(*) cf_use_symlinks=no ;; esac MANPAGE_SYMLINKS=no if test "$MANPAGE_ALIASES" = yes ; then -echo "$as_me:10967: checking if manpage symlinks should be used" >&5 +echo "$as_me:11696: 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. @@ -10977,17 +11706,17 @@ fi; if test "$$cf_use_symlinks" = no; then if test "$MANPAGE_SYMLINKS" = yes ; then - { echo "$as_me:10980: WARNING: cannot make symlinks" >&5 + { echo "$as_me:11709: WARNING: cannot make symlinks" >&5 echo "$as_me: WARNING: cannot make symlinks" >&2;} MANPAGE_SYMLINKS=no fi fi -echo "$as_me:10986: result: $MANPAGE_SYMLINKS" >&5 +echo "$as_me:11715: result: $MANPAGE_SYMLINKS" >&5 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 fi -echo "$as_me:10990: checking for manpage tbl" >&5 +echo "$as_me:11719: 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. @@ -10998,50 +11727,50 @@ else MANPAGE_TBL=no fi; -echo "$as_me:11001: result: $MANPAGE_TBL" >&5 +echo "$as_me:11730: result: $MANPAGE_TBL" >&5 echo "${ECHO_T}$MANPAGE_TBL" >&6 - if test "$prefix" = "NONE" ; then - cf_prefix="$ac_default_prefix" - else - cf_prefix="$prefix" - fi +if test "$prefix" = "NONE" ; then + cf_prefix="$ac_default_prefix" +else + cf_prefix="$prefix" +fi - case "$MANPAGE_FORMAT" in # (vi - *catonly*) # (vi - cf_format=yes - cf_inboth=no - ;; - *formatted*) # (vi - cf_format=yes - cf_inboth=yes - ;; - *) - cf_format=no - cf_inboth=no - ;; - esac +case "$MANPAGE_FORMAT" in +(*catonly*) + cf_format=yes + cf_inboth=no + ;; +(*formatted*) + cf_format=yes + cf_inboth=yes + ;; +(*) + cf_format=no + cf_inboth=no + ;; +esac test ! -d man && mkdir man cf_so_strip= cf_compress= -case "$MANPAGE_FORMAT" in #(vi -*compress*) #(vi +case "$MANPAGE_FORMAT" in +(*compress*) cf_so_strip="Z" cf_compress=compress - ;; -*gzip*) + ;; +(*gzip*) cf_so_strip="gz" cf_compress=gzip - ;; + ;; esac cf_edit_man=./edit_man.sh cf_man_alias=`pwd`/man_alias.sed cat >$cf_edit_man <>$cf_man_alias <<-CF_EOF2 s,@NCURSES_OSPEED@,\${NCURSES_OSPEED:="no default value"},g CF_EOF - for cf_name in captoinfo clear infocmp infotocap tabs tic toe tput tset + for cf_name in captoinfo clear infocmp infotocap reset tabs tic toe tput tset do cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cf_name=`echo $cf_name|sed "$program_transform_name"` @@ -11221,8 +11950,8 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <&5 +echo "$as_me:12063: 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. @@ -11341,7 +12070,7 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:11344: result: $with_ext_funcs" >&5 +echo "$as_me:12073: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "x$with_ext_funcs" = xyes ; then NCURSES_EXT_FUNCS=1 @@ -11374,6 +12103,10 @@ cat >>confdefs.h <<\EOF #define HAVE_USE_DEFAULT_COLORS 1 EOF +cat >>confdefs.h <<\EOF +#define HAVE_USE_EXTENDED_NAMES 1 +EOF + cat >>confdefs.h <<\EOF #define HAVE_USE_SCREEN 1 EOF @@ -11391,22 +12124,23 @@ cat >>confdefs.h <<\EOF EOF GENERATED_EXT_FUNCS=generated + test "x$with_ext_funcs" = xyes || cf_dft_ext_spfuncs=no else NCURSES_EXT_FUNCS=0 GENERATED_EXT_FUNCS= fi -echo "$as_me:11399: 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 +echo "$as_me:12133: checking if you want to build with SCREEN extensions" >&5 +echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6 # Check whether --enable-sp-funcs or --disable-sp-funcs was given. if test "${enable_sp_funcs+set}" = set; then enableval="$enable_sp_funcs" with_sp_funcs=$enableval else - with_sp_funcs=no + with_sp_funcs=$cf_dft_ext_spfuncs fi; -echo "$as_me:11409: result: $with_sp_funcs" >&5 +echo "$as_me:12143: result: $with_sp_funcs" >&5 echo "${ECHO_T}$with_sp_funcs" >&6 if test "x$with_sp_funcs" = xyes ; then NCURSES_SP_FUNCS=1 @@ -11421,8 +12155,8 @@ else GENERATED_SP_FUNCS= fi -echo "$as_me:11424: 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 +echo "$as_me:12158: checking if you want to build with terminal-driver" >&5 +echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6 # Check whether --enable-term-driver or --disable-term-driver was given. if test "${enable_term_driver+set}" = set; then @@ -11431,7 +12165,7 @@ if test "${enable_term_driver+set}" = set; then else with_term_driver=no fi; -echo "$as_me:11434: result: $with_term_driver" >&5 +echo "$as_me:12168: result: $with_term_driver" >&5 echo "${ECHO_T}$with_term_driver" >&6 if test "x$with_term_driver" = xyes ; then @@ -11439,15 +12173,20 @@ cat >>confdefs.h <<\EOF #define USE_TERM_DRIVER 1 EOF + if test "x$with_termlib" != xno ; then + { { echo "$as_me:12177: error: The term-driver option conflicts with the termlib option" >&5 +echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;} + { (exit 1); exit 1; }; } + fi if test "x$with_sp_funcs" != xyes ; then - { { echo "$as_me:11443: error: The term-driver option relies upon sp-funcs" >&5 + { { echo "$as_me:12182: 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:11450: checking for extended use of const keyword" >&5 +echo "$as_me:12189: 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. @@ -11455,9 +12194,9 @@ if test "${enable_const+set}" = set; then enableval="$enable_const" with_ext_const=$enableval else - with_ext_const=no + with_ext_const=$cf_dft_ext_const fi; -echo "$as_me:11460: result: $with_ext_const" >&5 +echo "$as_me:12199: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "x$with_ext_const" = xyes ; then @@ -11465,7 +12204,7 @@ if test "x$with_ext_const" = xyes ; then fi ### use option --enable-ext-colors to turn on use of colors beyond 16. -echo "$as_me:11468: checking if you want to use extended colors" >&5 +echo "$as_me:12207: 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. @@ -11473,41 +12212,44 @@ if test "${enable_ext_colors+set}" = set; then enableval="$enable_ext_colors" with_ext_colors=$enableval else - with_ext_colors=no + with_ext_colors=$cf_dft_ext_colors fi; -echo "$as_me:11478: result: $with_ext_colors" >&5 +echo "$as_me:12217: result: $with_ext_colors" >&5 echo "${ECHO_T}$with_ext_colors" >&6 NCURSES_EXT_COLORS=0 if test "x$with_ext_colors" = xyes ; then if test "x$with_widec" != xyes ; then - { { echo "$as_me:11483: 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; }; } + { echo "$as_me:12222: WARNING: This option applies only to wide-character library" >&5 +echo "$as_me: WARNING: This option applies only to wide-character library" >&2;} else # cannot be ABI 5 since it changes sizeof(cchar_t) if test "${with_abi_version+set}" != set; then case $cf_cv_rel_version in - 5.*) + (5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:11494: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 -echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} + { echo "$as_me:12232: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 +echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac fi - fi - NCURSES_EXT_COLORS=1 + NCURSES_EXT_COLORS=1 cat >>confdefs.h <<\EOF #define NCURSES_EXT_COLORS 1 EOF +cat >>confdefs.h <<\EOF +#define HAVE_ALLOC_PAIR 1 +EOF + + fi fi ### use option --enable-ext-mouse to modify coding to support 5-button mice -echo "$as_me:11510: checking if you want to use extended mouse encoding" >&5 +echo "$as_me:12252: 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. @@ -11515,9 +12257,9 @@ if test "${enable_ext_mouse+set}" = set; then enableval="$enable_ext_mouse" with_ext_mouse=$enableval else - with_ext_mouse=no + with_ext_mouse=$cf_dft_ext_mouse fi; -echo "$as_me:11520: result: $with_ext_mouse" >&5 +echo "$as_me:12262: result: $with_ext_mouse" >&5 echo "${ECHO_T}$with_ext_mouse" >&6 NCURSES_MOUSE_VERSION=1 if test "x$with_ext_mouse" = xyes ; then @@ -11525,18 +12267,39 @@ if test "x$with_ext_mouse" = xyes ; then if test "${with_abi_version+set}" != set; then case $cf_cv_rel_version in - 5.*) + (5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:11531: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 -echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} + { echo "$as_me:12273: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 +echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac fi fi -echo "$as_me:11539: checking if you want \$NCURSES_NO_PADDING code" >&5 +### use option --enable-ext-putwin to turn on extended screendumps +echo "$as_me:12282: checking if you want to use extended putwin/screendump" >&5 +echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6 + +# Check whether --enable-ext-putwin or --disable-ext-putwin was given. +if test "${enable_ext_putwin+set}" = set; then + enableval="$enable_ext_putwin" + with_ext_putwin=$enableval +else + with_ext_putwin=$cf_dft_ext_putwin +fi; +echo "$as_me:12292: result: $with_ext_putwin" >&5 +echo "${ECHO_T}$with_ext_putwin" >&6 +if test "x$with_ext_putwin" = xyes ; then + +cat >>confdefs.h <<\EOF +#define NCURSES_EXT_PUTWIN 1 +EOF + +fi + +echo "$as_me:12302: 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. @@ -11546,20 +12309,20 @@ if test "${enable_no_padding+set}" = set; then else with_no_padding=$with_ext_funcs fi; -echo "$as_me:11549: result: $with_no_padding" >&5 +echo "$as_me:12312: result: $with_no_padding" >&5 echo "${ECHO_T}$with_no_padding" >&6 test "x$with_no_padding" = xyes && cat >>confdefs.h <<\EOF #define NCURSES_NO_PADDING 1 EOF -echo "$as_me:11556: checking for ANSI C header files" >&5 +echo "$as_me:12319: 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 11562 "configure" +#line 12325 "configure" #include "confdefs.h" #include #include @@ -11567,13 +12330,13 @@ else #include _ACEOF -if { (eval echo "$as_me:11570: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12333: \"$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:11576: \$? = $ac_status" >&5 + echo "$as_me:12339: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11595,7 +12358,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 11598 "configure" +#line 12361 "configure" #include "confdefs.h" #include @@ -11613,7 +12376,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 11616 "configure" +#line 12379 "configure" #include "confdefs.h" #include @@ -11634,7 +12397,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 11637 "configure" +#line 12400 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -11660,15 +12423,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11663: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12426: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11666: \$? = $ac_status" >&5 + echo "$as_me:12429: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11668: \"$ac_try\"") >&5 + { (eval echo "$as_me:12431: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11671: \$? = $ac_status" >&5 + echo "$as_me:12434: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -11681,7 +12444,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:11684: result: $ac_cv_header_stdc" >&5 +echo "$as_me:12447: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -11697,28 +12460,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:11700: checking for $ac_header" >&5 +echo "$as_me:12463: 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 11706 "configure" +#line 12469 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11712: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12475: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11715: \$? = $ac_status" >&5 + echo "$as_me:12478: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11718: \"$ac_try\"") >&5 + { (eval echo "$as_me:12481: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11721: \$? = $ac_status" >&5 + echo "$as_me:12484: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -11728,7 +12491,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11731: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:12494: 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:12504: 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 11747 "configure" +#line 12510 "configure" #include "confdefs.h" $ac_includes_default int @@ -11759,16 +12522,16 @@ if (sizeof (signed char)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11762: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12525: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11765: \$? = $ac_status" >&5 + echo "$as_me:12528: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11768: \"$ac_try\"") >&5 + { (eval echo "$as_me:12531: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11771: \$? = $ac_status" >&5 + echo "$as_me:12534: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signed_char=yes else @@ -11778,10 +12541,10 @@ ac_cv_type_signed_char=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11781: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:12544: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:11784: checking size of signed char" >&5 +echo "$as_me:12547: 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 @@ -11790,7 +12553,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 11793 "configure" +#line 12556 "configure" #include "confdefs.h" $ac_includes_default int @@ -11802,21 +12565,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11805: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12568: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11808: \$? = $ac_status" >&5 + echo "$as_me:12571: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11811: \"$ac_try\"") >&5 + { (eval echo "$as_me:12574: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11814: \$? = $ac_status" >&5 + echo "$as_me:12577: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 11819 "configure" +#line 12582 "configure" #include "confdefs.h" $ac_includes_default int @@ -11828,16 +12591,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11831: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12594: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11834: \$? = $ac_status" >&5 + echo "$as_me:12597: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11837: \"$ac_try\"") >&5 + { (eval echo "$as_me:12600: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11840: \$? = $ac_status" >&5 + echo "$as_me:12603: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -11853,7 +12616,7 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 11856 "configure" +#line 12619 "configure" #include "confdefs.h" $ac_includes_default int @@ -11865,16 +12628,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11868: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12631: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11871: \$? = $ac_status" >&5 + echo "$as_me:12634: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11874: \"$ac_try\"") >&5 + { (eval echo "$as_me:12637: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11877: \$? = $ac_status" >&5 + echo "$as_me:12640: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -11890,7 +12653,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 11893 "configure" +#line 12656 "configure" #include "confdefs.h" $ac_includes_default int @@ -11902,16 +12665,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11905: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12668: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11908: \$? = $ac_status" >&5 + echo "$as_me:12671: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11911: \"$ac_try\"") >&5 + { (eval echo "$as_me:12674: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11914: \$? = $ac_status" >&5 + echo "$as_me:12677: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -11924,12 +12687,12 @@ done ac_cv_sizeof_signed_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:11927: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:12690: 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 11932 "configure" +#line 12695 "configure" #include "confdefs.h" $ac_includes_default int @@ -11945,15 +12708,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11948: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12711: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11951: \$? = $ac_status" >&5 + echo "$as_me:12714: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11953: \"$ac_try\"") >&5 + { (eval echo "$as_me:12716: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11956: \$? = $ac_status" >&5 + echo "$as_me:12719: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_signed_char=`cat conftest.val` else @@ -11969,7 +12732,7 @@ else ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:11972: result: $ac_cv_sizeof_signed_char" >&5 +echo "$as_me:12735: result: $ac_cv_sizeof_signed_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 cat >>confdefs.h <&5 +echo "$as_me:12746: 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. @@ -11990,12 +12753,12 @@ if test "${enable_signed_char+set}" = set; then else with_signed_char=no fi; -echo "$as_me:11993: result: $with_signed_char" >&5 +echo "$as_me:12756: result: $with_signed_char" >&5 echo "${ECHO_T}$with_signed_char" >&6 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char" ### use option --enable-sigwinch to turn on use of SIGWINCH logic -echo "$as_me:11998: checking if you want SIGWINCH handler" >&5 +echo "$as_me:12761: 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. @@ -12005,7 +12768,7 @@ if test "${enable_sigwinch+set}" = set; then else with_sigwinch=$with_ext_funcs fi; -echo "$as_me:12008: result: $with_sigwinch" >&5 +echo "$as_me:12771: result: $with_sigwinch" >&5 echo "${ECHO_T}$with_sigwinch" >&6 test "x$with_sigwinch" = xyes && cat >>confdefs.h <<\EOF @@ -12013,7 +12776,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-tcap-names to allow user to define new capabilities -echo "$as_me:12016: checking if you want user-definable terminal capabilities like termcap" >&5 +echo "$as_me:12779: 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. @@ -12023,170 +12786,44 @@ if test "${enable_tcap_names+set}" = set; then else with_tcap_names=$with_ext_funcs fi; -echo "$as_me:12026: result: $with_tcap_names" >&5 +echo "$as_me:12789: result: $with_tcap_names" >&5 echo "${ECHO_T}$with_tcap_names" >&6 NCURSES_XNAMES=0 test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1 -############################################################################### -# These options are relatively safe to experiment with. - -echo "$as_me:12034: 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. -if test "${with_develop+set}" = set; then - withval="$with_develop" - with_develop=$withval -else - with_develop=no -fi; -echo "$as_me:12044: 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:12048: 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. -if test "${enable_hard_tabs+set}" = set; then - enableval="$enable_hard_tabs" +echo "$as_me:12796: 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. +if test "${with_pthread+set}" = set; then + withval="$with_pthread" + with_pthread=$withval else - enable_hard_tabs=$with_develop + with_pthread=no fi; -echo "$as_me:12058: result: $enable_hard_tabs" >&5 -echo "${ECHO_T}$enable_hard_tabs" >&6 -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:12066: 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. -if test "${enable_xmc_glitch+set}" = set; then - enableval="$enable_xmc_glitch" +echo "$as_me:12806: result: $with_pthread" >&5 +echo "${ECHO_T}$with_pthread" >&6 -else - enable_xmc_glitch=$with_develop -fi; -echo "$as_me:12076: result: $enable_xmc_glitch" >&5 -echo "${ECHO_T}$enable_xmc_glitch" >&6 -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:12086: 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. -if test "${enable_assumed_color+set}" = set; then - enableval="$enable_assumed_color" - with_assumed_color=$enableval -else - with_assumed_color=yes -fi; -echo "$as_me:12096: result: $with_assumed_color" >&5 -echo "${ECHO_T}$with_assumed_color" >&6 -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:12104: 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. -if test "${enable_hashmap+set}" = set; then - enableval="$enable_hashmap" - with_hashmap=$enableval -else - with_hashmap=yes -fi; -echo "$as_me:12114: result: $with_hashmap" >&5 -echo "${ECHO_T}$with_hashmap" >&6 -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:12122: 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. -if test "${enable_colorfgbg+set}" = set; then - enableval="$enable_colorfgbg" - with_colorfgbg=$enableval -else - with_colorfgbg=no -fi; -echo "$as_me:12132: result: $with_colorfgbg" >&5 -echo "${ECHO_T}$with_colorfgbg" >&6 -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:12140: 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. -if test "${enable_interop+set}" = set; then - enableval="$enable_interop" - with_exp_interop=$enableval -else - with_exp_interop=no -fi; -echo "$as_me:12150: result: $with_exp_interop" >&5 -echo "${ECHO_T}$with_exp_interop" >&6 - -NCURSES_INTEROP_FUNCS=0 -test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1 - -# This is still experimental (20080329), but should ultimately be moved to -# the script-block --with-normal, etc. - -echo "$as_me:12159: 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. -if test "${with_pthread+set}" = set; then - withval="$with_pthread" - with_pthread=$withval -else - with_pthread=no -fi; -echo "$as_me:12169: result: $with_pthread" >&5 -echo "${ECHO_T}$with_pthread" >&6 - -if test "$with_pthread" != no ; then - echo "$as_me:12173: 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 +if test "$with_pthread" != no ; then + echo "$as_me:12810: 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 12179 "configure" +#line 12816 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:12183: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12820: \"$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:12189: \$? = $ac_status" >&5 + echo "$as_me:12826: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12205,7 +12842,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:12208: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:12845: 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 @@ -12215,7 +12852,7 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:12218: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:12855: 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" @@ -12236,7 +12873,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 12239 "configure" +#line 12876 "configure" #include "confdefs.h" #include @@ -12253,16 +12890,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12256: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12893: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12259: \$? = $ac_status" >&5 + echo "$as_me:12896: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12262: \"$ac_try\"") >&5 + { (eval echo "$as_me:12899: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12265: \$? = $ac_status" >&5 + echo "$as_me:12902: \$? = $ac_status" >&5 (exit $ac_status); }; }; then with_pthread=yes else @@ -12272,7 +12909,7 @@ with_pthread=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:12275: result: $with_pthread" >&5 + echo "$as_me:12912: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done @@ -12300,7 +12937,7 @@ cat >>confdefs.h <<\EOF EOF else - { { echo "$as_me:12303: error: Cannot link with pthread library" >&5 + { { echo "$as_me:12940: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -12310,13 +12947,13 @@ fi fi if test "x$with_pthread" != xno; then - echo "$as_me:12313: checking for pthread_kill" >&5 + echo "$as_me:12950: 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 12319 "configure" +#line 12956 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pthread_kill (); below. */ @@ -12347,16 +12984,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:12350: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12987: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12353: \$? = $ac_status" >&5 + echo "$as_me:12990: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12356: \"$ac_try\"") >&5 + { (eval echo "$as_me:12993: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12359: \$? = $ac_status" >&5 + echo "$as_me:12996: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_pthread_kill=yes else @@ -12366,11 +13003,11 @@ ac_cv_func_pthread_kill=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12369: result: $ac_cv_func_pthread_kill" >&5 +echo "$as_me:13006: 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:12373: checking if you want to allow EINTR in wgetch with pthreads" >&5 + echo "$as_me:13010: 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. @@ -12380,7 +13017,7 @@ if test "${enable_pthreads_eintr+set}" = set; then else use_pthreads_eintr=no fi; - echo "$as_me:12383: result: $use_pthreads_eintr" >&5 + echo "$as_me:13020: result: $use_pthreads_eintr" >&5 echo "${ECHO_T}$use_pthreads_eintr" >&6 if test "x$use_pthreads_eintr" = xyes ; then @@ -12391,7 +13028,7 @@ EOF fi fi - echo "$as_me:12394: checking if you want to use weak-symbols for pthreads" >&5 + echo "$as_me:13031: 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. @@ -12401,18 +13038,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; - echo "$as_me:12404: result: $use_weak_symbols" >&5 + echo "$as_me:13041: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "x$use_weak_symbols" = xyes ; then -echo "$as_me:12408: checking if $CC supports weak symbols" >&5 +echo "$as_me:13045: 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 12415 "configure" +#line 13052 "configure" #include "confdefs.h" #include @@ -12438,16 +13075,16 @@ weak_symbol(fopen); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12441: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13078: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12444: \$? = $ac_status" >&5 + echo "$as_me:13081: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12447: \"$ac_try\"") >&5 + { (eval echo "$as_me:13084: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12450: \$? = $ac_status" >&5 + echo "$as_me:13087: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_weak_symbols=yes else @@ -12458,7 +13095,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12461: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:13098: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -12481,18 +13118,18 @@ cat >>confdefs.h <<\EOF #define USE_PTHREADS 1 EOF - enable_reentrant=yes - if test "x$cf_cv_weak_symbols" = xyes ; then - PTHREAD=-lpthread - fi + enable_reentrant=yes + if test "x$cf_cv_weak_symbols" = xyes ; then + PTHREAD=-lpthread + fi fi # Reentrant code has to be opaque; there's little advantage to making ncurses # 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:12494: checking if you want experimental reentrant code" >&5 -echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 +echo "$as_me:13131: checking if you want reentrant code" >&5 +echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6 # Check whether --enable-reentrant or --disable-reentrant was given. if test "${enable_reentrant+set}" = set; then @@ -12501,12 +13138,11 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=no fi; -echo "$as_me:12504: result: $with_reentrant" >&5 +echo "$as_me:13141: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 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 "x$cf_cv_weak_symbols" = xyes ; then @@ -12551,13 +13187,13 @@ TEST_LIBS2="$cf_add_libs" # except cygwin, where we only do that if ALSO # compiling with full thread support. case "$host" in - *cygwin* | *msys*) #(vi + (*cygwin* | *msys*) 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 @@ -12571,11 +13207,11 @@ EOF if test "${with_abi_version+set}" != set; then case $cf_cv_rel_version in - 5.*) + (5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:12577: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 -echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} + { echo "$as_me:13213: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 +echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac fi @@ -12583,13 +13219,87 @@ fi else cf_cv_enable_reentrant=0 cf_cv_enable_opaque="NCURSES_OPAQUE" - NCURSES_OPAQUE=0 NCURSES_SIZE_T=short fi +echo "$as_me:13225: checking if you want opaque curses-library structures" >&5 +echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6 + +# Check whether --enable-opaque-curses or --disable-opaque-curses was given. +if test "${enable_opaque_curses+set}" = set; then + enableval="$enable_opaque_curses" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + enable_opaque_curses=yes + else + + test "$cf_cv_enable_reentrant" = 1 && enable_opaque_curses=yes + test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no + + fi +else + enableval=no + + test "$cf_cv_enable_reentrant" = 1 && enable_opaque_curses=yes + test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no + +fi; +echo "$as_me:13247: result: $enable_opaque_curses" >&5 +echo "${ECHO_T}$enable_opaque_curses" >&6 + +test "$cf_cv_enable_reentrant" = 1 && \ +test "$enable_opaque_curses" = no && \ +{ { echo "$as_me:13252: error: reentrant configuration requires opaque library" >&5 +echo "$as_me: error: reentrant configuration requires opaque library" >&2;} + { (exit 1); exit 1; }; } + +echo "$as_me:13256: checking if you want opaque form-library structures" >&5 +echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6 + +# Check whether --enable-opaque-form or --disable-opaque-form was given. +if test "${enable_opaque_form+set}" = set; then + enableval="$enable_opaque_form" + enable_opaque_form=yes +else + enable_opaque_form=no +fi; +echo "$as_me:13266: result: $enable_opaque_form" >&5 +echo "${ECHO_T}$enable_opaque_form" >&6 + +echo "$as_me:13269: checking if you want opaque menu-library structures" >&5 +echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6 + +# Check whether --enable-opaque-menu or --disable-opaque-menu was given. +if test "${enable_opaque_menu+set}" = set; then + enableval="$enable_opaque_menu" + enable_opaque_menu=yes +else + enable_opaque_menu=no +fi; +echo "$as_me:13279: result: $enable_opaque_menu" >&5 +echo "${ECHO_T}$enable_opaque_menu" >&6 + +echo "$as_me:13282: checking if you want opaque panel-library structures" >&5 +echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6 + +# Check whether --enable-opaque-panel or --disable-opaque-panel was given. +if test "${enable_opaque_panel+set}" = set; then + enableval="$enable_opaque_panel" + enable_opaque_panel=yes +else + enable_opaque_panel=no +fi; +echo "$as_me:13292: result: $enable_opaque_panel" >&5 +echo "${ECHO_T}$enable_opaque_panel" >&6 + +NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1 +NCURSES_OPAQUE_FORM=0; test "$enable_opaque_form" = yes && NCURSES_OPAQUE_FORM=1 +NCURSES_OPAQUE_MENU=0; test "$enable_opaque_menu" = yes && NCURSES_OPAQUE_MENU=1 +NCURSES_OPAQUE_PANEL=0; test "$enable_opaque_panel" = yes && NCURSES_OPAQUE_PANEL=1 + ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:12592: checking for prefix used to wrap public variables" >&5 + echo "$as_me:13302: 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. @@ -12599,7 +13309,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:12602: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:13312: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -12609,7 +13319,132 @@ cat >>confdefs.h <&5 +############################################################################### +# These options are relatively safe to experiment with. + +echo "$as_me:13325: 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. +if test "${with_develop+set}" = set; then + withval="$with_develop" + with_develop=$withval +else + with_develop=no +fi; +echo "$as_me:13335: 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:13339: 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. +if test "${enable_hard_tabs+set}" = set; then + enableval="$enable_hard_tabs" + +else + enable_hard_tabs=$with_develop +fi; +echo "$as_me:13349: result: $enable_hard_tabs" >&5 +echo "${ECHO_T}$enable_hard_tabs" >&6 +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:13357: 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. +if test "${enable_xmc_glitch+set}" = set; then + enableval="$enable_xmc_glitch" + +else + enable_xmc_glitch=$with_develop +fi; +echo "$as_me:13367: result: $enable_xmc_glitch" >&5 +echo "${ECHO_T}$enable_xmc_glitch" >&6 +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:13377: 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. +if test "${enable_assumed_color+set}" = set; then + enableval="$enable_assumed_color" + with_assumed_color=$enableval +else + with_assumed_color=yes +fi; +echo "$as_me:13387: result: $with_assumed_color" >&5 +echo "${ECHO_T}$with_assumed_color" >&6 +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:13395: 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. +if test "${enable_hashmap+set}" = set; then + enableval="$enable_hashmap" + with_hashmap=$enableval +else + with_hashmap=yes +fi; +echo "$as_me:13405: result: $with_hashmap" >&5 +echo "${ECHO_T}$with_hashmap" >&6 +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:13413: 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. +if test "${enable_colorfgbg+set}" = set; then + enableval="$enable_colorfgbg" + with_colorfgbg=$enableval +else + with_colorfgbg=no +fi; +echo "$as_me:13423: result: $with_colorfgbg" >&5 +echo "${ECHO_T}$with_colorfgbg" >&6 +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:13431: 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. +if test "${enable_interop+set}" = set; then + enableval="$enable_interop" + with_exp_interop=$enableval +else + with_exp_interop=$cf_dft_interop +fi; +echo "$as_me:13441: result: $with_exp_interop" >&5 +echo "${ECHO_T}$with_exp_interop" >&6 + +NCURSES_INTEROP_FUNCS=0 +test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1 + +echo "$as_me:13447: 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. @@ -12619,7 +13454,7 @@ if test "${enable_safe_sprintf+set}" = set; then else with_safe_sprintf=no fi; -echo "$as_me:12622: result: $with_safe_sprintf" >&5 +echo "$as_me:13457: result: $with_safe_sprintf" >&5 echo "${ECHO_T}$with_safe_sprintf" >&6 test "x$with_safe_sprintf" = xyes && cat >>confdefs.h <<\EOF @@ -12629,7 +13464,7 @@ 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:12632: checking if you want to experiment without scrolling-hints code" >&5 +echo "$as_me:13467: 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. @@ -12639,7 +13474,7 @@ if test "${enable_scroll_hints+set}" = set; then else with_scroll_hints=yes fi; -echo "$as_me:12642: result: $with_scroll_hints" >&5 +echo "$as_me:13477: result: $with_scroll_hints" >&5 echo "${ECHO_T}$with_scroll_hints" >&6 test "x$with_scroll_hints" = xyes && cat >>confdefs.h <<\EOF @@ -12648,8 +13483,8 @@ EOF fi -echo "$as_me:12651: checking if you want experimental wgetch-events code" >&5 -echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6 +echo "$as_me:13486: checking if you want wgetch-events code" >&5 +echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6 # Check whether --enable-wgetch-events or --disable-wgetch-events was given. if test "${enable_wgetch_events+set}" = set; then @@ -12658,7 +13493,7 @@ if test "${enable_wgetch_events+set}" = set; then else with_wgetch_events=no fi; -echo "$as_me:12661: result: $with_wgetch_events" >&5 +echo "$as_me:13496: result: $with_wgetch_events" >&5 echo "${ECHO_T}$with_wgetch_events" >&6 test "x$with_wgetch_events" = xyes && cat >>confdefs.h <<\EOF @@ -12669,41 +13504,41 @@ EOF ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:12672: checking if you want to see long compiling messages" >&5 +echo "$as_me:13507: 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. if test "${enable_echo+set}" = set; then enableval="$enable_echo" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then - ECHO_LT='--silent' - ECHO_LD='@echo linking $@;' - RULE_CC='@echo compiling $<' - SHOW_CC='@echo compiling $@' - ECHO_CC='@' + ECHO_LT='--silent' + ECHO_LD='@echo linking $@;' + RULE_CC='@echo compiling $<' + SHOW_CC='@echo compiling $@' + ECHO_CC='@' - else + else - ECHO_LT='' - ECHO_LD='' - RULE_CC='' - SHOW_CC='' - ECHO_CC='' + ECHO_LT='' + ECHO_LD='' + RULE_CC='' + SHOW_CC='' + ECHO_CC='' - fi + fi else enableval=yes - ECHO_LT='' - ECHO_LD='' - RULE_CC='' - SHOW_CC='' - ECHO_CC='' + ECHO_LT='' + ECHO_LD='' + RULE_CC='' + SHOW_CC='' + ECHO_CC='' fi; -echo "$as_me:12706: result: $enableval" >&5 +echo "$as_me:13541: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "x$enable_echo" = xyes; then @@ -12715,7 +13550,7 @@ else fi ### use option --enable-warnings to turn on all gcc warnings -echo "$as_me:12718: checking if you want to see compiler warnings" >&5 +echo "$as_me:13553: 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. @@ -12723,7 +13558,7 @@ if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" with_warnings=$enableval fi; -echo "$as_me:12726: result: $with_warnings" >&5 +echo "$as_me:13561: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "x$with_warnings" = "xyes"; then @@ -12734,13 +13569,13 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in - linux*|gnu*) - echo "$as_me:12738: checking if this is really Intel C compiler" >&5 + (linux*|gnu*) + echo "$as_me:13573: 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 12743 "configure" +#line 13578 "configure" #include "confdefs.h" int @@ -12757,16 +13592,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12760: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13595: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12763: \$? = $ac_status" >&5 + echo "$as_me:13598: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12766: \"$ac_try\"") >&5 + { (eval echo "$as_me:13601: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12769: \$? = $ac_status" >&5 + echo "$as_me:13604: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -12777,7 +13612,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:12780: result: $INTEL_COMPILER" >&5 + echo "$as_me:13615: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -12786,12 +13621,12 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:12789: checking if this is really Clang C compiler" >&5 + echo "$as_me:13624: 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 12794 "configure" +#line 13629 "configure" #include "confdefs.h" int @@ -12808,16 +13643,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12811: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13646: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12814: \$? = $ac_status" >&5 + echo "$as_me:13649: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12817: \"$ac_try\"") >&5 + { (eval echo "$as_me:13652: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12820: \$? = $ac_status" >&5 + echo "$as_me:13655: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CLANG_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -12828,12 +13663,12 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:12831: result: $CLANG_COMPILER" >&5 + echo "$as_me:13666: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi cat > conftest.$ac_ext <&5 + { echo "$as_me:13688: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -12866,12 +13701,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:12869: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13704: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12872: \$? = $ac_status" >&5 + echo "$as_me:13707: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:12874: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13709: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -12880,7 +13715,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:12883: checking for $CC warning options..." >&5 + { echo "$as_me:13718: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= @@ -12904,33 +13739,33 @@ echo "$as_me: checking for $CC warning options..." >&6;} 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:12907: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13742: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12910: \$? = $ac_status" >&5 + echo "$as_me:13745: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:12912: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13747: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 - case $cf_opt in #(vi - Wcast-qual) #(vi + case $cf_opt in + (Wcast-qual) CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES" ;; - Winline) #(vi + (Winline) case $GCC_VERSION in - [34].*) + ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:12923: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:13758: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac ;; - Wpointer-arith) #(vi + (Wpointer-arith) case $GCC_VERSION in - [12].*) + ([12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:12933: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:13768: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -12949,13 +13784,13 @@ INTEL_CPLUSPLUS=no if test "$GCC" = yes ; then case $host_os in - linux*|gnu*) - echo "$as_me:12953: checking if this is really Intel C++ compiler" >&5 + (linux*|gnu*) + echo "$as_me:13788: 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 12958 "configure" +#line 13793 "configure" #include "confdefs.h" int @@ -12972,16 +13807,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12975: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13810: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12978: \$? = $ac_status" >&5 + echo "$as_me:13813: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12981: \"$ac_try\"") >&5 + { (eval echo "$as_me:13816: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12984: \$? = $ac_status" >&5 + echo "$as_me:13819: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_CPLUSPLUS=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -12992,7 +13827,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:12995: result: $INTEL_CPLUSPLUS" >&5 + echo "$as_me:13830: result: $INTEL_CPLUSPLUS" >&5 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 ;; esac @@ -13001,12 +13836,12 @@ fi CLANG_CPLUSPLUS=no if test "$GCC" = yes ; then - echo "$as_me:13004: checking if this is really Clang C++ compiler" >&5 + echo "$as_me:13839: 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 13009 "configure" +#line 13844 "configure" #include "confdefs.h" int @@ -13023,16 +13858,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13026: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13861: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13029: \$? = $ac_status" >&5 + echo "$as_me:13864: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13032: \"$ac_try\"") >&5 + { (eval echo "$as_me:13867: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13035: \$? = $ac_status" >&5 + echo "$as_me:13870: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CLANG_CPLUSPLUS=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -13043,7 +13878,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:13046: result: $CLANG_CPLUSPLUS" >&5 + echo "$as_me:13881: result: $CLANG_CPLUSPLUS" >&5 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 fi @@ -13055,7 +13890,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat > conftest.$ac_ext <&5 + { echo "$as_me:13911: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-Wall" @@ -13090,12 +13925,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:13093: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13928: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13096: \$? = $ac_status" >&5 + echo "$as_me:13931: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:13098: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13933: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" fi @@ -13104,16 +13939,16 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GXX" = yes then - { echo "$as_me:13107: checking for $CXX warning options..." >&5 + { echo "$as_me:13942: checking for $CXX warning options..." >&5 echo "$as_me: checking for $CXX warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-W -Wall" cf_gxx_extra_warnings="" test "$with_ext_const" = yes && cf_gxx_extra_warnings="Wwrite-strings" case "$GCC_VERSION" in - [1-2].*) + ([1-2].*) ;; - *) + (*) cf_gxx_extra_warnings="$cf_gxx_extra_warnings Weffc++" ;; esac @@ -13134,16 +13969,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;} Wundef $cf_gxx_extra_warnings Wno-unused do CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" - if { (eval echo "$as_me:13137: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13972: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13140: \$? = $ac_status" >&5 + echo "$as_me:13975: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:13142: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13977: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" else - test -n "$verbose" && echo "$as_me:13146: result: ... no -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13981: result: ... no -$cf_opt" >&5 echo "${ECHO_T}... no -$cf_opt" >&6 fi done @@ -13179,10 +14014,10 @@ cat > conftest.i <&5 + { echo "$as_me:14017: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > conftest.$ac_ext <&5 - case $cf_attribute in #(vi - printf) #(vi + case $cf_attribute in + (printf) cf_printf_attribute=yes cat >conftest.h <conftest.h <conftest.h <&5 + if { (eval echo "$as_me:14069: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13237: \$? = $ac_status" >&5 + echo "$as_me:14072: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:13239: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:14074: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h - case $cf_attribute in #(vi - noreturn) #(vi + case $cf_attribute in + (noreturn) cat >>confdefs.h <>confdefs.h <>confdefs.h <>confdefs.h <&5 +echo "$as_me:14133: 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. @@ -13303,30 +14138,218 @@ if test "${enable_string_hacks+set}" = set; then enableval="$enable_string_hacks" with_string_hacks=$enableval else - with_string_hacks=no -fi; -echo "$as_me:13308: result: $with_string_hacks" >&5 -echo "${ECHO_T}$with_string_hacks" >&6 + with_string_hacks=no +fi; +echo "$as_me:14143: result: $with_string_hacks" >&5 +echo "${ECHO_T}$with_string_hacks" >&6 + +if test "x$with_string_hacks" = "xyes"; then + +cat >>confdefs.h <<\EOF +#define USE_STRING_HACKS 1 +EOF + + { echo "$as_me:14152: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 +echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} + echo "$as_me:14154: checking for strlcat" >&5 +echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 +if test "${ac_cv_func_strlcat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 14160 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char strlcat (); below. */ +#include +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char strlcat (); +char (*f) (); + +int +main () +{ +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_strlcat) || defined (__stub___strlcat) +choke me +#else +f = strlcat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:14191: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14194: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14197: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14200: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_strlcat=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_strlcat=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:14210: result: $ac_cv_func_strlcat" >&5 +echo "${ECHO_T}$ac_cv_func_strlcat" >&6 +if test $ac_cv_func_strlcat = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_STRLCAT 1 +EOF + +else + + echo "$as_me:14220: checking for strlcat in -lbsd" >&5 +echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6 +if test "${ac_cv_lib_bsd_strlcat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 14228 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char strlcat (); +int +main () +{ +strlcat (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:14247: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14250: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14253: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14256: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_strlcat=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_bsd_strlcat=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:14267: result: $ac_cv_lib_bsd_strlcat" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 +if test $ac_cv_lib_bsd_strlcat = yes; then + +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" + +for ac_header in bsd/string.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:14290: 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 14296 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:14300: \"$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:14306: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:14325: 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 <>confdefs.h <<\EOF -#define USE_STRING_HACKS 1 +#define HAVE_STRLCAT 1 EOF - { echo "$as_me:13317: 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;} +fi + +fi -for ac_func in strlcat strlcpy snprintf +for ac_func in strlcpy snprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:13323: checking for $ac_func" >&5 +echo "$as_me:14346: 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 13329 "configure" +#line 14352 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -13357,16 +14380,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:13360: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14383: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13363: \$? = $ac_status" >&5 + echo "$as_me:14386: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13366: \"$ac_try\"") >&5 + { (eval echo "$as_me:14389: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13369: \$? = $ac_status" >&5 + echo "$as_me:14392: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -13376,7 +14399,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13379: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:14402: 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:14415: 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. @@ -13399,7 +14422,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:13402: result: $with_assertions" >&5 +echo "$as_me:14425: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -13415,7 +14438,7 @@ fi ### use option --disable-leaks to suppress "permanent" leaks, for testing -echo "$as_me:13418: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:14441: 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. @@ -13432,15 +14455,15 @@ EOF else with_dmalloc= fi; -echo "$as_me:13435: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:14458: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 -case .$with_cflags in #(vi -.*-g*) - case .$CFLAGS in #(vi - .*-g*) #(vi +case .$with_cflags in +(.*-g*) + case .$CFLAGS in + (.*-g*) ;; - *) + (*) cf_fix_cppflags=no cf_new_cflags= @@ -13450,11 +14473,11 @@ cf_new_extra_cppflags= for cf_add_cflags in -g do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -13462,20 +14485,26 @@ no) && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue fi ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -13484,17 +14513,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + ;; esac ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + ;; esac ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` @@ -13507,17 +14544,23 @@ done if test -n "$cf_new_cflags" ; then - CFLAGS="$CFLAGS $cf_new_cflags" + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + fi if test -n "$cf_new_cppflags" ; then - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + fi if test -n "$cf_new_extra_cppflags" ; then - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + fi ;; @@ -13526,23 +14569,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:13529: checking for dmalloc.h" >&5 + echo "$as_me:14572: 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 13535 "configure" +#line 14578 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:13539: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14582: \"$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:13545: \$? = $ac_status" >&5 + echo "$as_me:14588: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13561,11 +14604,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13564: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:14607: 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:13568: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:14611: 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 @@ -13573,7 +14616,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13576 "configure" +#line 14619 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13592,16 +14635,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13595: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14638: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13598: \$? = $ac_status" >&5 + echo "$as_me:14641: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13601: \"$ac_try\"") >&5 + { (eval echo "$as_me:14644: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13604: \$? = $ac_status" >&5 + echo "$as_me:14647: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -13612,7 +14655,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13615: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:14658: 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:14673: 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. @@ -13644,15 +14687,15 @@ EOF else with_dbmalloc= fi; -echo "$as_me:13647: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:14690: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 -case .$with_cflags in #(vi -.*-g*) - case .$CFLAGS in #(vi - .*-g*) #(vi +case .$with_cflags in +(.*-g*) + case .$CFLAGS in + (.*-g*) ;; - *) + (*) cf_fix_cppflags=no cf_new_cflags= @@ -13662,11 +14705,11 @@ cf_new_extra_cppflags= for cf_add_cflags in -g do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -13674,20 +14717,26 @@ no) && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue fi ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -13696,17 +14745,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + ;; esac ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + ;; esac ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` @@ -13719,17 +14776,23 @@ done if test -n "$cf_new_cflags" ; then - CFLAGS="$CFLAGS $cf_new_cflags" + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + fi if test -n "$cf_new_cppflags" ; then - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + fi if test -n "$cf_new_extra_cppflags" ; then - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + fi ;; @@ -13738,23 +14801,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:13741: checking for dbmalloc.h" >&5 + echo "$as_me:14804: 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 13747 "configure" +#line 14810 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:13751: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14814: \"$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:13757: \$? = $ac_status" >&5 + echo "$as_me:14820: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13773,11 +14836,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13776: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:14839: 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:13780: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:14843: 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 @@ -13785,7 +14848,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13788 "configure" +#line 14851 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13804,16 +14867,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13807: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14870: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13810: \$? = $ac_status" >&5 + echo "$as_me:14873: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13813: \"$ac_try\"") >&5 + { (eval echo "$as_me:14876: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13816: \$? = $ac_status" >&5 + echo "$as_me:14879: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -13824,7 +14887,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13827: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:14890: 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:14905: 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. @@ -13856,15 +14919,15 @@ EOF else with_valgrind= fi; -echo "$as_me:13859: result: ${with_valgrind:-no}" >&5 +echo "$as_me:14922: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 -case .$with_cflags in #(vi -.*-g*) - case .$CFLAGS in #(vi - .*-g*) #(vi +case .$with_cflags in +(.*-g*) + case .$CFLAGS in + (.*-g*) ;; - *) + (*) cf_fix_cppflags=no cf_new_cflags= @@ -13874,11 +14937,11 @@ cf_new_extra_cppflags= for cf_add_cflags in -g do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -13886,20 +14949,26 @@ no) && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue fi ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -13908,17 +14977,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + ;; esac ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + ;; esac ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` @@ -13931,17 +15008,23 @@ done if test -n "$cf_new_cflags" ; then - CFLAGS="$CFLAGS $cf_new_cflags" + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + fi if test -n "$cf_new_cppflags" ; then - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + fi if test -n "$cf_new_extra_cppflags" ; then - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + fi ;; @@ -13949,7 +15032,7 @@ fi ;; esac -echo "$as_me:13952: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:15035: 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. @@ -13959,7 +15042,7 @@ if test "${enable_leaks+set}" = set; then else : ${with_no_leaks:=no} fi; -echo "$as_me:13962: result: $with_no_leaks" >&5 +echo "$as_me:15045: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then @@ -14006,12 +15089,12 @@ fi; # extended to all models of the ncurses library: cf_all_traces=no case "$CFLAGS $CPPFLAGS" in -*-DTRACE*) +(*-DTRACE*) cf_all_traces=yes ;; esac -echo "$as_me:14014: checking whether to add trace feature to all models" >&5 +echo "$as_me:15097: 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. @@ -14021,7 +15104,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:14024: result: $cf_with_trace" >&5 +echo "$as_me:15107: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "x$cf_with_trace" = xyes ; then @@ -14036,11 +15119,11 @@ cf_new_extra_cppflags= for cf_add_cflags in -DTRACE do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -14048,20 +15131,26 @@ no) && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue fi ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -14070,17 +15159,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + ;; esac ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + ;; esac ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` @@ -14093,17 +15190,23 @@ done if test -n "$cf_new_cflags" ; then - CFLAGS="$CFLAGS $cf_new_cflags" + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + fi if test -n "$cf_new_cppflags" ; then - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + fi if test -n "$cf_new_extra_cppflags" ; then - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + fi else @@ -14111,40 +15214,40 @@ else ADA_TRACE=FALSE fi -echo "$as_me:14114: checking if we want to use GNAT projects" >&5 +echo "$as_me:15217: 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 + if test "$enableval" != "yes" ; then enable_gnat_projects=no - else - enable_gnat_projects=yes - fi + else + enable_gnat_projects=yes + fi else enableval=yes - enable_gnat_projects=yes + enable_gnat_projects=yes fi; -echo "$as_me:14131: result: $enable_gnat_projects" >&5 +echo "$as_me:15234: result: $enable_gnat_projects" >&5 echo "${ECHO_T}$enable_gnat_projects" >&6 ### Checks for libraries. -case $cf_cv_system_name in #(vi -*mingw32*|*mingw64*) #(vi - CPPFLAGS="$CPPFLAGS -DWINVER=0x0501" +case $cf_cv_system_name in +(*mingw32*|*mingw64*) + CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN" LIBS=" -lpsapi $LIBS" ;; -*) -echo "$as_me:14141: checking for gettimeofday" >&5 +(*) +echo "$as_me:15244: 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 14147 "configure" +#line 15250 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gettimeofday (); below. */ @@ -14175,16 +15278,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:14178: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15281: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14181: \$? = $ac_status" >&5 + echo "$as_me:15284: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14184: \"$ac_try\"") >&5 + { (eval echo "$as_me:15287: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14187: \$? = $ac_status" >&5 + echo "$as_me:15290: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gettimeofday=yes else @@ -14194,7 +15297,7 @@ ac_cv_func_gettimeofday=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14197: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:15300: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test $ac_cv_func_gettimeofday = yes; then @@ -14204,7 +15307,7 @@ EOF else -echo "$as_me:14207: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:15310: 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 @@ -14212,7 +15315,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14215 "configure" +#line 15318 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14231,16 +15334,16 @@ gettimeofday (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14234: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15337: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14237: \$? = $ac_status" >&5 + echo "$as_me:15340: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14240: \"$ac_try\"") >&5 + { (eval echo "$as_me:15343: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14243: \$? = $ac_status" >&5 + echo "$as_me:15346: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -14251,7 +15354,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14254: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:15357: 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 @@ -14281,17 +15384,18 @@ fi ;; esac -echo "$as_me:14284: checking if -lm needed for math functions" >&5 +echo "$as_me:15387: 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 14291 "configure" +#line 15394 "configure" #include "confdefs.h" #include + #include #include int @@ -14303,16 +15407,16 @@ double x = rand(); printf("result = %g\n", pow(sin(x),x)) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14306: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15410: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14309: \$? = $ac_status" >&5 + echo "$as_me:15413: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14312: \"$ac_try\"") >&5 + { (eval echo "$as_me:15416: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14315: \$? = $ac_status" >&5 + echo "$as_me:15419: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_libm=no else @@ -14322,7 +15426,7 @@ cf_cv_need_libm=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14325: result: $cf_cv_need_libm" >&5 +echo "$as_me:15429: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes then @@ -14330,13 +15434,13 @@ MATH_LIB=-lm fi ### Checks for header files. -echo "$as_me:14333: checking for ANSI C header files" >&5 +echo "$as_me:15437: 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 14339 "configure" +#line 15443 "configure" #include "confdefs.h" #include #include @@ -14344,13 +15448,13 @@ else #include _ACEOF -if { (eval echo "$as_me:14347: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15451: \"$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:14353: \$? = $ac_status" >&5 + echo "$as_me:15457: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14372,7 +15476,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 14375 "configure" +#line 15479 "configure" #include "confdefs.h" #include @@ -14390,7 +15494,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 14393 "configure" +#line 15497 "configure" #include "confdefs.h" #include @@ -14411,7 +15515,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 14414 "configure" +#line 15518 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -14437,15 +15541,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14440: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15544: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14443: \$? = $ac_status" >&5 + echo "$as_me:15547: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14445: \"$ac_try\"") >&5 + { (eval echo "$as_me:15549: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14448: \$? = $ac_status" >&5 + echo "$as_me:15552: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -14458,7 +15562,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:14461: result: $ac_cv_header_stdc" >&5 +echo "$as_me:15565: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -14471,13 +15575,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:14474: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:15578: 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 14480 "configure" +#line 15584 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -14492,16 +15596,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14495: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15599: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14498: \$? = $ac_status" >&5 + echo "$as_me:15602: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14501: \"$ac_try\"") >&5 + { (eval echo "$as_me:15605: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14504: \$? = $ac_status" >&5 + echo "$as_me:15608: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -14511,7 +15615,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14514: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:15618: 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:15631: 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 @@ -14532,7 +15636,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14535 "configure" +#line 15639 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14551,16 +15655,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14554: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15658: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14557: \$? = $ac_status" >&5 + echo "$as_me:15661: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14560: \"$ac_try\"") >&5 + { (eval echo "$as_me:15664: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14563: \$? = $ac_status" >&5 + echo "$as_me:15667: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -14571,14 +15675,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14574: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:15678: 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:14581: checking for opendir in -lx" >&5 + echo "$as_me:15685: 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 @@ -14586,7 +15690,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14589 "configure" +#line 15693 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14605,16 +15709,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14608: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15712: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14611: \$? = $ac_status" >&5 + echo "$as_me:15715: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14614: \"$ac_try\"") >&5 + { (eval echo "$as_me:15718: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14617: \$? = $ac_status" >&5 + echo "$as_me:15721: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -14625,7 +15729,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14628: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:15732: 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" @@ -14633,13 +15737,13 @@ fi fi -echo "$as_me:14636: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:15740: 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 14642 "configure" +#line 15746 "configure" #include "confdefs.h" #include #include @@ -14655,16 +15759,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14658: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15762: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14661: \$? = $ac_status" >&5 + echo "$as_me:15765: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14664: \"$ac_try\"") >&5 + { (eval echo "$as_me:15768: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14667: \$? = $ac_status" >&5 + echo "$as_me:15771: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -14674,7 +15778,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14677: result: $ac_cv_header_time" >&5 +echo "$as_me:15781: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -14687,19 +15791,19 @@ fi cf_regex_func=no cf_regex_libs="regex re" -case $host_os in #(vi -mingw*) +case $host_os in +(mingw*) cf_regex_libs="gnurx $cf_regex_libs" ;; esac -echo "$as_me:14696: checking for regcomp" >&5 +echo "$as_me:15800: 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 14702 "configure" +#line 15806 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char regcomp (); below. */ @@ -14730,16 +15834,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:14733: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15837: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14736: \$? = $ac_status" >&5 + echo "$as_me:15840: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14739: \"$ac_try\"") >&5 + { (eval echo "$as_me:15843: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14742: \$? = $ac_status" >&5 + echo "$as_me:15846: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_regcomp=yes else @@ -14749,7 +15853,7 @@ ac_cv_func_regcomp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14752: result: $ac_cv_func_regcomp" >&5 +echo "$as_me:15856: 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 @@ -14758,7 +15862,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:14761: checking for regcomp in -l$cf_regex_lib" >&5 +echo "$as_me:15865: 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 @@ -14766,7 +15870,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_regex_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14769 "configure" +#line 15873 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14785,16 +15889,16 @@ regcomp (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14788: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15892: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14791: \$? = $ac_status" >&5 + echo "$as_me:15895: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14794: \"$ac_try\"") >&5 + { (eval echo "$as_me:15898: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14797: \$? = $ac_status" >&5 + echo "$as_me:15901: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -14805,7 +15909,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14808: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:15912: 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 @@ -14834,13 +15938,13 @@ fi fi if test "$cf_regex_func" = no ; then - echo "$as_me:14837: checking for compile" >&5 + echo "$as_me:15941: 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 14843 "configure" +#line 15947 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char compile (); below. */ @@ -14871,16 +15975,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:14874: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15978: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14877: \$? = $ac_status" >&5 + echo "$as_me:15981: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14880: \"$ac_try\"") >&5 + { (eval echo "$as_me:15984: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14883: \$? = $ac_status" >&5 + echo "$as_me:15987: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_compile=yes else @@ -14890,13 +15994,13 @@ ac_cv_func_compile=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14893: result: $ac_cv_func_compile" >&5 +echo "$as_me:15997: 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:14899: checking for compile in -lgen" >&5 + echo "$as_me:16003: 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 @@ -14904,7 +16008,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14907 "configure" +#line 16011 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14923,16 +16027,16 @@ compile (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14926: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16030: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14929: \$? = $ac_status" >&5 + echo "$as_me:16033: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14932: \"$ac_try\"") >&5 + { (eval echo "$as_me:16036: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14935: \$? = $ac_status" >&5 + echo "$as_me:16039: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gen_compile=yes else @@ -14943,7 +16047,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14946: result: $ac_cv_lib_gen_compile" >&5 +echo "$as_me:16050: 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 @@ -14971,23 +16075,23 @@ fi fi if test "$cf_regex_func" = no ; then - { echo "$as_me:14974: WARNING: cannot find regular expression library" >&5 + { echo "$as_me:16078: WARNING: cannot find regular expression library" >&5 echo "$as_me: WARNING: cannot find regular expression library" >&2;} fi -echo "$as_me:14978: checking for regular-expression headers" >&5 +echo "$as_me:16082: checking for regular-expression headers" >&5 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 if test "${cf_cv_regex_hdrs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cf_cv_regex_hdrs=no -case $cf_regex_func in #(vi -compile) #(vi +case $cf_regex_func in +(compile) for cf_regex_hdr in regexp.h regexpr.h do cat >conftest.$ac_ext <<_ACEOF -#line 14990 "configure" +#line 16094 "configure" #include "confdefs.h" #include <$cf_regex_hdr> int @@ -15002,16 +16106,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15005: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16109: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15008: \$? = $ac_status" >&5 + echo "$as_me:16112: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15011: \"$ac_try\"") >&5 + { (eval echo "$as_me:16115: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15014: \$? = $ac_status" >&5 + echo "$as_me:16118: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -15024,11 +16128,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done ;; -*) +(*) for cf_regex_hdr in regex.h do cat >conftest.$ac_ext <<_ACEOF -#line 15031 "configure" +#line 16135 "configure" #include "confdefs.h" #include #include <$cf_regex_hdr> @@ -15046,16 +16150,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15049: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16153: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15052: \$? = $ac_status" >&5 + echo "$as_me:16156: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15055: \"$ac_try\"") >&5 + { (eval echo "$as_me:16159: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15058: \$? = $ac_status" >&5 + echo "$as_me:16162: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -15071,23 +16175,23 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext esac fi -echo "$as_me:15074: result: $cf_cv_regex_hdrs" >&5 +echo "$as_me:16178: 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:15078: WARNING: no regular expression header found" >&5 -echo "$as_me: WARNING: no regular expression header found" >&2;} ;; #(vi - regex.h) +case $cf_cv_regex_hdrs in + (no) { echo "$as_me:16182: WARNING: no regular expression header found" >&5 +echo "$as_me: WARNING: no regular expression header found" >&2;} ;; + (regex.h) cat >>confdefs.h <<\EOF #define HAVE_REGEX_H_FUNCS 1 EOF - ;; #(vi - regexp.h) + ;; + (regexp.h) cat >>confdefs.h <<\EOF #define HAVE_REGEXP_H_FUNCS 1 EOF - ;; #(vi - regexpr.h) + ;; + (regexpr.h) cat >>confdefs.h <<\EOF #define HAVE_REGEXPR_H_FUNCS 1 EOF @@ -15114,23 +16218,23 @@ wctype.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:15117: checking for $ac_header" >&5 +echo "$as_me:16221: 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 15123 "configure" +#line 16227 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:15127: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16231: \"$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:15133: \$? = $ac_status" >&5 + echo "$as_me:16237: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15149,7 +16253,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:15152: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16256: 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:16269: 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 15171 "configure" +#line 16275 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:15175: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16279: \"$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:15181: \$? = $ac_status" >&5 + echo "$as_me:16285: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15197,7 +16301,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:15200: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16304: 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:16314: 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 @@ -15217,7 +16321,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 15220 "configure" +#line 16324 "configure" #include "confdefs.h" #include <$cf_header> @@ -15230,16 +16334,16 @@ int x = optind; char *y = optarg } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15233: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16337: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15236: \$? = $ac_status" >&5 + echo "$as_me:16340: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15239: \"$ac_try\"") >&5 + { (eval echo "$as_me:16343: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15242: \$? = $ac_status" >&5 + echo "$as_me:16346: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_getopt_header=$cf_header break @@ -15251,7 +16355,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:15254: result: $cf_cv_getopt_header" >&5 +echo "$as_me:16358: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test $cf_cv_getopt_header != none ; then @@ -15272,7 +16376,7 @@ fi # Note: even non-Posix ISC needs to declare fd_set if test "x$ISC" = xyes ; then -echo "$as_me:15275: checking for main in -lcposix" >&5 +echo "$as_me:16379: 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 @@ -15280,7 +16384,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15283 "configure" +#line 16387 "configure" #include "confdefs.h" int @@ -15292,16 +16396,16 @@ main (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15295: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16399: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15298: \$? = $ac_status" >&5 + echo "$as_me:16402: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15301: \"$ac_try\"") >&5 + { (eval echo "$as_me:16405: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15304: \$? = $ac_status" >&5 + echo "$as_me:16408: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cposix_main=yes else @@ -15312,7 +16416,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15315: result: $ac_cv_lib_cposix_main" >&5 +echo "$as_me:16419: 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:16430: 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 @@ -15331,7 +16435,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-linet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15334 "configure" +#line 16438 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15350,16 +16454,16 @@ bzero (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15353: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16457: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15356: \$? = $ac_status" >&5 + echo "$as_me:16460: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15359: \"$ac_try\"") >&5 + { (eval echo "$as_me:16463: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15362: \$? = $ac_status" >&5 + echo "$as_me:16466: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_inet_bzero=yes else @@ -15370,7 +16474,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15373: result: $ac_cv_lib_inet_bzero" >&5 +echo "$as_me:16477: 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 @@ -15393,14 +16497,14 @@ LIBS="$cf_add_libs" fi fi -echo "$as_me:15396: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:16500: 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 15403 "configure" +#line 16507 "configure" #include "confdefs.h" #include @@ -15420,16 +16524,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15423: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16527: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15426: \$? = $ac_status" >&5 + echo "$as_me:16530: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15429: \"$ac_try\"") >&5 + { (eval echo "$as_me:16533: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15432: \$? = $ac_status" >&5 + echo "$as_me:16536: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sys_time_select=yes else @@ -15441,7 +16545,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15444: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:16548: 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 @@ -15456,13 +16560,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:15459: checking for an ANSI C-conforming const" >&5 +echo "$as_me:16563: 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 15465 "configure" +#line 16569 "configure" #include "confdefs.h" int @@ -15520,16 +16624,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15523: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16627: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15526: \$? = $ac_status" >&5 + echo "$as_me:16630: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15529: \"$ac_try\"") >&5 + { (eval echo "$as_me:16633: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15532: \$? = $ac_status" >&5 + echo "$as_me:16636: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -15539,7 +16643,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15542: result: $ac_cv_c_const" >&5 +echo "$as_me:16646: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -15549,7 +16653,7 @@ EOF fi -echo "$as_me:15552: checking for inline" >&5 +echo "$as_me:16656: 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 @@ -15557,7 +16661,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 15560 "configure" +#line 16664 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -15566,16 +16670,16 @@ $ac_kw int foo () {return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15569: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16673: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15572: \$? = $ac_status" >&5 + echo "$as_me:16676: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15575: \"$ac_try\"") >&5 + { (eval echo "$as_me:16679: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15578: \$? = $ac_status" >&5 + echo "$as_me:16682: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -15586,7 +16690,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:15589: result: $ac_cv_c_inline" >&5 +echo "$as_me:16693: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -15603,25 +16707,25 @@ esac 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:15615: checking if $CC supports options to tune inlining" >&5 + NCURSES_INLINE=inline + if test "$INTEL_COMPILER" = yes + then + : + elif test "$CLANG_COMPILER" = yes + then + : + elif test "$GCC" = yes + then + echo "$as_me:16719: 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 else - cf_save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS --param max-inline-insns-single=1200" - cat >conftest.$ac_ext <<_ACEOF -#line 15624 "configure" + cf_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS --param max-inline-insns-single=1200" + cat >conftest.$ac_ext <<_ACEOF +#line 16728 "configure" #include "confdefs.h" inline int foo(void) { return 1; } int @@ -15633,16 +16737,16 @@ ${cf_cv_main_return:-return} foo() } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15636: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16740: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15639: \$? = $ac_status" >&5 + echo "$as_me:16743: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15642: \"$ac_try\"") >&5 + { (eval echo "$as_me:16746: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15645: \$? = $ac_status" >&5 + echo "$as_me:16749: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gcc_inline=yes else @@ -15651,12 +16755,12 @@ cat conftest.$ac_ext >&5 cf_cv_gcc_inline=no fi rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS=$cf_save_CFLAGS + CFLAGS=$cf_save_CFLAGS fi -echo "$as_me:15657: result: $cf_cv_gcc_inline" >&5 +echo "$as_me:16761: result: $cf_cv_gcc_inline" >&5 echo "${ECHO_T}$cf_cv_gcc_inline" >&6 - if test "$cf_cv_gcc_inline" = yes ; then + if test "$cf_cv_gcc_inline" = yes ; then cf_fix_cppflags=no cf_new_cflags= @@ -15666,11 +16770,11 @@ cf_new_extra_cppflags= for cf_add_cflags in --param max-inline-insns-single=1200 do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -15678,20 +16782,26 @@ no) && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue fi ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -15700,17 +16810,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + ;; esac ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + ;; esac ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` @@ -15723,24 +16841,30 @@ done if test -n "$cf_new_cflags" ; then - CFLAGS="$CFLAGS $cf_new_cflags" + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + fi if test -n "$cf_new_cppflags" ; then - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + fi if test -n "$cf_new_extra_cppflags" ; then - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + fi - fi - fi + fi + fi fi -echo "$as_me:15743: checking for signal global datatype" >&5 +echo "$as_me:16867: 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 @@ -15752,7 +16876,7 @@ else "int" do cat >conftest.$ac_ext <<_ACEOF -#line 15755 "configure" +#line 16879 "configure" #include "confdefs.h" #include @@ -15775,16 +16899,16 @@ signal(SIGINT, handler); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15778: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16902: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15781: \$? = $ac_status" >&5 + echo "$as_me:16905: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15784: \"$ac_try\"") >&5 + { (eval echo "$as_me:16908: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15787: \$? = $ac_status" >&5 + echo "$as_me:16911: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -15798,7 +16922,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15801: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:16925: result: $cf_cv_sig_atomic_t" >&5 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <&5 +echo "$as_me:16934: 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 @@ -15817,12 +16941,12 @@ else cf_cv_typeof_chtype=long else cat >conftest.$ac_ext <<_ACEOF -#line 15820 "configure" +#line 16944 "configure" #include "confdefs.h" #define WANT_BITS 31 #include -int main() +int main(void) { FILE *fp = fopen("cf_test.out", "w"); if (fp != 0) { @@ -15852,15 +16976,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15855: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16979: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15858: \$? = $ac_status" >&5 + echo "$as_me:16982: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15860: \"$ac_try\"") >&5 + { (eval echo "$as_me:16984: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15863: \$? = $ac_status" >&5 + echo "$as_me:16987: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_typeof_chtype=`cat cf_test.out` else @@ -15875,7 +16999,7 @@ fi fi -echo "$as_me:15878: result: $cf_cv_typeof_chtype" >&5 +echo "$as_me:17002: result: $cf_cv_typeof_chtype" >&5 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 cat >>confdefs.h <&5 +echo "$as_me:17014: 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 15897 "configure" +#line 17021 "configure" #include "confdefs.h" int @@ -15906,16 +17030,16 @@ long x = 1L + 1UL + 1U + 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15909: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17033: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15912: \$? = $ac_status" >&5 + echo "$as_me:17036: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15915: \"$ac_try\"") >&5 + { (eval echo "$as_me:17039: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15918: \$? = $ac_status" >&5 + echo "$as_me:17042: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_unsigned_literals=yes else @@ -15927,7 +17051,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15930: result: $cf_cv_unsigned_literals" >&5 +echo "$as_me:17054: result: $cf_cv_unsigned_literals" >&5 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 cf_cv_1UL="1" @@ -15943,14 +17067,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t="" ### Checks for external-data -echo "$as_me:15946: checking if external errno is declared" >&5 +echo "$as_me:17070: 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 15953 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 17077 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -15968,16 +17092,16 @@ int x = (int) errno } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15971: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17095: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15974: \$? = $ac_status" >&5 + echo "$as_me:17098: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15977: \"$ac_try\"") >&5 + { (eval echo "$as_me:17101: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15980: \$? = $ac_status" >&5 + echo "$as_me:17104: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_errno=yes else @@ -15988,14 +17112,14 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15991: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:17115: result: $cf_cv_dcl_errno" >&5 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then cf_result=`echo "decl_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >>confdefs.h <>confdefs.h <&5 +echo "$as_me:17130: 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 16013 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 17137 "configure" #include "confdefs.h" #undef errno @@ -16025,16 +17149,16 @@ errno = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16028: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17152: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16031: \$? = $ac_status" >&5 + echo "$as_me:17155: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16034: \"$ac_try\"") >&5 + { (eval echo "$as_me:17158: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16037: \$? = $ac_status" >&5 + echo "$as_me:17161: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_errno=yes else @@ -16045,20 +17169,20 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16048: result: $cf_cv_have_errno" >&5 +echo "$as_me:17172: result: $cf_cv_have_errno" >&5 echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then cf_result=`echo "have_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >>confdefs.h <>confdefs.h <&5 +echo "$as_me:17185: 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 @@ -16066,20 +17190,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:17196: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16075: \$? = $ac_status" >&5 + echo "$as_me:17199: \$? = $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:17219: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16098: \$? = $ac_status" >&5 + echo "$as_me:17222: \$? = $ac_status" >&5 (exit $ac_status); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -16108,10 +17232,10 @@ EOF cf_cv_link_dataonly=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 16111 "configure" +#line 17235 "configure" #include "confdefs.h" - int main() + int main(void) { extern int testfunc(); ${cf_cv_main_return:-return} (!testfunc()); @@ -16119,15 +17243,15 @@ else _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16122: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17246: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16125: \$? = $ac_status" >&5 + echo "$as_me:17249: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16127: \"$ac_try\"") >&5 + { (eval echo "$as_me:17251: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16130: \$? = $ac_status" >&5 + echo "$as_me:17254: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_dataonly=yes else @@ -16142,7 +17266,7 @@ fi fi -echo "$as_me:16145: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:17269: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -16181,13 +17305,13 @@ vsnprintf \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:16184: checking for $ac_func" >&5 +echo "$as_me:17308: 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 16190 "configure" +#line 17314 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -16218,16 +17342,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:16221: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17345: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16224: \$? = $ac_status" >&5 + echo "$as_me:17348: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16227: \"$ac_try\"") >&5 + { (eval echo "$as_me:17351: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16230: \$? = $ac_status" >&5 + echo "$as_me:17354: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -16237,7 +17361,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16240: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:17364: 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:17376: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi if test "x$with_getcap" = "xyes" ; then -echo "$as_me:16259: checking for terminal-capability database functions" >&5 +echo "$as_me:17383: 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 16266 "configure" +#line 17390 "configure" #include "confdefs.h" #include @@ -16283,16 +17407,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16286: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17410: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16289: \$? = $ac_status" >&5 + echo "$as_me:17413: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16292: \"$ac_try\"") >&5 + { (eval echo "$as_me:17416: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16295: \$? = $ac_status" >&5 + echo "$as_me:17419: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent=yes else @@ -16303,7 +17427,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16306: result: $cf_cv_cgetent" >&5 +echo "$as_me:17430: result: $cf_cv_cgetent" >&5 echo "${ECHO_T}$cf_cv_cgetent" >&6 if test "$cf_cv_cgetent" = yes @@ -16313,16 +17437,17 @@ cat >>confdefs.h <<\EOF #define HAVE_BSD_CGETENT 1 EOF -echo "$as_me:16316: checking if cgetent uses const parameter" >&5 +echo "$as_me:17440: 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 16323 "configure" +#line 17447 "configure" #include "confdefs.h" +#pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" #include int main () @@ -16342,16 +17467,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16345: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17470: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16348: \$? = $ac_status" >&5 + echo "$as_me:17473: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16351: \"$ac_try\"") >&5 + { (eval echo "$as_me:17476: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16354: \$? = $ac_status" >&5 + echo "$as_me:17479: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent_const=yes else @@ -16362,7 +17487,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16365: result: $cf_cv_cgetent_const" >&5 +echo "$as_me:17490: result: $cf_cv_cgetent_const" >&5 echo "${ECHO_T}$cf_cv_cgetent_const" >&6 if test "$cf_cv_cgetent_const" = yes then @@ -16376,14 +17501,14 @@ fi fi -echo "$as_me:16379: checking for isascii" >&5 +echo "$as_me:17504: 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 16386 "configure" +#line 17511 "configure" #include "confdefs.h" #include int @@ -16395,16 +17520,16 @@ int x = isascii(' ') } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16398: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17523: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16401: \$? = $ac_status" >&5 + echo "$as_me:17526: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16404: \"$ac_try\"") >&5 + { (eval echo "$as_me:17529: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16407: \$? = $ac_status" >&5 + echo "$as_me:17532: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_isascii=yes else @@ -16415,7 +17540,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16418: result: $cf_cv_have_isascii" >&5 +echo "$as_me:17543: result: $cf_cv_have_isascii" >&5 echo "${ECHO_T}$cf_cv_have_isascii" >&6 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF @@ -16423,10 +17548,10 @@ cat >>confdefs.h <<\EOF EOF if test "$ac_cv_func_sigaction" = yes; then -echo "$as_me:16426: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "$as_me:17551: 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 16429 "configure" +#line 17554 "configure" #include "confdefs.h" #include @@ -16440,16 +17565,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16443: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17568: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16446: \$? = $ac_status" >&5 + echo "$as_me:17571: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16449: \"$ac_try\"") >&5 + { (eval echo "$as_me:17574: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16452: \$? = $ac_status" >&5 + echo "$as_me:17577: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=no else @@ -16457,7 +17582,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 16460 "configure" +#line 17585 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -16472,16 +17597,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16475: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17600: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16478: \$? = $ac_status" >&5 + echo "$as_me:17603: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16481: \"$ac_try\"") >&5 + { (eval echo "$as_me:17606: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16484: \$? = $ac_status" >&5 + echo "$as_me:17609: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=yes @@ -16497,11 +17622,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:16500: result: $sigact_bad" >&5 +echo "$as_me:17625: result: $sigact_bad" >&5 echo "${ECHO_T}$sigact_bad" >&6 fi -echo "$as_me:16504: checking if nanosleep really works" >&5 +echo "$as_me:17629: 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 @@ -16511,7 +17636,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_nanosleep=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 16514 "configure" +#line 17639 "configure" #include "confdefs.h" #include @@ -16522,7 +17647,7 @@ else #include #endif -int main() { +int main(void) { struct timespec ts1, ts2; int code; ts1.tv_sec = 0; @@ -16536,15 +17661,15 @@ int main() { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16539: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17664: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16542: \$? = $ac_status" >&5 + echo "$as_me:17667: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16544: \"$ac_try\"") >&5 + { (eval echo "$as_me:17669: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16547: \$? = $ac_status" >&5 + echo "$as_me:17672: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_nanosleep=yes else @@ -16556,7 +17681,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:16559: result: $cf_cv_func_nanosleep" >&5 +echo "$as_me:17684: result: $cf_cv_func_nanosleep" >&5 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 test "$cf_cv_func_nanosleep" = "yes" && @@ -16571,23 +17696,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:16574: checking for $ac_header" >&5 +echo "$as_me:17699: 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 16580 "configure" +#line 17705 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:16584: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:17709: \"$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:16590: \$? = $ac_status" >&5 + echo "$as_me:17715: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16606,7 +17731,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:16609: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:17734: 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:17749: 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 16630 "configure" +#line 17755 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:16634: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:17759: \"$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:16640: \$? = $ac_status" >&5 + echo "$as_me:17765: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16656,7 +17781,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:16659: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:17784: 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:17802: 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 16680 "configure" +#line 17805 "configure" #include "confdefs.h" #include int @@ -16689,16 +17814,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16692: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17817: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16695: \$? = $ac_status" >&5 + echo "$as_me:17820: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16698: \"$ac_try\"") >&5 + { (eval echo "$as_me:17823: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16701: \$? = $ac_status" >&5 + echo "$as_me:17826: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=no else @@ -16706,7 +17831,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 16709 "configure" +#line 17834 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -16720,16 +17845,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16723: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17848: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16726: \$? = $ac_status" >&5 + echo "$as_me:17851: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16729: \"$ac_try\"") >&5 + { (eval echo "$as_me:17854: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16732: \$? = $ac_status" >&5 + echo "$as_me:17857: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=unknown else @@ -16745,19 +17870,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:16748: result: $termios_bad" >&5 + echo "$as_me:17873: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:16753: checking for tcgetattr" >&5 +echo "$as_me:17878: 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 16760 "configure" +#line 17885 "configure" #include "confdefs.h" #include @@ -16785,16 +17910,16 @@ tcgetattr(1, &foo); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16788: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17913: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16791: \$? = $ac_status" >&5 + echo "$as_me:17916: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16794: \"$ac_try\"") >&5 + { (eval echo "$as_me:17919: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16797: \$? = $ac_status" >&5 + echo "$as_me:17922: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_tcgetattr=yes else @@ -16804,21 +17929,21 @@ cf_cv_have_tcgetattr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16807: result: $cf_cv_have_tcgetattr" >&5 +echo "$as_me:17932: result: $cf_cv_have_tcgetattr" >&5 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF #define HAVE_TCGETATTR 1 EOF -echo "$as_me:16814: checking for vsscanf function or workaround" >&5 +echo "$as_me:17939: 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 16821 "configure" +#line 17946 "configure" #include "confdefs.h" #include @@ -16834,16 +17959,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16837: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17962: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16840: \$? = $ac_status" >&5 + echo "$as_me:17965: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16843: \"$ac_try\"") >&5 + { (eval echo "$as_me:17968: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16846: \$? = $ac_status" >&5 + echo "$as_me:17971: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vsscanf else @@ -16851,7 +17976,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 16854 "configure" +#line 17979 "configure" #include "confdefs.h" #include @@ -16860,29 +17985,29 @@ int main () { - FILE strbuf; - char *str = "from"; + FILE strbuf; + char *str = "from"; - strbuf._flag = _IOREAD; - strbuf._ptr = strbuf._base = (unsigned char *) str; - strbuf._cnt = strlen(str); - strbuf._file = _NFILE; - return (vfscanf(&strbuf, "%d", ap)) + strbuf._flag = _IOREAD; + strbuf._ptr = strbuf._base = (unsigned char *) str; + strbuf._cnt = strlen(str); + strbuf._file = _NFILE; + return (vfscanf(&strbuf, "%d", ap)) ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16876: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18001: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16879: \$? = $ac_status" >&5 + echo "$as_me:18004: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16882: \"$ac_try\"") >&5 + { (eval echo "$as_me:18007: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16885: \$? = $ac_status" >&5 + echo "$as_me:18010: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vfscanf else @@ -16890,7 +18015,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 16893 "configure" +#line 18018 "configure" #include "confdefs.h" #include @@ -16899,29 +18024,29 @@ int main () { - FILE strbuf; - char *str = "from"; + FILE strbuf; + char *str = "from"; - strbuf._flag = _IOREAD; - strbuf._ptr = strbuf._base = (unsigned char *) str; - strbuf._cnt = strlen(str); - strbuf._file = _NFILE; - return (_doscan(&strbuf, "%d", ap)) + strbuf._flag = _IOREAD; + strbuf._ptr = strbuf._base = (unsigned char *) str; + strbuf._cnt = strlen(str); + strbuf._file = _NFILE; + return (_doscan(&strbuf, "%d", ap)) ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16915: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18040: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16918: \$? = $ac_status" >&5 + echo "$as_me:18043: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16921: \"$ac_try\"") >&5 + { (eval echo "$as_me:18046: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16924: \$? = $ac_status" >&5 + echo "$as_me:18049: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=_doscan else @@ -16936,28 +18061,78 @@ 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:16939: result: $cf_cv_func_vsscanf" >&5 +echo "$as_me:18064: result: $cf_cv_func_vsscanf" >&5 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 -case $cf_cv_func_vsscanf in #(vi -vsscanf) +case $cf_cv_func_vsscanf in +(vsscanf) cat >>confdefs.h <<\EOF #define HAVE_VSSCANF 1 EOF -;; #(vi -vfscanf) +;; +(vfscanf) cat >>confdefs.h <<\EOF #define HAVE_VFSCANF 1 EOF -;; #(vi -_doscan) +;; +(_doscan) cat >>confdefs.h <<\EOF #define HAVE__DOSCAN 1 EOF ;; esac -echo "$as_me:16960: checking for working mkstemp" >&5 +for ac_header in \ +unistd.h \ + +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:18090: 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 18096 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:18100: \"$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:18106: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:18125: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 if test "${cf_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16968,15 +18143,18 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 16971 "configure" +#line 18146 "configure" #include "confdefs.h" #include +#ifdef HAVE_UNISTD_H +#include +#endif #include #include #include #include -int main() +int main(void) { char *tmpl = "conftestXXXXXX"; char name[2][80]; @@ -17006,15 +18184,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17009: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18187: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17012: \$? = $ac_status" >&5 + echo "$as_me:18190: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17014: \"$ac_try\"") >&5 + { (eval echo "$as_me:18192: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17017: \$? = $ac_status" >&5 + echo "$as_me:18195: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -17029,16 +18207,16 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:17032: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:18210: 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:17035: checking for mkstemp" >&5 + echo "$as_me:18213: 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 17041 "configure" +#line 18219 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mkstemp (); below. */ @@ -17069,16 +18247,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:17072: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18250: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17075: \$? = $ac_status" >&5 + echo "$as_me:18253: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17078: \"$ac_try\"") >&5 + { (eval echo "$as_me:18256: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17081: \$? = $ac_status" >&5 + echo "$as_me:18259: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -17088,7 +18266,7 @@ ac_cv_func_mkstemp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17091: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:18269: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -17109,21 +18287,21 @@ else fi if test "x$cross_compiling" = xyes ; then - { echo "$as_me:17112: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + { echo "$as_me:18290: 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:17115: checking whether setvbuf arguments are reversed" >&5 + echo "$as_me:18293: 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:17121: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:18299: 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 17126 "configure" +#line 18304 "configure" #include "confdefs.h" #include /* If setvbuf has the reversed format, exit 0. */ @@ -17140,15 +18318,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17143: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18321: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17146: \$? = $ac_status" >&5 + echo "$as_me:18324: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17148: \"$ac_try\"") >&5 + { (eval echo "$as_me:18326: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17151: \$? = $ac_status" >&5 + echo "$as_me:18329: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_setvbuf_reversed=yes else @@ -17161,7 +18339,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:17164: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "$as_me:18342: 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 @@ -17172,13 +18350,13 @@ EOF fi fi -echo "$as_me:17175: checking for intptr_t" >&5 +echo "$as_me:18353: 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 17181 "configure" +#line 18359 "configure" #include "confdefs.h" $ac_includes_default int @@ -17193,16 +18371,16 @@ if (sizeof (intptr_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17196: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18374: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17199: \$? = $ac_status" >&5 + echo "$as_me:18377: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17202: \"$ac_try\"") >&5 + { (eval echo "$as_me:18380: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17205: \$? = $ac_status" >&5 + echo "$as_me:18383: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_intptr_t=yes else @@ -17212,7 +18390,7 @@ ac_cv_type_intptr_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:17215: result: $ac_cv_type_intptr_t" >&5 +echo "$as_me:18393: 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 : @@ -17224,14 +18402,66 @@ EOF fi -echo "$as_me:17227: checking for type sigaction_t" >&5 +echo "$as_me:18405: checking for ssize_t" >&5 +echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 +if test "${ac_cv_type_ssize_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 18411 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((ssize_t *) 0) + return 0; +if (sizeof (ssize_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:18426: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:18429: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:18432: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18435: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_ssize_t=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_ssize_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:18445: result: $ac_cv_type_ssize_t" >&5 +echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 +if test $ac_cv_type_ssize_t = yes; then + : +else + +cat >>confdefs.h <&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 17234 "configure" +#line 18464 "configure" #include "confdefs.h" #include @@ -17244,16 +18474,16 @@ sigaction_t x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17247: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18477: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17250: \$? = $ac_status" >&5 + echo "$as_me:18480: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17253: \"$ac_try\"") >&5 + { (eval echo "$as_me:18483: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17256: \$? = $ac_status" >&5 + echo "$as_me:18486: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_sigaction=yes else @@ -17264,29 +18494,29 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:17267: result: $cf_cv_type_sigaction" >&5 +echo "$as_me:18497: result: $cf_cv_type_sigaction" >&5 echo "${ECHO_T}$cf_cv_type_sigaction" >&6 test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF #define HAVE_TYPE_SIGACTION 1 EOF -echo "$as_me:17274: checking declaration of size-change" >&5 +echo "$as_me:18504: 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 else - cf_cv_sizechange=unknown - cf_save_CPPFLAGS="$CPPFLAGS" + cf_cv_sizechange=unknown + cf_save_CPPFLAGS="$CPPFLAGS" for cf_opts in "" "NEED_PTEM_H" do - CPPFLAGS="$cf_save_CPPFLAGS" - test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" - cat >conftest.$ac_ext <<_ACEOF -#line 17289 "configure" + CPPFLAGS="$cf_save_CPPFLAGS" + test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" + cat >conftest.$ac_ext <<_ACEOF +#line 18519 "configure" #include "confdefs.h" #include #ifdef HAVE_TERMIOS_H @@ -17330,16 +18560,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17333: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18563: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17336: \$? = $ac_status" >&5 + echo "$as_me:18566: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17339: \"$ac_try\"") >&5 + { (eval echo "$as_me:18569: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17342: \$? = $ac_status" >&5 + echo "$as_me:18572: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sizechange=yes else @@ -17358,7 +18588,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:17361: result: $cf_cv_sizechange" >&5 +echo "$as_me:18591: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then @@ -17366,8 +18596,8 @@ cat >>confdefs.h <<\EOF #define HAVE_SIZECHANGE 1 EOF - case $cf_cv_sizechange in #(vi - NEED*) + case $cf_cv_sizechange in + (NEED*) cat >>confdefs.h <&5 +echo "$as_me:18609: 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 17385 "configure" +#line 18615 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char memmove (); below. */ @@ -17413,16 +18643,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:17416: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18646: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17419: \$? = $ac_status" >&5 + echo "$as_me:18649: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17422: \"$ac_try\"") >&5 + { (eval echo "$as_me:18652: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17425: \$? = $ac_status" >&5 + echo "$as_me:18655: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_memmove=yes else @@ -17432,19 +18662,19 @@ ac_cv_func_memmove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17435: result: $ac_cv_func_memmove" >&5 +echo "$as_me:18665: 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:17441: checking for bcopy" >&5 +echo "$as_me:18671: 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 17447 "configure" +#line 18677 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char bcopy (); below. */ @@ -17475,16 +18705,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:17478: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18708: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17481: \$? = $ac_status" >&5 + echo "$as_me:18711: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17484: \"$ac_try\"") >&5 + { (eval echo "$as_me:18714: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17487: \$? = $ac_status" >&5 + echo "$as_me:18717: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_bcopy=yes else @@ -17494,11 +18724,11 @@ ac_cv_func_bcopy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17497: result: $ac_cv_func_bcopy" >&5 +echo "$as_me:18727: 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:17501: checking if bcopy does overlapping moves" >&5 + echo "$as_me:18731: 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 @@ -17508,10 +18738,10 @@ else cf_cv_good_bcopy=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 17511 "configure" +#line 18741 "configure" #include "confdefs.h" -int main() { +int main(void) { static char data[] = "abcdefghijklmnopqrstuwwxyz"; char temp[40]; bcopy(data, temp, sizeof(data)); @@ -17522,15 +18752,15 @@ int main() { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17525: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18755: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17528: \$? = $ac_status" >&5 + echo "$as_me:18758: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17530: \"$ac_try\"") >&5 + { (eval echo "$as_me:18760: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17533: \$? = $ac_status" >&5 + echo "$as_me:18763: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_good_bcopy=yes else @@ -17543,7 +18773,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:17546: result: $cf_cv_good_bcopy" >&5 +echo "$as_me:18776: result: $cf_cv_good_bcopy" >&5 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 else @@ -17562,11 +18792,81 @@ cat >>confdefs.h <<\EOF #define USE_MY_MEMMOVE 1 EOF - fi - + fi + +fi + +tty 2>&1 >/dev/null || { +for ac_func in posix_openpt +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:18803: 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 18809 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +#include +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); + +int +main () +{ +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:18840: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:18843: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:18846: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18849: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:18859: 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 +done + } +echo "$as_me:18869: 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 @@ -17576,7 +18876,7 @@ if test "$cross_compiling" = yes; then cf_cv_working_poll=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 17579 "configure" +#line 18879 "configure" #include "confdefs.h" #include @@ -17588,7 +18888,7 @@ else #else #include #endif -int main() { +int main(void) { struct pollfd myfds; int ret; @@ -17608,6 +18908,11 @@ int main() { if (!isatty(fd)) { fd = open("/dev/tty", 2); /* O_RDWR */ } +#ifdef HAVE_POSIX_OPENPT + if (fd < 0) { + fd = posix_openpt(O_RDWR); + } +#endif if (fd >= 0) { /* also check with standard input */ @@ -17623,15 +18928,15 @@ int main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17626: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18931: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17629: \$? = $ac_status" >&5 + echo "$as_me:18934: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17631: \"$ac_try\"") >&5 + { (eval echo "$as_me:18936: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17634: \$? = $ac_status" >&5 + echo "$as_me:18939: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_working_poll=yes else @@ -17643,21 +18948,21 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:17646: result: $cf_cv_working_poll" >&5 +echo "$as_me:18951: result: $cf_cv_working_poll" >&5 echo "${ECHO_T}$cf_cv_working_poll" >&6 test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF #define HAVE_WORKING_POLL 1 EOF -echo "$as_me:17653: checking for va_copy" >&5 +echo "$as_me:18958: 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 17660 "configure" +#line 18965 "configure" #include "confdefs.h" #include @@ -17674,16 +18979,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17677: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18982: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17680: \$? = $ac_status" >&5 + echo "$as_me:18985: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17683: \"$ac_try\"") >&5 + { (eval echo "$as_me:18988: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17686: \$? = $ac_status" >&5 + echo "$as_me:18991: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_va_copy=yes else @@ -17693,7 +18998,7 @@ cf_cv_have_va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17696: result: $cf_cv_have_va_copy" >&5 +echo "$as_me:19001: result: $cf_cv_have_va_copy" >&5 echo "${ECHO_T}$cf_cv_have_va_copy" >&6 test "$cf_cv_have_va_copy" = yes && @@ -17701,14 +19006,14 @@ cat >>confdefs.h <<\EOF #define HAVE_VA_COPY 1 EOF -echo "$as_me:17704: checking for __va_copy" >&5 +echo "$as_me:19009: 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 17711 "configure" +#line 19016 "configure" #include "confdefs.h" #include @@ -17725,16 +19030,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17728: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19033: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17731: \$? = $ac_status" >&5 + echo "$as_me:19036: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17734: \"$ac_try\"") >&5 + { (eval echo "$as_me:19039: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17737: \$? = $ac_status" >&5 + echo "$as_me:19042: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have___va_copy=yes else @@ -17744,7 +19049,7 @@ cf_cv_have___va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17747: result: $cf_cv_have___va_copy" >&5 +echo "$as_me:19052: result: $cf_cv_have___va_copy" >&5 echo "${ECHO_T}$cf_cv_have___va_copy" >&6 test "$cf_cv_have___va_copy" = yes && @@ -17752,13 +19057,13 @@ cat >>confdefs.h <<\EOF #define HAVE___VA_COPY 1 EOF -echo "$as_me:17755: checking for pid_t" >&5 +echo "$as_me:19060: 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 17761 "configure" +#line 19066 "configure" #include "confdefs.h" $ac_includes_default int @@ -17773,16 +19078,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17776: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19081: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17779: \$? = $ac_status" >&5 + echo "$as_me:19084: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17782: \"$ac_try\"") >&5 + { (eval echo "$as_me:19087: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17785: \$? = $ac_status" >&5 + echo "$as_me:19090: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -17792,7 +19097,7 @@ ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:17795: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:19100: 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 : @@ -17807,23 +19112,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:17810: checking for $ac_header" >&5 +echo "$as_me:19115: 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 17816 "configure" +#line 19121 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17820: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:19125: \"$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:17826: \$? = $ac_status" >&5 + echo "$as_me:19131: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17842,7 +19147,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17845: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:19150: 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:19163: 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 17864 "configure" +#line 19169 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -17892,16 +19197,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:17895: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19200: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17898: \$? = $ac_status" >&5 + echo "$as_me:19203: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17901: \"$ac_try\"") >&5 + { (eval echo "$as_me:19206: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17904: \$? = $ac_status" >&5 + echo "$as_me:19209: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -17911,7 +19216,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17914: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:19219: 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:19231: 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 @@ -17946,15 +19251,15 @@ else } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17949: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19254: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17952: \$? = $ac_status" >&5 + echo "$as_me:19257: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17954: \"$ac_try\"") >&5 + { (eval echo "$as_me:19259: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17957: \$? = $ac_status" >&5 + echo "$as_me:19262: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fork_works=yes else @@ -17966,7 +19271,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:17969: result: $ac_cv_func_fork_works" >&5 +echo "$as_me:19274: result: $ac_cv_func_fork_works" >&5 echo "${ECHO_T}$ac_cv_func_fork_works" >&6 fi @@ -17980,12 +19285,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:17983: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + { echo "$as_me:19288: 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:17988: checking for working vfork" >&5 + echo "$as_me:19293: 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 @@ -17994,7 +19299,7 @@ else ac_cv_func_vfork_works=cross else cat >conftest.$ac_ext <<_ACEOF -#line 17997 "configure" +#line 19302 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include @@ -18091,15 +19396,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18094: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19399: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18097: \$? = $ac_status" >&5 + echo "$as_me:19402: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18099: \"$ac_try\"") >&5 + { (eval echo "$as_me:19404: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18102: \$? = $ac_status" >&5 + echo "$as_me:19407: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_vfork_works=yes else @@ -18111,13 +19416,13 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:18114: result: $ac_cv_func_vfork_works" >&5 +echo "$as_me:19419: 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:18120: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + { echo "$as_me:19425: 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 @@ -18144,7 +19449,7 @@ fi # special check for test/ditto.c -echo "$as_me:18147: checking for openpty in -lutil" >&5 +echo "$as_me:19452: 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 @@ -18152,7 +19457,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18155 "configure" +#line 19460 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18171,16 +19476,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18174: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19479: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18177: \$? = $ac_status" >&5 + echo "$as_me:19482: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18180: \"$ac_try\"") >&5 + { (eval echo "$as_me:19485: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18183: \$? = $ac_status" >&5 + echo "$as_me:19488: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -18191,7 +19496,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18194: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:19499: 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 @@ -18199,14 +19504,14 @@ else cf_cv_lib_util=no fi -echo "$as_me:18202: checking for openpty header" >&5 +echo "$as_me:19507: 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 && + cf_save_LIBS="$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 @@ -18222,11 +19527,11 @@ do 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 18229 "configure" + } + for cf_header in pty.h libutil.h util.h + do + cat >conftest.$ac_ext <<_ACEOF +#line 19534 "configure" #include "confdefs.h" #include <$cf_header> @@ -18235,42 +19540,42 @@ int main () { - int x = openpty((int *)0, (int *)0, (char *)0, - (struct termios *)0, (struct winsize *)0); + int x = openpty((int *)0, (int *)0, (char *)0, + (struct termios *)0, (struct winsize *)0); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18246: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19551: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18249: \$? = $ac_status" >&5 + echo "$as_me:19554: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18252: \"$ac_try\"") >&5 + { (eval echo "$as_me:19557: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18255: \$? = $ac_status" >&5 + echo "$as_me:19560: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_func_openpty=$cf_header - break + cf_cv_func_openpty=$cf_header + break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - cf_cv_func_openpty=no + cf_cv_func_openpty=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - done - LIBS="$cf_save_LIBS" + done + LIBS="$cf_save_LIBS" fi -echo "$as_me:18273: result: $cf_cv_func_openpty" >&5 +echo "$as_me:19578: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -18283,7 +19588,7 @@ cat >>confdefs.h <<\EOF #define USE_XTERM_PTY 1 EOF - if test "x$cf_cv_lib_util" = xyes ; then + if test "x$cf_cv_lib_util" = xyes ; then cf_add_libs="-lutil" # Filter out duplicates - this happens with badly-designed ".pc" files... @@ -18301,7 +19606,7 @@ do done TEST_LIBS="$cf_add_libs" - fi + fi fi if test "$with_hashed_db" != no ; then @@ -18310,11 +19615,11 @@ cat >>confdefs.h <<\EOF #define USE_HASHED_DB 1 EOF -case $with_hashed_db in #(vi -yes|*able*) #(vi - ;; -*) - if test -d "$with_hashed_db" ; then +case $with_hashed_db in +(yes|*able*) + ;; +(*) + if test -d "$with_hashed_db" ; then if test -n "$with_hashed_db/include" ; then for cf_add_incdir in $with_hashed_db/include @@ -18340,7 +19645,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 18343 "configure" +#line 19648 "configure" #include "confdefs.h" #include int @@ -18352,16 +19657,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18355: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19660: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18358: \$? = $ac_status" >&5 + echo "$as_me:19663: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18361: \"$ac_try\"") >&5 + { (eval echo "$as_me:19666: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18364: \$? = $ac_status" >&5 + echo "$as_me:19669: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -18378,7 +19683,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}:18381: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:19686: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -18388,45 +19693,47 @@ echo "${as_me:-configure}:18381: testing adding $cf_add_incdir to include-path . else break fi + else + break fi done done fi if test -n "$with_hashed_db/lib" ; then - for cf_add_libdir in $with_hashed_db/lib - do - if test $cf_add_libdir = /usr/lib ; then - : - 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 + for cf_add_libdir in $with_hashed_db/lib + 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}:18415: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:19722: testing adding $cf_add_libdir to library-path ..." 1>&5 - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi else - case "$with_hashed_db" in #(vi - ./*|../*|/*) - { echo "$as_me:18426: WARNING: no such directory $with_hashed_db" >&5 + case "$with_hashed_db" in + (./*|../*|/*) + { echo "$as_me:19733: WARNING: no such directory $with_hashed_db" >&5 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} - ;; #(vi - *) + ;; + (*) cf_search= @@ -18465,8 +19772,8 @@ done for cf_item in $cf_search do - case $cf_item in #(vi - */$with_hashed_db) + case $cf_item in + (*/$with_hashed_db) if test -n "$cf_item" ; then for cf_add_incdir in $cf_item @@ -18492,7 +19799,7 @@ if test -n "$cf_item" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 18495 "configure" +#line 19802 "configure" #include "confdefs.h" #include int @@ -18504,16 +19811,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18507: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19814: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18510: \$? = $ac_status" >&5 + echo "$as_me:19817: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18513: \"$ac_try\"") >&5 + { (eval echo "$as_me:19820: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18516: \$? = $ac_status" >&5 + echo "$as_me:19823: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -18530,7 +19837,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}:18533: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:19840: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -18540,6 +19847,8 @@ echo "${as_me:-configure}:18533: testing adding $cf_add_incdir to include-path . else break fi + else + break fi done done @@ -18586,34 +19895,34 @@ done for cf_item in $cf_search do - case $cf_item in #(vi - */$with_hashed_db) + case $cf_item in + (*/$with_hashed_db) if test -n "$cf_item" ; then - for cf_add_libdir in $cf_item - do - if test $cf_add_libdir = /usr/lib ; then - : - 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 + 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}:18611: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:19920: testing adding $cf_add_libdir to library-path ..." 1>&5 - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi ;; @@ -18622,26 +19931,26 @@ fi ;; esac - fi + fi esac -echo "$as_me:18628: checking for db.h" >&5 +echo "$as_me:19937: 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 18634 "configure" +#line 19943 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18638: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:19947: \"$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:18644: \$? = $ac_status" >&5 + echo "$as_me:19953: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18660,11 +19969,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18663: result: $ac_cv_header_db_h" >&5 +echo "$as_me:19972: 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:18667: checking for version of db" >&5 +echo "$as_me:19976: 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 @@ -18675,10 +19984,10 @@ cf_cv_hashed_db_version=unknown for cf_db_version in 1 2 3 4 5 6 do -echo "${as_me:-configure}:18678: testing checking for db version $cf_db_version ..." 1>&5 +echo "${as_me:-configure}:19987: testing checking for db version $cf_db_version ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 18681 "configure" +#line 19990 "configure" #include "confdefs.h" $ac_includes_default @@ -18708,16 +20017,16 @@ DBT *foo = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18711: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20020: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18714: \$? = $ac_status" >&5 + echo "$as_me:20023: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18717: \"$ac_try\"") >&5 + { (eval echo "$as_me:20026: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18720: \$? = $ac_status" >&5 + echo "$as_me:20029: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_hashed_db_version=$cf_db_version @@ -18731,16 +20040,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:18734: result: $cf_cv_hashed_db_version" >&5 +echo "$as_me:20043: 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:18738: error: Cannot determine version of db" >&5 + { { echo "$as_me:20047: 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:18743: checking for db libraries" >&5 +echo "$as_me:20052: 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 @@ -18770,10 +20079,10 @@ LIBS="$cf_add_libs" fi -echo "${as_me:-configure}:18773: testing checking for library "$cf_db_libs" ..." 1>&5 +echo "${as_me:-configure}:20082: testing checking for library "$cf_db_libs" ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 18776 "configure" +#line 20085 "configure" #include "confdefs.h" $ac_includes_default @@ -18828,16 +20137,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18831: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20140: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18834: \$? = $ac_status" >&5 + echo "$as_me:20143: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18837: \"$ac_try\"") >&5 + { (eval echo "$as_me:20146: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18840: \$? = $ac_status" >&5 + echo "$as_me:20149: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test -n "$cf_db_libs" ; then @@ -18857,11 +20166,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:18860: result: $cf_cv_hashed_db_libs" >&5 +echo "$as_me:20169: 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:18864: error: Cannot determine library for db" >&5 + { { echo "$as_me:20173: 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 @@ -18887,7 +20196,7 @@ fi else - { { echo "$as_me:18890: error: Cannot find db.h" >&5 + { { echo "$as_me:20199: error: Cannot find db.h" >&5 echo "$as_me: error: Cannot find db.h" >&2;} { (exit 1); exit 1; }; } @@ -18902,7 +20211,7 @@ fi # Just in case, check if the C compiler has a bool type. -echo "$as_me:18905: checking if we should include stdbool.h" >&5 +echo "$as_me:20214: 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 @@ -18910,7 +20219,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 18913 "configure" +#line 20222 "configure" #include "confdefs.h" int @@ -18922,23 +20231,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18925: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20234: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18928: \$? = $ac_status" >&5 + echo "$as_me:20237: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18931: \"$ac_try\"") >&5 + { (eval echo "$as_me:20240: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18934: \$? = $ac_status" >&5 + echo "$as_me:20243: \$? = $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 18941 "configure" +#line 20250 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -18954,16 +20263,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18957: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20266: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18960: \$? = $ac_status" >&5 + echo "$as_me:20269: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18963: \"$ac_try\"") >&5 + { (eval echo "$as_me:20272: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18966: \$? = $ac_status" >&5 + echo "$as_me:20275: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -18977,13 +20286,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:18980: result: yes" >&5 +then echo "$as_me:20289: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:18982: result: no" >&5 +else echo "$as_me:20291: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:18986: checking for builtin bool type" >&5 +echo "$as_me:20295: 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 @@ -18991,7 +20300,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 18994 "configure" +#line 20303 "configure" #include "confdefs.h" #include @@ -19006,16 +20315,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19009: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20318: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19012: \$? = $ac_status" >&5 + echo "$as_me:20321: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19015: \"$ac_try\"") >&5 + { (eval echo "$as_me:20324: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19018: \$? = $ac_status" >&5 + echo "$as_me:20327: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cc_bool_type=1 else @@ -19028,9 +20337,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_cc_bool_type" = 1 -then echo "$as_me:19031: result: yes" >&5 +then echo "$as_me:20340: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:19033: result: no" >&5 +else echo "$as_me:20342: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -19044,21 +20353,71 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return if test -n "$GXX" ; then -case $cf_cv_system_name in #(vi -os2*) #(vi - cf_stdcpp_libname=stdcpp - ;; -*) - cf_stdcpp_libname=stdc++ - ;; -esac -echo "$as_me:19055: checking for library $cf_stdcpp_libname" >&5 + + cf_save="$LIBS" + LIBS="$LIBS $CXXLIBS" + echo "$as_me:20359: checking if we already have C++ library" >&5 +echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 20362 "configure" +#include "confdefs.h" + + #include +int +main () +{ + + std::cout << "Hello World!" << std::endl; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:20376: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:20379: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:20382: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:20385: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_libstdcpp=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_libstdcpp=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:20394: result: $cf_have_libstdcpp" >&5 +echo "${ECHO_T}$cf_have_libstdcpp" >&6 + LIBS="$cf_save" + + if test $cf_have_libstdcpp != yes + then + case $cf_cv_system_name in + (os2*) + if test -z "`g++ -dM -E - < /dev/null | grep __KLIBC__`"; then + cf_stdcpp_libname=stdcpp + else + cf_stdcpp_libname=stdc++ + fi + ;; + (*) + cf_stdcpp_libname=stdc++ + ;; + esac + + echo "$as_me:20413: 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" + cf_save="$LIBS" + LIBS="$LIBS $CXXLIBS" cf_add_libs="-l$cf_stdcpp_libname" # Filter out duplicates - this happens with badly-designed ".pc" files... @@ -19076,33 +20435,31 @@ do done LIBS="$cf_add_libs" -cat >conftest.$ac_ext <<_ACEOF -#line 19080 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 20439 "configure" #include "confdefs.h" -#include + #include int main () { -char buf[80]; -strstreambuf foo(buf, sizeof(buf)) - + std::cout << "Hello World!" << std::endl; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19096: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20453: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19099: \$? = $ac_status" >&5 + echo "$as_me:20456: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19102: \"$ac_try\"") >&5 + { (eval echo "$as_me:20459: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19105: \$? = $ac_status" >&5 + echo "$as_me:20462: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_libstdcpp=yes else @@ -19111,12 +20468,12 @@ cat conftest.$ac_ext >&5 cf_cv_libstdcpp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS="$cf_save" + LIBS="$cf_save" fi -echo "$as_me:19117: result: $cf_cv_libstdcpp" >&5 +echo "$as_me:20474: result: $cf_cv_libstdcpp" >&5 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 -test "$cf_cv_libstdcpp" = yes && + 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 @@ -19132,34 +20489,34 @@ do test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" done CXXLIBS="$cf_add_libs" - + } + fi fi - echo "$as_me:19138: checking whether $CXX understands -c and -o together" >&5 + echo "$as_me:20496: 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 else cat > conftest.$ac_ext < -int main() +int main(void) { ${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='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:19154: \"$ac_try\"") >&5 +ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +if { (eval echo "$as_me:20511: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19157: \$? = $ac_status" >&5 + echo "$as_me:20514: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:19159: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:20516: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19162: \$? = $ac_status" >&5 + echo "$as_me:20519: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CXX_c_o=yes @@ -19170,30 +20527,30 @@ rm -rf conftest* fi if test $cf_cv_prog_CXX_c_o = yes; then - echo "$as_me:19173: result: yes" >&5 + echo "$as_me:20530: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:19176: result: no" >&5 + echo "$as_me:20533: result: no" >&5 echo "${ECHO_T}no" >&6 fi case $GXX_VERSION in - 1*|2.0-6*) + (1*|2.0-6*) cf_cxx_library=yes ;; - *-2.7*|2.7*) + (*-2.7*|2.7*) cf_cxx_library=unknown -case $cf_cv_system_name in #(vi -os2*) #(vi +case $cf_cv_system_name in +(os2*) cf_gpp_libname=gpp ;; -*) +(*) cf_gpp_libname=g++ ;; esac if test "$GXX" = yes; then - echo "$as_me:19196: checking for lib$cf_gpp_libname" >&5 + echo "$as_me:20553: checking for lib$cf_gpp_libname" >&5 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 cf_save="$LIBS" @@ -19214,7 +20571,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 19217 "configure" +#line 20574 "configure" #include "confdefs.h" #include <$cf_gpp_libname/builtin.h> @@ -19228,16 +20585,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19231: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20588: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19234: \$? = $ac_status" >&5 + echo "$as_me:20591: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19237: \"$ac_try\"") >&5 + { (eval echo "$as_me:20594: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19240: \$? = $ac_status" >&5 + echo "$as_me:20597: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes @@ -19274,7 +20631,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 19277 "configure" +#line 20634 "configure" #include "confdefs.h" #include @@ -19288,16 +20645,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19291: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20648: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19294: \$? = $ac_status" >&5 + echo "$as_me:20651: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19297: \"$ac_try\"") >&5 + { (eval echo "$as_me:20654: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19300: \$? = $ac_status" >&5 + echo "$as_me:20657: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes @@ -19330,12 +20687,12 @@ 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:19333: result: $cf_cxx_library" >&5 + echo "$as_me:20690: result: $cf_cxx_library" >&5 echo "${ECHO_T}$cf_cxx_library" >&6 fi ;; - *) + (*) cf_cxx_library=no ;; esac @@ -19346,7 +20703,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:19349: checking how to run the C++ preprocessor" >&5 +echo "$as_me:20706: 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 @@ -19363,18 +20720,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 19366 "configure" +#line 20723 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:19371: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20728: \"$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:19377: \$? = $ac_status" >&5 + echo "$as_me:20734: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -19397,17 +20754,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 19400 "configure" +#line 20757 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:19404: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20761: \"$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:19410: \$? = $ac_status" >&5 + echo "$as_me:20767: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -19444,7 +20801,7 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:19447: result: $CXXCPP" >&5 +echo "$as_me:20804: result: $CXXCPP" >&5 echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -19454,18 +20811,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 19457 "configure" +#line 20814 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:19462: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20819: \"$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:19468: \$? = $ac_status" >&5 + echo "$as_me:20825: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -19488,17 +20845,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 19491 "configure" +#line 20848 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:19495: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20852: \"$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:19501: \$? = $ac_status" >&5 + echo "$as_me:20858: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -19526,7 +20883,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:19529: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + { { echo "$as_me:20886: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -19541,23 +20898,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:19544: checking for $ac_header" >&5 +echo "$as_me:20901: 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 19550 "configure" +#line 20907 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:19554: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20911: \"$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:19560: \$? = $ac_status" >&5 + echo "$as_me:20917: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -19576,7 +20933,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:19579: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:20936: 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:20949: 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 19598 "configure" +#line 20955 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:19602: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20959: \"$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:19608: \$? = $ac_status" >&5 + echo "$as_me:20965: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -19624,7 +20981,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:19627: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:20984: 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:20995: 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 19641 "configure" +#line 20998 "configure" #include "confdefs.h" #include @@ -19655,16 +21012,16 @@ cerr << "testing" << endl; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19658: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21015: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19661: \$? = $ac_status" >&5 + echo "$as_me:21018: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19664: \"$ac_try\"") >&5 + { (eval echo "$as_me:21021: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19667: \$? = $ac_status" >&5 + echo "$as_me:21024: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_iostream_namespace=yes else @@ -19673,7 +21030,7 @@ cat conftest.$ac_ext >&5 cf_iostream_namespace=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:19676: result: $cf_iostream_namespace" >&5 + echo "$as_me:21033: result: $cf_iostream_namespace" >&5 echo "${ECHO_T}$cf_iostream_namespace" >&6 if test "$cf_iostream_namespace" = yes ; then @@ -19684,7 +21041,7 @@ EOF fi fi -echo "$as_me:19687: checking if we should include stdbool.h" >&5 +echo "$as_me:21044: 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 @@ -19692,7 +21049,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 19695 "configure" +#line 21052 "configure" #include "confdefs.h" int @@ -19704,23 +21061,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19707: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21064: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19710: \$? = $ac_status" >&5 + echo "$as_me:21067: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19713: \"$ac_try\"") >&5 + { (eval echo "$as_me:21070: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19716: \$? = $ac_status" >&5 + echo "$as_me:21073: \$? = $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 19723 "configure" +#line 21080 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -19736,16 +21093,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19739: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21096: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19742: \$? = $ac_status" >&5 + echo "$as_me:21099: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19745: \"$ac_try\"") >&5 + { (eval echo "$as_me:21102: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19748: \$? = $ac_status" >&5 + echo "$as_me:21105: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -19759,13 +21116,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:19762: result: yes" >&5 +then echo "$as_me:21119: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:19764: result: no" >&5 +else echo "$as_me:21121: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:19768: checking for builtin bool type" >&5 +echo "$as_me:21125: 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 @@ -19773,7 +21130,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 19776 "configure" +#line 21133 "configure" #include "confdefs.h" #include @@ -19788,16 +21145,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19791: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21148: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19794: \$? = $ac_status" >&5 + echo "$as_me:21151: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19797: \"$ac_try\"") >&5 + { (eval echo "$as_me:21154: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19800: \$? = $ac_status" >&5 + echo "$as_me:21157: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_builtin_bool=1 else @@ -19810,13 +21167,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_builtin_bool" = 1 -then echo "$as_me:19813: result: yes" >&5 +then echo "$as_me:21170: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:19815: result: no" >&5 +else echo "$as_me:21172: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:19819: checking for size of bool" >&5 +echo "$as_me:21176: 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 @@ -19827,7 +21184,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 19830 "configure" +#line 21187 "configure" #include "confdefs.h" #include @@ -19851,7 +21208,7 @@ else #endif -int main() +int main(void) { FILE *fp = fopen("cf_test.out", "w"); if (fp != 0) { @@ -19869,15 +21226,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:19872: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21229: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19875: \$? = $ac_status" >&5 + echo "$as_me:21232: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19877: \"$ac_try\"") >&5 + { (eval echo "$as_me:21234: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19880: \$? = $ac_status" >&5 + echo "$as_me:21237: \$? = $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 @@ -19895,18 +21252,18 @@ fi fi rm -f cf_test.out -echo "$as_me:19898: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:21255: 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;; + case .$NCURSES_BOOL in + (.auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:19904: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:21261: 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:19909: checking for special defines needed for etip.h" >&5 +echo "$as_me:21266: 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" @@ -19924,7 +21281,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 19927 "configure" +#line 21284 "configure" #include "confdefs.h" #include @@ -19938,16 +21295,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19941: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21298: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19944: \$? = $ac_status" >&5 + echo "$as_me:21301: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19947: \"$ac_try\"") >&5 + { (eval echo "$as_me:21304: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19950: \$? = $ac_status" >&5 + echo "$as_me:21307: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$cf_math" && cat >>confdefs.h <&5 +echo "$as_me:21328: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 CXXFLAGS="$cf_save_CXXFLAGS" if test -n "$CXX"; then -echo "$as_me:19976: checking if $CXX accepts parameter initialization" >&5 +echo "$as_me:21333: 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 @@ -19990,7 +21347,7 @@ ac_main_return=return cf_cv_cpp_param_init=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 19993 "configure" +#line 21350 "configure" #include "confdefs.h" class TEST { @@ -20005,19 +21362,19 @@ TEST::TEST(int x = 1) // some compilers do not like second initializer { value = x; } -int main() { } +int main(void) { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:20012: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21369: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20015: \$? = $ac_status" >&5 + echo "$as_me:21372: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:20017: \"$ac_try\"") >&5 + { (eval echo "$as_me:21374: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20020: \$? = $ac_status" >&5 + echo "$as_me:21377: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_param_init=yes else @@ -20036,7 +21393,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:20039: result: $cf_cv_cpp_param_init" >&5 +echo "$as_me:21396: result: $cf_cv_cpp_param_init" >&5 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 fi test "$cf_cv_cpp_param_init" = yes && @@ -20046,7 +21403,7 @@ EOF if test -n "$CXX"; then -echo "$as_me:20049: checking if $CXX accepts static_cast" >&5 +echo "$as_me:21406: 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 @@ -20060,7 +21417,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat >conftest.$ac_ext <<_ACEOF -#line 20063 "configure" +#line 21420 "configure" #include "confdefs.h" class NCursesPanel @@ -20104,16 +21461,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20107: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21464: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20110: \$? = $ac_status" >&5 + echo "$as_me:21467: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20113: \"$ac_try\"") >&5 + { (eval echo "$as_me:21470: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20116: \$? = $ac_status" >&5 + echo "$as_me:21473: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_static_cast=yes else @@ -20131,7 +21488,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:20134: result: $cf_cv_cpp_static_cast" >&5 +echo "$as_me:21491: result: $cf_cv_cpp_static_cast" >&5 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 fi @@ -20143,17 +21500,17 @@ EOF CXX_AR='$(AR)' CXX_ARFLAGS='$(ARFLAGS)' - case $cf_cv_system_name in #(vi - irix*) #(vi + case $cf_cv_system_name in + (irix*) if test "$GXX" != yes ; then CXX_AR='$(CXX)' CXX_ARFLAGS='-ar -o' fi ;; - sco3.2v5*) #(vi + (sco3.2v5*) CXXLDFLAGS="-u main" ;; - solaris2*) + (solaris2*) if test "$GXX" != yes ; then CXX_AR='$(CXX)' CXX_ARFLAGS='-xar -o' @@ -20180,7 +21537,7 @@ else else if test "$cf_cv_header_stdbool_h" = 1 ; then -echo "$as_me:20183: checking for size of bool" >&5 +echo "$as_me:21540: 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 @@ -20191,7 +21548,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 20194 "configure" +#line 21551 "configure" #include "confdefs.h" #include @@ -20215,7 +21572,7 @@ else #endif -int main() +int main(void) { FILE *fp = fopen("cf_test.out", "w"); if (fp != 0) { @@ -20233,15 +21590,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:20236: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21593: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20239: \$? = $ac_status" >&5 + echo "$as_me:21596: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:20241: \"$ac_try\"") >&5 + { (eval echo "$as_me:21598: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20244: \$? = $ac_status" >&5 + echo "$as_me:21601: \$? = $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 @@ -20259,25 +21616,25 @@ fi fi rm -f cf_test.out -echo "$as_me:20262: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:21619: 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;; + case .$NCURSES_BOOL in + (.auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:20268: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:21625: 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:20274: checking for fallback type of bool" >&5 + echo "$as_me:21631: 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 ;; + case "$host_cpu" in + (i?86) cf_cv_type_of_bool=char ;; + (*) cf_cv_type_of_bool=int ;; esac - echo "$as_me:20280: result: $cf_cv_type_of_bool" >&5 + echo "$as_me:21637: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 fi fi @@ -20306,7 +21663,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:20309: WARNING: libtool does not support Ada - disabling feature" >&5 + { echo "$as_me:21666: 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 @@ -20317,7 +21674,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:20320: checking for $ac_word" >&5 +echo "$as_me:21677: 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 @@ -20332,7 +21689,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:20335: found $ac_dir/$ac_word" >&5 +echo "$as_me:21692: found $ac_dir/$ac_word" >&5 break done @@ -20341,40 +21698,40 @@ fi fi gnat_exists=$ac_cv_prog_gnat_exists if test -n "$gnat_exists"; then - echo "$as_me:20344: result: $gnat_exists" >&5 + echo "$as_me:21701: result: $gnat_exists" >&5 echo "${ECHO_T}$gnat_exists" >&6 else - echo "$as_me:20347: result: no" >&5 + echo "$as_me:21704: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$ac_cv_prog_gnat_exists" = no; then - cf_ada_make= - cf_cv_prog_gnat_correct=no + cf_ada_make= + cf_cv_prog_gnat_correct=no else -echo "$as_me:20356: checking for gnat version" >&5 +echo "$as_me:21713: 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:20361: result: $cf_gnat_version" >&5 + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` +echo "$as_me:21718: result: $cf_gnat_version" >&5 echo "${ECHO_T}$cf_gnat_version" >&6 -case $cf_gnat_version in #(vi -3.1[1-9]*|3.[2-9]*|[4-9].*|20[0-9][0-9]) #(vi +case $cf_gnat_version in +(3.1[1-9]*|3.[2-9]*|[4-9].*|20[0-9][0-9]) cf_cv_prog_gnat_correct=yes ;; -*) - { echo "$as_me:20369: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 +(*) + { echo "$as_me:21726: 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 ;; esac - # Extract the first word of "m4", so it can be a program name with args. + # Extract the first word of "m4", so it can be a program name with args. set dummy m4; ac_word=$2 -echo "$as_me:20377: checking for $ac_word" >&5 +echo "$as_me:21734: 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 @@ -20389,7 +21746,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:20392: found $ac_dir/$ac_word" >&5 +echo "$as_me:21749: found $ac_dir/$ac_word" >&5 break done @@ -20398,19 +21755,19 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:20401: result: $M4_exists" >&5 + echo "$as_me:21758: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:20404: result: no" >&5 + echo "$as_me:21761: result: no" >&5 echo "${ECHO_T}no" >&6 fi - if test "$ac_cv_prog_M4_exists" = no; then - cf_cv_prog_gnat_correct=no - echo Ada95 binding required program m4 not found. Ada95 binding disabled. - fi - if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:20413: checking if GNAT works" >&5 + if test "$ac_cv_prog_M4_exists" = no; then + cf_cv_prog_gnat_correct=no + echo Ada95 binding required program m4 not found. Ada95 binding disabled. + fi + if test "$cf_cv_prog_gnat_correct" = yes; then + echo "$as_me:21770: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf conftest* *~conftest* @@ -20438,36 +21795,36 @@ else fi rm -rf conftest* *~conftest* - echo "$as_me:20441: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:21798: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 - fi + fi fi if test "x$cf_cv_prog_gnat_correct" = xyes; then ADAFLAGS="$ADAFLAGS -gnatpn" - echo "$as_me:20450: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:21807: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in - *-g*) + (*-g*) ADAFLAGS="$ADAFLAGS -g" ;; esac case "$CFLAGS" in - *-O*) + (*-O*) cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[ ].*//'` ADAFLAGS="$ADAFLAGS $cf_O_flag" ;; esac - echo "$as_me:20467: result: $ADAFLAGS" >&5 + echo "$as_me:21824: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:20470: checking if GNATPREP supports -T option" >&5 +echo "$as_me:21827: checking if GNATPREP supports -T option" >&5 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 if test "${cf_cv_gnatprep_opt_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20477,21 +21834,21 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:20480: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:21837: result: $cf_cv_gnatprep_opt_t" >&5 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" -echo "$as_me:20484: checking if GNAT supports generics" >&5 +echo "$as_me:21841: 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 +case $cf_gnat_version in +(3.[1-9]*|[4-9].*) cf_gnat_generics=yes ;; -*) +(*) cf_gnat_generics=no ;; esac -echo "$as_me:20494: result: $cf_gnat_generics" >&5 +echo "$as_me:21851: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -20503,7 +21860,7 @@ else cf_generic_objects= fi -echo "$as_me:20506: checking if GNAT supports SIGINT" >&5 +echo "$as_me:21863: 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 @@ -20551,7 +21908,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:20554: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:21911: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test $cf_cv_gnat_sigint = yes ; then @@ -20564,16 +21921,16 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:20567: checking if GNAT supports project files" >&5 +echo "$as_me:21924: 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_gnat_version in +(3.[0-9]*) ;; -*) - case $cf_cv_system_name in #(vi - cygwin*|msys*) #(vi +(*) + case $cf_cv_system_name in + (cygwin*|msys*) ;; - *) + (*) mkdir conftest.src conftest.bin conftest.lib cd conftest.src rm -rf conftest* *~conftest* @@ -20624,15 +21981,15 @@ CF_EOF esac ;; esac -echo "$as_me:20627: result: $cf_gnat_projects" >&5 +echo "$as_me:21984: 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:20633: checking if GNAT supports libraries" >&5 + echo "$as_me:21990: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:20635: result: $cf_gnat_libraries" >&5 + echo "$as_me:21992: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -20652,7 +22009,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:20655: checking for ada-compiler" >&5 +echo "$as_me:22012: 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. @@ -20663,12 +22020,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:20666: result: $cf_ada_compiler" >&5 +echo "$as_me:22023: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:20671: checking for ada-include" >&5 +echo "$as_me:22028: 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. @@ -20680,43 +22037,43 @@ else fi; if test -n "$prefix/share/ada/adainclude" ; then if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + 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/*) - 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:20707: error: expected a pathname, not \"$withval\"" >&5 +case ".$withval" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval withval="$withval" + case ".$withval" in + (.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { { echo "$as_me:22064: 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:20716: result: $ADA_INCLUDE" >&5 +echo "$as_me:22073: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:20719: checking for ada-objects" >&5 +echo "$as_me:22076: 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. @@ -20728,43 +22085,43 @@ else fi; if test -n "$prefix/lib/ada/adalib" ; then if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + 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/*) - 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:20755: error: expected a pathname, not \"$withval\"" >&5 +case ".$withval" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval withval="$withval" + case ".$withval" in + (.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { { echo "$as_me:22112: 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_OBJECTS="$withval" -echo "$as_me:20764: result: $ADA_OBJECTS" >&5 +echo "$as_me:22121: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:20767: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:22124: 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. @@ -20774,7 +22131,7 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:20777: result: $with_ada_sharedlib" >&5 +echo "$as_me:22134: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 ADA_SHAREDLIB='lib$(LIB_NAME).so.1' @@ -20797,13 +22154,13 @@ fi # do this "late" to avoid conflict with header-checks if test "x$with_widec" = xyes ; then - echo "$as_me:20800: checking for wchar_t" >&5 + echo "$as_me:22157: 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 20806 "configure" +#line 22163 "configure" #include "confdefs.h" $ac_includes_default int @@ -20818,16 +22175,16 @@ if (sizeof (wchar_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20821: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22178: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20824: \$? = $ac_status" >&5 + echo "$as_me:22181: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20827: \"$ac_try\"") >&5 + { (eval echo "$as_me:22184: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20830: \$? = $ac_status" >&5 + echo "$as_me:22187: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_wchar_t=yes else @@ -20837,10 +22194,10 @@ ac_cv_type_wchar_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:20840: result: $ac_cv_type_wchar_t" >&5 +echo "$as_me:22197: result: $ac_cv_type_wchar_t" >&5 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 -echo "$as_me:20843: checking size of wchar_t" >&5 +echo "$as_me:22200: 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 @@ -20849,7 +22206,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 20852 "configure" +#line 22209 "configure" #include "confdefs.h" $ac_includes_default int @@ -20861,21 +22218,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20864: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22221: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20867: \$? = $ac_status" >&5 + echo "$as_me:22224: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20870: \"$ac_try\"") >&5 + { (eval echo "$as_me:22227: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20873: \$? = $ac_status" >&5 + echo "$as_me:22230: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 20878 "configure" +#line 22235 "configure" #include "confdefs.h" $ac_includes_default int @@ -20887,16 +22244,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20890: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22247: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20893: \$? = $ac_status" >&5 + echo "$as_me:22250: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20896: \"$ac_try\"") >&5 + { (eval echo "$as_me:22253: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20899: \$? = $ac_status" >&5 + echo "$as_me:22256: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -20912,7 +22269,7 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 20915 "configure" +#line 22272 "configure" #include "confdefs.h" $ac_includes_default int @@ -20924,16 +22281,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20927: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22284: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20930: \$? = $ac_status" >&5 + echo "$as_me:22287: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20933: \"$ac_try\"") >&5 + { (eval echo "$as_me:22290: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20936: \$? = $ac_status" >&5 + echo "$as_me:22293: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -20949,7 +22306,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 20952 "configure" +#line 22309 "configure" #include "confdefs.h" $ac_includes_default int @@ -20961,16 +22318,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20964: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22321: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20967: \$? = $ac_status" >&5 + echo "$as_me:22324: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20970: \"$ac_try\"") >&5 + { (eval echo "$as_me:22327: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20973: \$? = $ac_status" >&5 + echo "$as_me:22330: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -20983,12 +22340,12 @@ done ac_cv_sizeof_wchar_t=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:20986: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:22343: 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 20991 "configure" +#line 22348 "configure" #include "confdefs.h" $ac_includes_default int @@ -21004,15 +22361,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:21007: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22364: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21010: \$? = $ac_status" >&5 + echo "$as_me:22367: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:21012: \"$ac_try\"") >&5 + { (eval echo "$as_me:22369: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21015: \$? = $ac_status" >&5 + echo "$as_me:22372: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_wchar_t=`cat conftest.val` else @@ -21028,7 +22385,7 @@ else ac_cv_sizeof_wchar_t=0 fi fi -echo "$as_me:21031: result: $ac_cv_sizeof_wchar_t" >&5 +echo "$as_me:22388: result: $ac_cv_sizeof_wchar_t" >&5 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 cat >>confdefs.h <&5 +echo "$as_me:22406: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -21074,12 +22431,12 @@ LIB_SUBSETS="${LIB_SUBSETS}base" # base library (so it resides in base). if test "$with_term_driver" != no ; then LIB_SUBSETS="${LIB_SUBSETS}+port_drivers" - case $cf_cv_system_name in #(vi - *mingw32*|*mingw64*) #(vi + case $cf_cv_system_name in + (*mingw32*|*mingw64*) LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32con" CPPFLAGS="$CPPFLAGS -DUSE_WIN32CON_DRIVER" ;; - *) #(vi + (*) LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo" ;; esac @@ -21088,7 +22445,7 @@ fi test "x$with_widec" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" -echo "$as_me:21091: result: $LIB_SUBSETS" >&5 +echo "$as_me:22448: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -21119,99 +22476,102 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:21122: checking default library suffix" >&5 +echo "$as_me:22479: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in - libtool) DFT_ARG_SUFFIX='' ;; - normal) DFT_ARG_SUFFIX='' ;; - debug) DFT_ARG_SUFFIX='_g' ;; - profile) DFT_ARG_SUFFIX='_p' ;; - shared) DFT_ARG_SUFFIX='' ;; + (libtool) DFT_ARG_SUFFIX='' ;; + (normal) DFT_ARG_SUFFIX='' ;; + (debug) DFT_ARG_SUFFIX='_g' ;; + (profile) DFT_ARG_SUFFIX='_p' ;; + (shared) DFT_ARG_SUFFIX='' ;; esac test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" -echo "$as_me:21133: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:22490: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:21136: checking default library-dependency suffix" >&5 +echo "$as_me:22493: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 - case X$DFT_LWR_MODEL in #(vi - Xlibtool) #(vi + case X$DFT_LWR_MODEL in + (Xlibtool) DFT_LIB_SUFFIX='.la' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; - Xdebug) #(vi + (Xdebug) DFT_LIB_SUFFIX='_g.a' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; - Xprofile) #(vi + (Xprofile) DFT_LIB_SUFFIX='_p.a' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; - Xshared) #(vi + (Xshared) case $cf_cv_system_name in - aix[5-7]*) #(vi + (aix[5-7]*) DFT_LIB_SUFFIX='.so' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; - cygwin*|msys*|mingw*) #(vi + (cygwin*|msys*|mingw*) DFT_LIB_SUFFIX='.dll' DFT_DEP_SUFFIX='.dll.a' ;; - darwin*) #(vi + (darwin*) DFT_LIB_SUFFIX='.dylib' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; - hpux*) #(vi + (hpux*) case $target in - ia64*) #(vi + (ia64*) DFT_LIB_SUFFIX='.so' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; - *) #(vi + (*) DFT_LIB_SUFFIX='.sl' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; esac ;; - *) #(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:21191: result: $DFT_DEP_SUFFIX" >&5 + if test -n "${LIB_SUFFIX}${EXTRA_SUFFIX}" + then + DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" + DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" + fi +echo "$as_me:22551: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:21194: checking default object directory" >&5 +echo "$as_me:22554: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in - libtool) DFT_OBJ_SUBDIR='obj_lo' ;; - normal) DFT_OBJ_SUBDIR='objects' ;; - debug) DFT_OBJ_SUBDIR='obj_g' ;; - profile) DFT_OBJ_SUBDIR='obj_p' ;; - shared) - case $cf_cv_system_name in #(vi - cygwin|msys) #(vi + (libtool) DFT_OBJ_SUBDIR='obj_lo' ;; + (normal) DFT_OBJ_SUBDIR='objects' ;; + (debug) DFT_OBJ_SUBDIR='obj_g' ;; + (profile) DFT_OBJ_SUBDIR='obj_p' ;; + (shared) + case $cf_cv_system_name in + (cygwin|msys) DFT_OBJ_SUBDIR='objects' ;; - *) + (*) DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:21210: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:22570: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 if test "x$cf_with_cxx" = xyes ; then -echo "$as_me:21214: checking c++ library-dependency suffix" >&5 +echo "$as_me:22574: 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++) @@ -21222,61 +22582,64 @@ elif test "$with_shared_cxx" != "no"; then else # we normally make a static library because C/C++ library rules differ - case Xnormal in #(vi - Xlibtool) #(vi + case Xnormal in + (Xlibtool) CXX_LIB_SUFFIX='.la' CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; - Xdebug) #(vi + (Xdebug) CXX_LIB_SUFFIX='_g.a' CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; - Xprofile) #(vi + (Xprofile) CXX_LIB_SUFFIX='_p.a' CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; - Xshared) #(vi + (Xshared) case $cf_cv_system_name in - aix[5-7]*) #(vi + (aix[5-7]*) CXX_LIB_SUFFIX='.so' CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; - cygwin*|msys*|mingw*) #(vi + (cygwin*|msys*|mingw*) CXX_LIB_SUFFIX='.dll' CXX_DEP_SUFFIX='.dll.a' ;; - darwin*) #(vi + (darwin*) CXX_LIB_SUFFIX='.dylib' CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; - hpux*) #(vi + (hpux*) case $target in - ia64*) #(vi + (ia64*) CXX_LIB_SUFFIX='.so' CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; - *) #(vi + (*) CXX_LIB_SUFFIX='.sl' CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; esac ;; - *) #(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}" + if test -n "${LIB_SUFFIX}${EXTRA_SUFFIX}" + then + CXX_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${CXX_LIB_SUFFIX}" + CXX_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${CXX_DEP_SUFFIX}" + fi fi -echo "$as_me:21279: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:22642: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -21303,38 +22666,49 @@ TINFO_LIST=`echo "$SHLIB_LIST" | sed -e 's/-ldl[ ]//g' -e 's/-ldl$//'` fi +USE_ARG_SUFFIX="${DFT_ARG_SUFFIX}${EXTRA_SUFFIX}" +USE_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}" +USE_CFG_SUFFIX=${DFT_ARG_SUFFIX}${cf_cv_abi_version} +if test -n "$EXTRA_SUFFIX" && test "x$EXTRA_SUFFIX" != "x${cf_cv_abi_version}" +then + USE_CFG_SUFFIX="${USE_CFG_SUFFIX}${EXTRA_SUFFIX}" +fi + if test "$with_ticlib" != no ; 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_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${USE_LIB_SUFFIX}//"`" + TICS_ARG_SUFFIX="${with_ticlib}`echo ${USE_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`" TICS_DEP_SUFFIX="${with_ticlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`" TICS_LIB_SUFFIX="${with_ticlib}" else - TICS_ARG_SUFFIX="${TICS_NAME}${DFT_ARG_SUFFIX}" + TICS_SUFFIX=${DFT_LIB_SUFFIX} + TICS_ARG_SUFFIX="${TICS_NAME}${USE_ARG_SUFFIX}" TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}" - TICS_LIB_SUFFIX="${TICS_NAME}${LIB_SUFFIX}" + TICS_LIB_SUFFIX="${TICS_NAME}${USE_LIB_SUFFIX}" fi TICS_LDFLAGS="-L${LIB_DIR}" - TICS_LIBS="-l${TICS_LIB_SUFFIX}" + TICS_LIBS="-l${TICS_ARG_SUFFIX}" else + TICS_SUFFIX=${DFT_LIB_SUFFIX} TICS_LDFLAGS="-L${LIB_DIR}" - TICS_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}" + TICS_LIBS="-l${LIB_NAME}${USE_ARG_SUFFIX}" fi if test "$with_termlib" != no ; then if test "x$with_termlib" != xyes ; then TINFO_NAME=$with_termlib - TINFO_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`" - TINFO_ARG_SUFFIX="${with_termlib}`echo ${DFT_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`" + TINFO_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${USE_LIB_SUFFIX}//"`" + TINFO_ARG_SUFFIX="${with_termlib}`echo ${USE_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`" TINFO_DEP_SUFFIX="${with_termlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`" TINFO_LIB_SUFFIX="${with_termlib}" else TINFO_SUFFIX=${DFT_LIB_SUFFIX} - TINFO_ARG_SUFFIX="${TINFO_NAME}${DFT_ARG_SUFFIX}" + TINFO_ARG_SUFFIX="${TINFO_NAME}${USE_ARG_SUFFIX}" TINFO_DEP_SUFFIX="${TINFO_NAME}${DFT_DEP_SUFFIX}" - TINFO_LIB_SUFFIX="${TINFO_NAME}${LIB_SUFFIX}" + TINFO_LIB_SUFFIX="${TINFO_NAME}${USE_LIB_SUFFIX}" fi TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${TINFO_DEP_SUFFIX}" @@ -21350,9 +22724,9 @@ if test "$with_termlib" != no ; then TEST_ARGS="-l${TINFO_ARG_SUFFIX}" TEST_ARG2="-l${TINFO_ARG_SUFFIX}" if test "x$with_term_driver" != xno ; then - TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}" - TICS_LIBS="$TICS_LIBS -l${LIB_NAME}${DFT_ARG_SUFFIX}" - TINFO_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS" + TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${USE_ARG_SUFFIX}" + TICS_LIBS="$TICS_LIBS -l${LIB_NAME}${USE_ARG_SUFFIX}" + TINFO_LIBS="-l${LIB_NAME}${USE_ARG_SUFFIX} $TEST_ARGS" else TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" TINFO_LIBS="$TEST_ARGS" @@ -21364,20 +22738,20 @@ else # the next lines are needed for linking libtic over libncurses TINFO_NAME=${LIB_NAME} TINFO_SUFFIX=${DFT_LIB_SUFFIX} - TINFO_ARG_SUFFIX=${LIB_NAME}${DFT_ARG_SUFFIX} + TINFO_ARG_SUFFIX=${LIB_NAME}${USE_ARG_SUFFIX} if test "x$with_tic_depends" = xyes ; then - TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}" + TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${USE_ARG_SUFFIX}" else TICS_LIST="$SHLIB_LIST" fi TINFO_LDFLAGS="-L${LIB_DIR}" - TINFO_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}" + TINFO_LIBS="-l${LIB_NAME}${USE_ARG_SUFFIX}" fi if test "$DFT_LWR_MODEL" = shared ; then - case $cf_cv_system_name in #(vi - cygwin*|msys*) + case $cf_cv_system_name in + (cygwin*|msys*) # "lib" files have ".dll.a" suffix, "cyg"or "msys-" files have ".dll" TINFO_SUFFIX=.dll ;; @@ -21392,47 +22766,47 @@ TICS_LIST=`echo "$TICS_LIST" | sed -e 's/-ldl[ ]//g' -e 's/-ldl$//'` fi if test "$DFT_LWR_MODEL" = "libtool"; then - OBJEXT=lo + OBJEXT=lo fi # needed for Ada95 TINFO_LDFLAGS2=`echo "$TINFO_LDFLAGS" | sed -e 's,-L\.\./,-L../../,'` case $DFT_LWR_MODEL in -normal|debug|profile) +(normal|debug|profile) if test "$GCC" = yes ; then - case $cf_cv_system_name in #( - OS/2*|os2*|aix[4]*|solaris2.1[0-9]|darwin*) #( vi + case $cf_cv_system_name in + (OS/2*|os2*|aix[4]*|solaris2.1[0-9]|darwin*) LDFLAGS_STATIC= LDFLAGS_SHARED= ;; - *) #( normally, except when broken - LDFLAGS_STATIC=-static - LDFLAGS_SHARED=-dynamic - ;; - esac + (*) # normally, except when broken + LDFLAGS_STATIC=-static + LDFLAGS_SHARED=-dynamic + ;; + esac else - case $cf_cv_system_name in #( - aix[4-7]*) #( from ld manpage + case $cf_cv_system_name in + (aix[4-7]*) # from ld manpage LDFLAGS_STATIC=-bstatic LDFLAGS_SHARED=-bdynamic ;; - hpux*) #( from ld manpage for hpux10.20, hpux11.11 + (hpux*) # from ld manpage for hpux10.20, hpux11.11 # We could also use just "archive" and "shared". LDFLAGS_STATIC=-Wl,-a,archive_shared LDFLAGS_SHARED=-Wl,-a,shared_archive ;; - irix*) #( from ld manpage IRIX64 + (irix*) # from ld manpage IRIX64 LDFLAGS_STATIC=-Bstatic LDFLAGS_SHARED=-Bdynamic ;; - osf[45]*) #( from ld manpage osf4.0d, osf5.1 + (osf[45]*) # from ld manpage osf4.0d, osf5.1 # alternative "-oldstyle_liblookup" (not in cc manpage) LDFLAGS_STATIC=-noso LDFLAGS_SHARED=-so_archive ;; - solaris2*) + (solaris2*) LDFLAGS_STATIC=-Bstatic LDFLAGS_SHARED=-Bdynamic ;; @@ -21441,19 +22815,19 @@ fi if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" then - echo "$as_me:21444: checking if linker supports switching between static/dynamic" >&5 + echo "$as_me:22818: 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:21453: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:22827: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21456: \$? = $ac_status" >&5 + echo "$as_me:22830: \$? = $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 @@ -21464,10 +22838,10 @@ EOF LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 21467 "configure" +#line 22841 "configure" #include "confdefs.h" -#line 21470 "configure" +#line 22844 "configure" #include int cf_ldflags_static(FILE *fp); @@ -21482,24 +22856,24 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21485: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22859: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21488: \$? = $ac_status" >&5 + echo "$as_me:22862: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21491: \"$ac_try\"") >&5 + { (eval echo "$as_me:22865: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21494: \$? = $ac_status" >&5 + echo "$as_me:22868: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # some linkers simply ignore the -dynamic - case x`file conftest$ac_exeext 2>/dev/null` in #(vi - *static*) # (vi + case x`file conftest$ac_exeext 2>/dev/null` in + (*static*) cf_ldflags_static=no ;; - *) + (*) cf_ldflags_static=yes ;; esac @@ -21514,7 +22888,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f libconftest.* LIBS="$cf_save_LIBS" - echo "$as_me:21517: result: $cf_ldflags_static" >&5 + echo "$as_me:22891: result: $cf_ldflags_static" >&5 echo "${ECHO_T}$cf_ldflags_static" >&6 if test $cf_ldflags_static != yes @@ -21530,7 +22904,7 @@ fi ;; esac -echo "$as_me:21533: checking where we will install curses.h" >&5 +echo "$as_me:22907: checking where we will install curses.h" >&5 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 includesubdir= @@ -21538,9 +22912,9 @@ if test "$with_overwrite" = no && \ ( test "x$includedir" = 'x${prefix}/include' || \ test "x$includedir" = "x${prefix}/include" ) then - includesubdir="/ncurses${LIB_SUFFIX}" + includesubdir="/ncurses${USE_LIB_SUFFIX}" fi -echo "$as_me:21543: result: ${includedir}${includesubdir}" >&5 +echo "$as_me:22917: result: ${includedir}${includesubdir}" >&5 echo "${ECHO_T}${includedir}${includesubdir}" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -21548,7 +22922,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6 if test "$with_overwrite" != no ; then if test "$NCURSES_LIBUTF8" = 1 ; then NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' - { echo "$as_me:21551: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:22925: 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 @@ -21566,7 +22940,7 @@ EOF ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:21569: checking for src modules" >&5 +echo "$as_me:22943: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -21576,11 +22950,11 @@ if test "$DFT_LWR_MODEL" = "libtool"; then TEST_ARGS="${TEST_DEPS}" TEST_ARG2="${TEST_DEP2}" else - TEST_ARGS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS" - TEST_ARG2="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARG2" + TEST_ARGS="-l${LIB_NAME}${USE_ARG_SUFFIX} $TEST_ARGS" + TEST_ARG2="-l${LIB_NAME}${USE_ARG_SUFFIX} $TEST_ARG2" fi -PC_MODULES_TO_MAKE="ncurses${DFT_ARG_SUFFIX}" +PC_MODULES_TO_MAKE="ncurses${USE_ARG_SUFFIX}" cf_cv_src_modules= for cf_dir in $modules_to_build do @@ -21624,14 +22998,14 @@ EOF TEST_ARGS="${TEST_DEPS}" TEST_ARG2="${TEST_DEP2}" else - TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS" - TEST_ARG2="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARG2" + TEST_ARGS="-l${cf_dir}${USE_ARG_SUFFIX} $TEST_ARGS" + TEST_ARG2="-l${cf_dir}${USE_ARG_SUFFIX} $TEST_ARG2" fi - PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ${cf_dir}${DFT_ARG_SUFFIX}" + PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ${cf_dir}${USE_ARG_SUFFIX}" fi fi done -echo "$as_me:21634: result: $cf_cv_src_modules" >&5 +echo "$as_me:23008: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -21652,7 +23026,7 @@ fi # always make this, to install the ncurses-config script SRC_SUBDIRS="$SRC_SUBDIRS misc" if test "$cf_with_cxx_binding" != no; then - PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ncurses++${DFT_ARG_SUFFIX}" + PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ncurses++${USE_ARG_SUFFIX}" SRC_SUBDIRS="$SRC_SUBDIRS c++" fi @@ -21683,8 +23057,8 @@ if test -n "$ADA_SUBDIRS"; then fi if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then - SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${DFT_ARG_SUFFIX}-config:Ada95/gen/adacurses-config.in" - SUB_MAKEFILES="$SUB_MAKEFILES man/adacurses${DFT_ARG_SUFFIX}-config.1:man/MKada_config.in" + SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${USE_CFG_SUFFIX}-config:Ada95/gen/adacurses-config.in" + SUB_MAKEFILES="$SUB_MAKEFILES man/adacurses${USE_CFG_SUFFIX}-config.1:man/MKada_config.in" fi DIRS_TO_MAKE="lib" @@ -21692,15 +23066,15 @@ for cf_item in $cf_list_models do case $cf_item in - libtool) cf_subdir='obj_lo' ;; - normal) cf_subdir='objects' ;; - debug) cf_subdir='obj_g' ;; - profile) cf_subdir='obj_p' ;; - shared) - case $cf_cv_system_name in #(vi - cygwin|msys) #(vi + (libtool) cf_subdir='obj_lo' ;; + (normal) cf_subdir='objects' ;; + (debug) cf_subdir='obj_g' ;; + (profile) cf_subdir='obj_p' ;; + (shared) + case $cf_cv_system_name in + (cygwin|msys) cf_subdir='objects' ;; - *) + (*) cf_subdir='obj_s' ;; esac esac @@ -21717,7 +23091,7 @@ do done # symbols that differ when compiling Ada95 by itself. -NCURSES_SHLIB2='sh $(top_srcdir)/misc/shlib' +NCURSES_SHLIB2=$SHELL' $(top_srcdir)/misc/shlib' # values to use as strings @@ -21739,11 +23113,11 @@ cf_new_extra_cppflags= for cf_add_cflags in $EXTRA_CFLAGS do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ @@ -21751,20 +23125,26 @@ no) && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + continue fi ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -21773,17 +23153,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + ;; esac ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + ;; esac ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` @@ -21796,17 +23184,23 @@ done if test -n "$cf_new_cflags" ; then - CFLAGS="$CFLAGS $cf_new_cflags" + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + fi if test -n "$cf_new_cppflags" ; then - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + fi if test -n "$cf_new_extra_cppflags" ; then - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + fi ### Define substitutions for header files to avoid name-pollution @@ -21840,18 +23234,15 @@ test "x$use_database" = xyes && \ SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in" SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in" -SUB_MAKEFILES="$SUB_MAKEFILES man/ncurses${DFT_ARG_SUFFIX}${cf_cv_abi_version}-config.1:man/MKncu_config.in" +SUB_MAKEFILES="$SUB_MAKEFILES man/ncurses${USE_CFG_SUFFIX}-config.1:man/MKncu_config.in" -if test "x$enable_pc_files" = xyes ; then \ +if test "x$enable_pc_files" = xyes && test -z "$MAKE_PC_FILES" ; then SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in" -MAKE_PC_FILES= -else -MAKE_PC_FILES="#" fi # Extract the first word of "tic", so it can be a program name with args. set dummy tic; ac_word=$2 -echo "$as_me:21854: checking for $ac_word" >&5 +echo "$as_me:23245: 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 @@ -21868,7 +23259,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:21871: found $ac_dir/$ac_word" >&5 + echo "$as_me:23262: found $ac_dir/$ac_word" >&5 break fi done @@ -21880,10 +23271,10 @@ fi TIC_PATH=$ac_cv_path_TIC_PATH if test -n "$TIC_PATH"; then - echo "$as_me:21883: result: $TIC_PATH" >&5 + echo "$as_me:23274: result: $TIC_PATH" >&5 echo "${ECHO_T}$TIC_PATH" >&6 else - echo "$as_me:21886: result: no" >&5 + echo "$as_me:23277: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -21891,7 +23282,7 @@ if test -n "$FALLBACK_LIST" then if test "$TIC_PATH" = unknown then - { echo "$as_me:21894: WARNING: no tic program found for fallbacks" >&5 + { echo "$as_me:23285: WARNING: no tic program found for fallbacks" >&5 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} fi fi @@ -21910,14 +23301,24 @@ MENU_NAME=menu FORM_NAME=form CXX_NAME=ncurses++ +# workaround for OS/2 (20151017) +case $cf_cv_system_name in +(os2*) + LIBTOOL_OPTS_CXX="-os2dllname ncurs++" + ;; +(*) + LIBTOOL_OPTS_CXX= + ;; +esac + # workaround for g++ versus Solaris (20131116) -case $cf_cv_system_name in #(vi -solaris2*) #(vi - case "x$CPPFLAGS" in #(vi - *-D_XOPEN_SOURCE_EXTENDED*) +case $cf_cv_system_name in +(solaris2*) + case "x$CPPFLAGS" in + (*-D_XOPEN_SOURCE_EXTENDED*) test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 -echo "${as_me:-configure}:21920: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 +echo "${as_me:-configure}:23321: 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//'` @@ -21926,12 +23327,33 @@ echo "${as_me:-configure}:21920: testing moving _XOPEN_SOURCE_EXTENDED to work a ;; esac +# Help to automatically enable the extended curses features when using either +# the *-config or the ".pc" files by adding defines. +echo "$as_me:23332: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 +echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6 +PKG_CFLAGS= +for cf_loop1 in $CPPFLAGS_after_XOPEN +do + cf_found=no + for cf_loop2 in $CPPFLAGS_before_XOPEN + do + if test "x$cf_loop1" = "x$cf_loop2" + then + cf_found=yes + break + fi + done + test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" +done +echo "$as_me:23348: result: $PKG_CFLAGS" >&5 +echo "${ECHO_T}$PKG_CFLAGS" >&6 + # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. -case "x$NCURSES_OSPEED" in #(vi -*short*) #(vi +case "x$NCURSES_OSPEED" in +(*short*) cf_compatible=1 ;; -*) +(*) cf_compatible=0 ;; esac @@ -21941,13 +23363,13 @@ cat >>confdefs.h <&6 + +echo "${as_me:-configure}:23405: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 + +fi + +if test "x$WILDCARD_SYMS" = xno +then + cf_filter_syms=yes +fi + +test "x$cf_with_trace" = xyes && NCURSES_INLINE= + +UNALTERED_SYMS=`echo "$RESULTING_SYMS" | sed -e 's/\\$/\\\\$/g'` +if test $cf_filter_syms = yes +then + RESULTING_SYMS=resulting.map +fi + +if test "x$cross_compiling" = xyes ; then + ADAGEN_LDFLAGS='$(CROSS_LDFLAGS)' +else + ADAGEN_LDFLAGS='$(NATIVE_LDFLAGS)' +fi + ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.in include/ncurses_dll.h include/termcap.h include/unctrl.h $SUB_SCRIPTS $SUB_MAKEFILES Makefile" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF @@ -22053,7 +23506,7 @@ DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:22056: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:23509: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -22185,7 +23638,7 @@ EOF cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:22232: error: ambiguous option: $1 + { { echo "$as_me:23685: 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;} @@ -22248,7 +23701,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:22251: error: unrecognized option: $1 + -*) { { echo "$as_me:23704: 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;} @@ -22267,7 +23720,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20141204, executed with +This file was extended by $as_me 2.52.20150926, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -22287,9 +23740,11 @@ cat >>$CONFIG_STATUS <&5 + *) { { echo "$as_me:23823: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -22559,8 +24020,11 @@ s,@LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t s,@INSTALL_LIB@,$INSTALL_LIB,;t t s,@RPATH_LIST@,$RPATH_LIST,;t t s,@EXPORT_SYMS@,$EXPORT_SYMS,;t t +s,@RESULTING_SYMS@,$RESULTING_SYMS,;t t s,@VERSIONED_SYMS@,$VERSIONED_SYMS,;t t +s,@WILDCARD_SYMS@,$WILDCARD_SYMS,;t t s,@cf_ldd_prog@,$cf_ldd_prog,;t t +s,@EXTRA_SUFFIX@,$EXTRA_SUFFIX,;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 @@ -22573,6 +24037,7 @@ 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_WCWIDTH_GRAPHICS@,$NCURSES_WCWIDTH_GRAPHICS,;t t s,@NCURSES_CH_T@,$NCURSES_CH_T,;t t s,@NCURSES_LIBUTF8@,$NCURSES_LIBUTF8,;t t s,@NEED_WCHAR_H@,$NEED_WCHAR_H,;t t @@ -22583,6 +24048,7 @@ s,@NCURSES_OK_WCHAR_T@,$NCURSES_OK_WCHAR_T,;t t s,@NCURSES_OK_WINT_T@,$NCURSES_OK_WINT_T,;t t s,@cf_cv_enable_lp64@,$cf_cv_enable_lp64,;t t s,@NCURSES_TPARM_VARARGS@,$NCURSES_TPARM_VARARGS,;t t +s,@NCURSES_WATTR_MACROS@,$NCURSES_WATTR_MACROS,;t t s,@NCURSES_BOOL@,$NCURSES_BOOL,;t t s,@TERMINFO_CAPS@,$TERMINFO_CAPS,;t t s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t @@ -22598,13 +24064,16 @@ s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t s,@NCURSES_SBOOL@,$NCURSES_SBOOL,;t t s,@NCURSES_XNAMES@,$NCURSES_XNAMES,;t t -s,@NCURSES_INTEROP_FUNCS@,$NCURSES_INTEROP_FUNCS,;t t s,@PTHREAD@,$PTHREAD,;t t s,@cf_cv_enable_reentrant@,$cf_cv_enable_reentrant,;t t s,@cf_cv_enable_opaque@,$cf_cv_enable_opaque,;t t -s,@NCURSES_OPAQUE@,$NCURSES_OPAQUE,;t t s,@NCURSES_SIZE_T@,$NCURSES_SIZE_T,;t t +s,@NCURSES_OPAQUE@,$NCURSES_OPAQUE,;t t +s,@NCURSES_OPAQUE_FORM@,$NCURSES_OPAQUE_FORM,;t t +s,@NCURSES_OPAQUE_MENU@,$NCURSES_OPAQUE_MENU,;t t +s,@NCURSES_OPAQUE_PANEL@,$NCURSES_OPAQUE_PANEL,;t t s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t +s,@NCURSES_INTEROP_FUNCS@,$NCURSES_INTEROP_FUNCS,;t t s,@ECHO_LT@,$ECHO_LT,;t t s,@ECHO_LD@,$ECHO_LD,;t t s,@RULE_CC@,$RULE_CC,;t t @@ -22650,6 +24119,9 @@ s,@DFT_ARG_SUFFIX@,$DFT_ARG_SUFFIX,;t t s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t s,@DFT_OBJ_SUBDIR@,$DFT_OBJ_SUBDIR,;t t s,@CXX_LIB_SUFFIX@,$CXX_LIB_SUFFIX,;t t +s,@USE_ARG_SUFFIX@,$USE_ARG_SUFFIX,;t t +s,@USE_CFG_SUFFIX@,$USE_CFG_SUFFIX,;t t +s,@USE_LIB_SUFFIX@,$USE_LIB_SUFFIX,;t t s,@TICS_ARG_SUFFIX@,$TICS_ARG_SUFFIX,;t t s,@TICS_DEP_SUFFIX@,$TICS_DEP_SUFFIX,;t t s,@TICS_LIB_SUFFIX@,$TICS_LIB_SUFFIX,;t t @@ -22689,8 +24161,12 @@ 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 +s,@LIBTOOL_OPTS_CXX@,$LIBTOOL_OPTS_CXX,;t t +s,@PKG_CFLAGS@,$PKG_CFLAGS,;t t s,@MISC_INSTALL_DATA@,$MISC_INSTALL_DATA,;t t s,@MISC_UNINSTALL_DATA@,$MISC_UNINSTALL_DATA,;t t +s,@UNALTERED_SYMS@,$UNALTERED_SYMS,;t t +s,@ADAGEN_LDFLAGS@,$ADAGEN_LDFLAGS,;t t CEOF EOF @@ -22719,10 +24195,28 @@ EOF # These are the two extra sed commands mentioned above. (echo ':t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed + # It is possible to make a multiline substitution using escaped newlines. + # Ensure that we do not split the substitution between script fragments. + ac_BEG=$ac_end + ac_END=`expr $ac_end + $ac_max_sed_lines` + sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next + if test -s $tmp/subs.next; then + grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit + if test ! -s $tmp/subs.edit; then + grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit + if test ! -s $tmp/subs.edit; then + if test $ac_beg -gt 1; then + ac_end=`expr $ac_end - 1` + continue + fi + fi + fi + fi + if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" fi ac_sed_frag=`expr $ac_sed_frag + 1` ac_beg=$ac_end @@ -22805,7 +24299,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:22808: creating $ac_file" >&5 + { echo "$as_me:24302: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -22823,7 +24317,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:22826: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24320: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -22836,7 +24330,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:22839: error: cannot find input file: $f" >&5 + { { echo "$as_me:24333: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -22852,7 +24346,7 @@ cat >>$CONFIG_STATUS <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' $ac_item` if test -z "$ac_used"; then - { echo "$as_me:22855: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:24349: 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;} @@ -22861,7 +24355,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:22864: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:24358: 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;} @@ -22898,7 +24392,7 @@ s,@INSTALL@,$ac_INSTALL,;t t 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:22901: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:24395: 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;} @@ -22909,7 +24403,7 @@ $ac_seen" >&2;} 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:22912: WARNING: Some variables may not be substituted: + { echo "$as_me:24406: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -22958,7 +24452,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:22961: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:24455: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -22969,7 +24463,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:22972: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24466: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -22982,7 +24476,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:22985: error: cannot find input file: $f" >&5 + { { echo "$as_me:24479: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -23040,7 +24534,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:23043: $ac_file is unchanged" >&5 + { echo "$as_me:24537: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -23106,8 +24600,8 @@ fi cf_prefix=$LIB_PREFIX -case $cf_cv_shlib_version in #(vi -cygdll|msysdll|mingw) +case $cf_cv_shlib_version in +(cygdll|msysdll|mingw) TINFO_NAME=$TINFO_ARG_SUFFIX TINFO_SUFFIX=.dll ;; @@ -23115,17 +24609,17 @@ esac if test -n "$TINFO_SUFFIX" ; then case $TINFO_SUFFIX in - tw*) - TINFO_NAME="${TINFO_NAME}tw" - TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^tw//'` + (tw*) + TINFO_NAME="${TINFO_NAME}tw${EXTRA_SUFFIX}" + TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^tw'$EXTRA_SUFFIX'//'` ;; - t*) - TINFO_NAME="${TINFO_NAME}t" - TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^t//'` + (t*) + TINFO_NAME="${TINFO_NAME}t${EXTRA_SUFFIX}" + TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^t'$EXTRA_SUFFIX'//'` ;; - w*) - TINFO_NAME="${TINFO_NAME}w" - TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^w//'` + (w*) + TINFO_NAME="${TINFO_NAME}w${EXTRA_SUFFIX}" + TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^w'$EXTRA_SUFFIX'//'` ;; esac fi @@ -23138,98 +24632,134 @@ do SHARED_LIB= Libs_To_Make= + cf_awk_program= + if test -n "${cf_cv_abi_version}" && test "x${cf_cv_abi_version}" != "x5" + then + cf_awk_program="$cf_awk_program\ +/deprecated in ABI${cf_cv_abi_version}/ { next; }\ +{ sub(\"NCURSES([WT]+)?\", \"&${cf_cv_abi_version}\"); }\ +" + fi + + if test "x$WILDCARD_SYMS" = xno + then + cf_awk_program="$cf_awk_program\ +/[ ]_\\*;/ { skip=1; next; }\ +" + fi + + if test "x$cf_awk_program" != "x" + then + cat >>$cf_dir/Makefile <\$@ + +distclean:: + rm -f resulting.map +CF_EOF + fi + for cf_item in $cf_LIST_MODELS do - case X$cf_item in #(vi - Xlibtool) #(vi + case X$cf_item in + (Xlibtool) cf_suffix='.la' cf_depsuf=$cf_suffix ;; - Xdebug) #(vi + (Xdebug) cf_suffix='_g.a' cf_depsuf=$cf_suffix ;; - Xprofile) #(vi + (Xprofile) cf_suffix='_p.a' cf_depsuf=$cf_suffix ;; - Xshared) #(vi + (Xshared) case $cf_cv_system_name in - aix[5-7]*) #(vi + (aix[5-7]*) cf_suffix='.so' cf_depsuf=$cf_suffix ;; - cygwin*|msys*|mingw*) #(vi + (cygwin*|msys*|mingw*) cf_suffix='.dll' cf_depsuf='.dll.a' ;; - darwin*) #(vi + (darwin*) cf_suffix='.dylib' cf_depsuf=$cf_suffix ;; - hpux*) #(vi + (hpux*) case $target in - ia64*) #(vi + (ia64*) cf_suffix='.so' cf_depsuf=$cf_suffix ;; - *) #(vi + (*) cf_suffix='.sl' cf_depsuf=$cf_suffix ;; esac ;; - *) #(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}" + if test -n "${LIB_SUFFIX}${EXTRA_SUFFIX}" + then + cf_suffix="${LIB_SUFFIX}${EXTRA_SUFFIX}${cf_suffix}" + cf_depsuf="${LIB_SUFFIX}${EXTRA_SUFFIX}${cf_depsuf}" + fi cf_libname=$cf_dir test "$cf_dir" = c++ && cf_libname=ncurses++ if test $cf_item = shared ; then if test -n "${LIB_SUFFIX}" then - cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${LIB_SUFFIX}"'//'` + cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${USE_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 + case "$cf_cv_shlib_version" in + (rel) cf_version_name=REL_VERSION ;; - abi) + (abi) cf_version_name=ABI_VERSION ;; esac if test -n "$cf_version_name" then - case "$cf_cv_system_name" in #(vi - darwin*) + case "$cf_cv_system_name" in + (darwin*) # "w", etc? - cf_suffix="${LIB_SUFFIX}"'.${'$cf_version_name'}'"$cf_shared_suffix" - ;; #(vi - *) + cf_suffix="${USE_LIB_SUFFIX}"'.${'$cf_version_name'}'"$cf_shared_suffix" + ;; + (*) cf_suffix="$cf_suffix"'.${'$cf_version_name'}' ;; esac fi - if test -n "${LIB_SUFFIX}" + if test -n "${USE_LIB_SUFFIX}" then - cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${LIB_SUFFIX}"'//'` + cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${USE_LIB_SUFFIX}"'//'` else cf_shared_suffix="$cf_suffix" fi @@ -23237,25 +24767,31 @@ do # 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 + case $cf_cv_shlib_version in + (cygdll) 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 + cf_add_lib="../lib/cyg${cf_libname}${cf_cygsuf}" ;; - msysdll) #(vi + (msysdll) 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 + cf_add_lib="../lib/msys-${cf_libname}${cf_cygsuf}" ;; - mingw) + (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 + cf_add_lib="../lib/lib${cf_libname}${cf_cygsuf}" + ;; + (*) + cf_add_lib= ;; esac + if test -n "$cf_add_lib" + then + Libs_To_Make="$Libs_To_Make $cf_add_lib" + continue + fi fi - Libs_To_Make="$Libs_To_Make ../lib/${cf_prefix}${cf_libname}${cf_suffix}" + cf_add_lib="../lib/${cf_prefix}${cf_libname}${cf_suffix}" + Libs_To_Make="$Libs_To_Make $cf_add_lib" done if test $cf_dir = ncurses ; then @@ -23268,20 +24804,20 @@ do cf_l_parts=`echo "$cf_r_parts" |sed -e 's/ .*$//'` cf_r_parts=`echo "$cf_r_parts" |sed -e 's/^[^ ]* //'` if test "$cf_l_parts" != "$cf_r_parts" ; then - cf_item= - case $cf_l_parts in #(vi - *termlib*) #(vi - cf_item=`echo $cf_liblist |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g` + cf_add_lib= + case $cf_l_parts in + (*termlib*) + cf_add_lib=`echo $cf_liblist |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g` ;; - *ticlib*) - cf_item=`echo $cf_liblist |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g` + (*ticlib*) + cf_add_lib=`echo $cf_liblist |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g` ;; - *) + (*) break ;; esac - if test -n "$cf_item"; then - Libs_To_Make="$cf_item $Libs_To_Make" + if test -n "$cf_add_lib"; then + Libs_To_Make="$cf_add_lib $Libs_To_Make" fi else break @@ -23297,9 +24833,9 @@ do for cf_item in $Libs_To_Make do case $cf_item in - *.a) + (*.a) ;; - *) + (*) cf_item=`echo "$cf_item" | sed -e "s,"$cf_shared_suffix",.a,"` ;; esac @@ -23339,83 +24875,86 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ CXX_MODEL=$cf_ITEM if test "$CXX_MODEL" = SHARED; then - case $cf_cv_shlib_version in #(vi - cygdll|msysdll|mingw) #(vi + case $cf_cv_shlib_version in + (cygdll|msysdll|mingw) test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 -echo "${as_me:-configure}:23346: testing overriding CXX_MODEL to SHARED ..." 1>&5 +echo "${as_me:-configure}:24882: 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 + case X$cf_item in + (Xlibtool) cf_suffix='.la' cf_depsuf=$cf_suffix ;; - Xdebug) #(vi + (Xdebug) cf_suffix='_g.a' cf_depsuf=$cf_suffix ;; - Xprofile) #(vi + (Xprofile) cf_suffix='_p.a' cf_depsuf=$cf_suffix ;; - Xshared) #(vi + (Xshared) case $cf_cv_system_name in - aix[5-7]*) #(vi + (aix[5-7]*) cf_suffix='.so' cf_depsuf=$cf_suffix ;; - cygwin*|msys*|mingw*) #(vi + (cygwin*|msys*|mingw*) cf_suffix='.dll' cf_depsuf='.dll.a' ;; - darwin*) #(vi + (darwin*) cf_suffix='.dylib' cf_depsuf=$cf_suffix ;; - hpux*) #(vi + (hpux*) case $target in - ia64*) #(vi + (ia64*) cf_suffix='.so' cf_depsuf=$cf_suffix ;; - *) #(vi + (*) cf_suffix='.sl' cf_depsuf=$cf_suffix ;; esac ;; - *) #(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}" + if test -n "${LIB_SUFFIX}${EXTRA_SUFFIX}" + then + cf_suffix="${LIB_SUFFIX}${EXTRA_SUFFIX}${cf_suffix}" + cf_depsuf="${LIB_SUFFIX}${EXTRA_SUFFIX}${cf_depsuf}" + fi case $cf_item in - libtool) cf_subdir='obj_lo' ;; - normal) cf_subdir='objects' ;; - debug) cf_subdir='obj_g' ;; - profile) cf_subdir='obj_p' ;; - shared) - case $cf_cv_system_name in #(vi - cygwin|msys) #(vi + (libtool) cf_subdir='obj_lo' ;; + (normal) cf_subdir='objects' ;; + (debug) cf_subdir='obj_g' ;; + (profile) cf_subdir='obj_p' ;; + (shared) + case $cf_cv_system_name in + (cygwin|msys) cf_subdir='objects' ;; - *) + (*) cf_subdir='obj_s' ;; esac esac @@ -23424,24 +24963,24 @@ echo "${as_me:-configure}:23346: testing overriding CXX_MODEL to SHARED ..." 1>& cf_libname=$cf_dir if test $cf_dir = ncurses ; then case $cf_subset in - *base*) - cf_libname=${cf_libname}$LIB_SUFFIX + (*base*) + cf_libname=${cf_libname}$USE_LIB_SUFFIX ;; - *termlib*) + (*termlib*) cf_libname=$TINFO_LIB_SUFFIX ;; - ticlib*) + (ticlib*) cf_libname=$TICS_LIB_SUFFIX ;; esac elif test $cf_dir = c++ ; then - cf_libname=ncurses++$LIB_SUFFIX + cf_libname=ncurses++$USE_LIB_SUFFIX else - cf_libname=${cf_libname}$LIB_SUFFIX + cf_libname=${cf_libname}$USE_LIB_SUFFIX fi - if test -n "${DFT_ARG_SUFFIX}" ; then - # undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX - cf_suffix=`echo $cf_suffix |sed -e "s%^${LIB_SUFFIX}%%"` + if test -n "${USE_ARG_SUFFIX}" ; then + # undo $USE_LIB_SUFFIX add-on in CF_LIB_SUFFIX + cf_suffix=`echo $cf_suffix |sed -e "s%^${USE_LIB_SUFFIX}%%"` fi # These dependencies really are for development, not @@ -23462,22 +25001,27 @@ echo "${as_me:-configure}:23346: testing overriding CXX_MODEL to SHARED ..." 1>& cf_dir_suffix= old_cf_suffix="$cf_suffix" if test "$cf_cv_shlib_version_infix" = yes ; then - if test -n "$LIB_SUFFIX" ; then - case $LIB_SUFFIX in - tw*) - cf_libname=`echo $cf_libname | sed 's/tw$//'` - cf_suffix=`echo $cf_suffix | sed 's/^tw//'` - cf_dir_suffix=tw + if test -n "$USE_LIB_SUFFIX" ; then + case $USE_LIB_SUFFIX in + (tw*) + cf_libname=`echo $cf_libname | sed 's/tw'$EXTRA_SUFFIX'$//'` + cf_suffix=`echo $cf_suffix | sed 's/^tw'$EXTRA_SUFFIX'//'` + cf_dir_suffix=tw$EXTRA_SUFFIX + ;; + (t*) + cf_libname=`echo $cf_libname | sed 's/t'$EXTRA_SUFFIX'$//'` + cf_suffix=`echo $cf_suffix | sed 's/^t'$EXTRA_SUFFIX'//'` + cf_dir_suffix=t$EXTRA_SUFFIX ;; - t*) - cf_libname=`echo $cf_libname | sed 's/t$//'` - cf_suffix=`echo $cf_suffix | sed 's/^t//'` - cf_dir_suffix=t + (w*) + cf_libname=`echo $cf_libname | sed 's/w'$EXTRA_SUFFIX'$//'` + cf_suffix=`echo $cf_suffix | sed 's/^w'$EXTRA_SUFFIX'//'` + cf_dir_suffix=w$EXTRA_SUFFIX ;; - w*) - cf_libname=`echo $cf_libname | sed 's/w$//'` - cf_suffix=`echo $cf_suffix | sed 's/^w//'` - cf_dir_suffix=w + (*) + cf_libname=`echo $cf_libname | sed 's/'$EXTRA_SUFFIX'$//'` + cf_suffix=`echo $cf_suffix | sed 's/^'$EXTRA_SUFFIX'//'` + cf_dir_suffix=$EXTRA_SUFFIX ;; esac fi @@ -23542,7 +25086,7 @@ do if test -f $cf_dir/Makefile ; then case "$cf_dir" in - Ada95) #(vi + (Ada95) echo 'libs \' >> Makefile echo 'install.libs \' >> Makefile echo 'uninstall.libs ::' >> Makefile @@ -23635,7 +25179,7 @@ rm -f headers.sed headers.sh echo creating headers.sh cat >headers.sh <>headers.sh </<\$END\/\$NAME>/" >> \$TMPSED done ;; -*) +(*) echo "" >> \$TMPSED ;; esac @@ -23673,7 +25217,7 @@ CF_EOF else cat >>headers.sh </<\$END\/\$NAME>/" >> \$TMPSED done ;; -*) +(*) echo "s///" >> \$TMPSED ;; esac