X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=configure;h=ee0761311a1a6c4b9236380a5457c15ad10b446b;hp=bdb34be3545cd42f48f7037a1e8c1c9a2810686c;hb=2017ab0e60ca857accae38a01252e0cbdf5f1efe;hpb=ffc2db8cc2a9212f8c02b512eb97919b564b42c1 diff --git a/configure b/configure index bdb34be3..ee076131 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Revision: 1.571 . +# From configure.in Revision: 1.656 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20121002. +# Generated by Autoconf 2.52.20170501. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -706,13 +706,17 @@ Optional Features: --without-ada suppress check for Ada95, don't build demo --without-cxx do not adjust ncurses bool to match C++ --without-cxx-binding do not build C++ binding and demo + --disable-db-install suppress install of terminal database --without-manpages suppress install of manpages - --without-progs suppress build with programs (e.g., tic) - --without-tests suppress build with test-programs + --without-progs suppress build/install with programs (e.g., tic) + --without-tack suppress build/install with tack program + --without-tests suppress build/install with test-programs --without-curses-h install curses.h as ncurses.h only + --with-config-suffix=X suffixes ncursesXX-config file --with-pkg-config{=path} enable/disable use of pkg-config --with-pkg-config-libdir=XXX use given directory for installing pc-files --enable-pc-files generate and install .pc files for pkg-config + --with-pc-suffix suffixes pc-files --enable-mixed-case tic should assume mixed-case filenames --with-install-prefix prefixes actual install-location ($DESTDIR) Build-Tools Needed to Compile Temporary Applications for Cross-compiling: @@ -739,9 +743,14 @@ Options to Specify the Libraries Built/Used: --enable-rpath use rpath option when generating shared libraries --disable-relink relink shared libraries during install --with-shlib-version=X Specify rel or abi version for shared libs + --with-libtool-opts=XXX specify additional libtool options + --with-export-syms=XXX limit exported symbols using libtool + --with-versioned-syms=X markup versioned symbols using ld + --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 @@ -766,12 +775,15 @@ 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-x11-rgb=FILE file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt) --with-bool=TYPE override fallback type of bool variable --with-caps=alt compile with alternate Caps file --with-chtype=TYPE override type of chtype --with-ospeed=TYPE override type of ospeed variable --with-mmask-t=TYPE override type of mmask_t --with-ccharw-max=XXX override size CCHARW_MAX + --enable-signed-char compile using signed Boolean's in term.h --with-tparm-arg=TYPE override parameter type of tparm --with-rcs-ids compile-in RCS identifiers Options to Specify How Manpages are Installed: @@ -783,15 +795,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 +Reentrant Code: + --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 @@ -800,17 +822,13 @@ 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 + --disable-stripping do not strip installed executables --enable-warnings build: turn on GCC compiler warnings --enable-string-hacks work around bogus compiler/loader warnings --enable-assertions test: turn on generation of assertion code @@ -821,11 +839,12 @@ Testing/development Options: --enable-expanded test: generate functions for certain macros --disable-macros test: use functions rather than macros --with-trace test: add trace() function to all models of ncurses + --disable-gnat-projects test: disable GNAT projects even if usable Ada95 Binding Options: --with-ada-compiler=CMD specify Ada95 compiler command (default gnatmake) --with-ada-include=DIR Ada includes are in DIR (default: PREFIX/share/ada/adainclude) --with-ada-objects=DIR Ada objects are in DIR (default: PREFIX/lib/ada/adalib) - --with-ada-sharedlib=XX build Ada95 shared-library + --with-ada-sharedlib=soname build shared-library (requires GNAT projects) Some influential environment variables: CC C compiler command @@ -898,7 +917,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.20121002. Invocation command line was +generated by GNU Autoconf 2.52.20170501. Invocation command line was $ $0 $@ @@ -1022,7 +1041,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:1025: loading site script $ac_site_file" >&5 + { echo "$as_me:1044: 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" @@ -1033,7 +1052,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:1036: loading cache $cache_file" >&5 + { echo "$as_me:1055: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1041,7 +1060,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:1044: creating cache $cache_file" >&5 + { echo "$as_me:1063: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1057,21 +1076,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:1060: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:1079: 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:1064: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:1083: 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:1070: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:1089: 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:1072: former value: $ac_old_val" >&5 + { echo "$as_me:1091: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:1074: current value: $ac_new_val" >&5 + { echo "$as_me:1093: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -1090,9 +1109,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if $ac_cache_corrupted; then - { echo "$as_me:1093: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1112: 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:1095: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1114: 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 @@ -1104,19 +1123,19 @@ 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 -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; +case `echo "testing\c" 2>/dev/null; echo 1,2,3`,`echo -n testing 2>/dev/null; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C= # newlines do not sed ;-) only broken shells would use this case anyway + ECHO_T=' ' ;; *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; *) ECHO_N= ECHO_C='\c' ECHO_T= ;; esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1116: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1135: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1119: \$? = $ac_status" >&5 + echo "$as_me:1138: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -1129,21 +1148,21 @@ ac_config_headers="$ac_config_headers include/ncurses_cfg.h:include/ncurses_cfg. top_builddir=`pwd` -echo "$as_me:1132: checking for egrep" >&5 +echo "$as_me:1151: 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:1142: result: $ac_cv_prog_egrep" >&5 +echo "$as_me:1161: 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:1146: error: No egrep program found" >&5 + test -z "$EGREP" && { { echo "$as_me:1165: error: No egrep program found" >&5 echo "$as_me: error: No egrep program found" >&2;} { (exit 1); exit 1; }; } @@ -1153,15 +1172,99 @@ 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:1156: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 +echo "$as_me:1175: 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:1179: checking for package version" >&5 +echo $ECHO_N "checking for package version... $ECHO_C" >&6 + + # if there are not enough fields, cut returns the last one... + cf_field1=`sed -e '2,$d' $srcdir/VERSION|cut -f1` + cf_field2=`sed -e '2,$d' $srcdir/VERSION|cut -f2` + cf_field3=`sed -e '2,$d' $srcdir/VERSION|cut -f3` + + # this is how CF_BUNDLED_INTL uses $VERSION: + VERSION="$cf_field1" + + VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'` + test -z "$VERSION_MAJOR" && { { echo "$as_me:1191: 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:1196: error: missing minor-version" >&5 +echo "$as_me: error: missing minor-version" >&2;} + { (exit 1); exit 1; }; } + + echo "$as_me:1200: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5 +echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6 + + echo "$as_me:1203: 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:1208: error: missing patch-date $VERSION_PATCH" >&5 +echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;} + { (exit 1); exit 1; }; } + ;; + (.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]) + ;; + (*) + { { echo "$as_me:1215: 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:1220: result: $VERSION_PATCH" >&5 +echo "${ECHO_T}$VERSION_PATCH" >&6 +else + { { echo "$as_me:1223: error: did not find $srcdir/VERSION" >&5 +echo "$as_me: error: did not find $srcdir/VERSION" >&2;} + { (exit 1); exit 1; }; } +fi + +# show the actual data that we have for versions: +test -n "$verbose" && echo " ABI VERSION $VERSION" 1>&6 + +echo "${as_me:-configure}:1231: testing ABI VERSION $VERSION ..." 1>&5 + +test -n "$verbose" && echo " VERSION_MAJOR $VERSION_MAJOR" 1>&6 + +echo "${as_me:-configure}:1235: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5 + +test -n "$verbose" && echo " VERSION_MINOR $VERSION_MINOR" 1>&6 + +echo "${as_me:-configure}:1239: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5 + +test -n "$verbose" && echo " VERSION_PATCH $VERSION_PATCH" 1>&6 + +echo "${as_me:-configure}:1243: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5 + + cf_PACKAGE=NCURSES + PACKAGE=ncurses + +cat >>confdefs.h <>confdefs.h <>confdefs.h <&5 + { echo "$as_me:1267: 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; @@ -1170,33 +1273,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:1177: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 + (*) + { { echo "$as_me:1280: 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:1183: error: Release major-version value is empty" >&5 + { { echo "$as_me:1286: 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:1193: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 + (*) + { { echo "$as_me:1296: 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:1199: error: Release minor-version value is empty" >&5 + { { echo "$as_me:1302: error: Release minor-version value is empty" >&5 echo "$as_me: error: Release minor-version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -1206,27 +1309,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:1209: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 + + if test "x$cf_cv_abi_version" != "x$withval" + then + { echo "$as_me:1315: 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:1219: error: ABI version is not a number: $cf_cv_abi_version" >&5 + (*) + { { echo "$as_me:1334: 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:1225: error: ABI version value is empty" >&5 + { { echo "$as_me:1340: 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 @@ -1244,7 +1368,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1247: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1371: 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 @@ -1254,11 +1378,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:1257: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1381: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1261: checking build system type" >&5 +echo "$as_me:1385: 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 @@ -1267,23 +1391,23 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1270: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1394: 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:1274: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1398: 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:1279: result: $ac_cv_build" >&5 +echo "$as_me:1403: 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:1286: checking host system type" >&5 +echo "$as_me:1410: 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 @@ -1292,12 +1416,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:1295: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1419: 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:1300: result: $ac_cv_host" >&5 +echo "$as_me:1424: 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/'` @@ -1305,7 +1429,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:1308: checking target system type" >&5 + echo "$as_me:1432: 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 @@ -1314,12 +1438,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:1317: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + { { echo "$as_me:1441: 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:1322: result: $ac_cv_target" >&5 +echo "$as_me:1446: 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/'` @@ -1351,13 +1475,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1354: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1478: 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:1358: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1482: 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:1360: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1484: 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 @@ -1365,7 +1489,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:1368: WARNING: overriding system type to $withval" >&5 + { echo "$as_me:1492: 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 @@ -1377,23 +1501,23 @@ cf_user_CFLAGS="$CFLAGS" ### Default install-location -echo "$as_me:1380: checking for prefix" >&5 +echo "$as_me:1504: checking for prefix" >&5 echo $ECHO_N "checking for prefix... $ECHO_C" >&6 if test "x$prefix" = "xNONE" ; then case "$cf_cv_system_name" in # non-vendor systems don't have a conflict - openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu|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:1392: result: $prefix" >&5 +echo "$as_me:1516: result: $prefix" >&5 echo "${ECHO_T}$prefix" >&6 if test "x$prefix" = "xNONE" ; then -echo "$as_me:1396: checking for default include-directory" >&5 +echo "$as_me:1520: 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 \ @@ -1416,10 +1540,41 @@ do fi test -n "$verbose" && echo " tested $cf_dir" 1>&6 done -echo "$as_me:1419: result: $includedir" >&5 +echo "$as_me:1543: 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. @@ -1447,7 +1602,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:1450: checking for $ac_word" >&5 +echo "$as_me:1605: 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 @@ -1462,7 +1617,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:1465: found $ac_dir/$ac_word" >&5 +echo "$as_me:1620: found $ac_dir/$ac_word" >&5 break done @@ -1470,10 +1625,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1473: result: $CC" >&5 + echo "$as_me:1628: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1476: result: no" >&5 + echo "$as_me:1631: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1486,7 +1641,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:1489: checking for $ac_word" >&5 +echo "$as_me:1644: 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 @@ -1501,7 +1656,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:1504: found $ac_dir/$ac_word" >&5 +echo "$as_me:1659: found $ac_dir/$ac_word" >&5 break done @@ -1509,10 +1664,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1512: result: $ac_ct_CC" >&5 + echo "$as_me:1667: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1515: result: no" >&5 + echo "$as_me:1670: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1522,36 +1677,36 @@ done CC=$ac_ct_CC fi -test -z "$CC" && { { echo "$as_me:1525: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1680: 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:1530:" \ +echo "$as_me:1685:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1533: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1688: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1536: \$? = $ac_status" >&5 + echo "$as_me:1691: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1538: \"$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:1541: \$? = $ac_status" >&5 + echo "$as_me:1696: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1543: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1698: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1546: \$? = $ac_status" >&5 + echo "$as_me:1701: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1550 "configure" +#line 1705 "configure" #include "confdefs.h" int -main () +main (void) { ; @@ -1563,13 +1718,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:1566: checking for C compiler default output" >&5 +echo "$as_me:1721: 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:1569: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1724: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1572: \$? = $ac_status" >&5 + echo "$as_me:1727: \$? = $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 @@ -1592,34 +1747,34 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1595: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1750: 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:1601: result: $ac_file" >&5 +echo "$as_me:1756: 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:1606: checking whether the C compiler works" >&5 +echo "$as_me:1761: 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:1612: \"$ac_try\"") >&5 + { (eval echo "$as_me:1767: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1615: \$? = $ac_status" >&5 + echo "$as_me:1770: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1622: error: cannot run C compiled programs. + { { echo "$as_me:1777: 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;} @@ -1627,24 +1782,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1630: result: yes" >&5 +echo "$as_me:1785: 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:1637: checking whether we are cross compiling" >&5 +echo "$as_me:1792: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1639: result: $cross_compiling" >&5 +echo "$as_me:1794: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1642: checking for executable suffix" >&5 +echo "$as_me:1797: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1644: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1799: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1647: \$? = $ac_status" >&5 + echo "$as_me:1802: \$? = $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 @@ -1660,29 +1815,29 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1663: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1818: 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:1669: result: $ac_cv_exeext" >&5 +echo "$as_me:1824: 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:1675: checking for object suffix" >&5 +echo "$as_me:1830: 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 1681 "configure" +#line 1836 "configure" #include "confdefs.h" int -main () +main (void) { ; @@ -1690,10 +1845,10 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1693: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1848: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1696: \$? = $ac_status" >&5 + echo "$as_me:1851: \$? = $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 @@ -1705,28 +1860,28 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1708: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1863: 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:1715: result: $ac_cv_objext" >&5 +echo "$as_me:1870: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1719: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1874: 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 1725 "configure" +#line 1880 "configure" #include "confdefs.h" int -main () +main (void) { #ifndef __GNUC__ choke me @@ -1737,16 +1892,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1740: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1895: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1743: \$? = $ac_status" >&5 + echo "$as_me:1898: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1746: \"$ac_try\"") >&5 + { (eval echo "$as_me:1901: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1749: \$? = $ac_status" >&5 + echo "$as_me:1904: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1758,23 +1913,23 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1761: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1916: 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:1767: checking whether $CC accepts -g" >&5 +echo "$as_me:1922: 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 1773 "configure" +#line 1928 "configure" #include "confdefs.h" int -main () +main (void) { ; @@ -1782,16 +1937,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1785: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1940: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1788: \$? = $ac_status" >&5 + echo "$as_me:1943: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1791: \"$ac_try\"") >&5 + { (eval echo "$as_me:1946: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1794: \$? = $ac_status" >&5 + echo "$as_me:1949: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1801,7 +1956,7 @@ ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1804: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1959: 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 @@ -1828,16 +1983,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1831: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1986: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1834: \$? = $ac_status" >&5 + echo "$as_me:1989: \$? = $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:1992: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1840: \$? = $ac_status" >&5 + echo "$as_me:1995: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1849,12 +2004,12 @@ if { (eval echo "$as_me:1831: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1852 "configure" +#line 2007 "configure" #include "confdefs.h" #include $ac_declaration int -main () +main (void) { exit (42); ; @@ -1862,16 +2017,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1865: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2020: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1868: \$? = $ac_status" >&5 + echo "$as_me:2023: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1871: \"$ac_try\"") >&5 + { (eval echo "$as_me:2026: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1874: \$? = $ac_status" >&5 + echo "$as_me:2029: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1881,11 +2036,11 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1884 "configure" +#line 2039 "configure" #include "confdefs.h" $ac_declaration int -main () +main (void) { exit (42); ; @@ -1893,16 +2048,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1896: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2051: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1899: \$? = $ac_status" >&5 + echo "$as_me:2054: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1902: \"$ac_try\"") >&5 + { (eval echo "$as_me:2057: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1905: \$? = $ac_status" >&5 + echo "$as_me:2060: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -1932,15 +2087,15 @@ ac_main_return=return GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:1935: checking version of $CC" >&5 + echo "$as_me:2090: 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:1939: result: $GCC_VERSION" >&5 + echo "$as_me:2094: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi -echo "$as_me:1943: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:2098: 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 @@ -1948,7 +2103,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 1951 "configure" +#line 2106 "configure" #include "confdefs.h" #include #include @@ -1979,7 +2134,7 @@ int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, i int argc; char **argv; int -main () +main (void) { return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ; @@ -1997,16 +2152,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:2000: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2155: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2003: \$? = $ac_status" >&5 + echo "$as_me:2158: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2006: \"$ac_try\"") >&5 + { (eval echo "$as_me:2161: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2009: \$? = $ac_status" >&5 + echo "$as_me:2164: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2023,10 +2178,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2026: result: none needed" >&5 + echo "$as_me:2181: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2029: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2184: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -2034,52 +2189,63 @@ esac # This should have been defined by AC_PROG_CC : ${CC:=cc} -echo "$as_me:2037: checking \$CC variable" >&5 +echo "$as_me:2192: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 -case "$CC" in #(vi -*[\ \ ]-[IUD]*) - echo "$as_me:2041: result: broken" >&5 +case "$CC" in +(*[\ \ ]-*) + echo "$as_me:2196: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2043: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2198: 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 "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - 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" | \ @@ -2088,21 +2254,29 @@ 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/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -2111,22 +2285,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}:2315: testing resulting CC: '$CC' ..." 1>&5 + + test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 + +echo "${as_me:-configure}:2319: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 + + test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 + +echo "${as_me:-configure}:2323: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 + ;; -*) - echo "$as_me:2129: result: ok" >&5 +(*) + echo "$as_me:2327: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac @@ -2137,7 +2335,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:2140: checking how to run the C preprocessor" >&5 +echo "$as_me:2338: 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 @@ -2158,18 +2356,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 2161 "configure" +#line 2359 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2166: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2364: \"$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:2172: \$? = $ac_status" >&5 + echo "$as_me:2370: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2192,17 +2390,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 2195 "configure" +#line 2393 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2199: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2397: \"$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:2205: \$? = $ac_status" >&5 + echo "$as_me:2403: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2239,7 +2437,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2242: result: $CPP" >&5 +echo "$as_me:2440: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2249,18 +2447,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 2450 "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:2455: \"$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:2461: \$? = $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 +2481,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 2484 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2290: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2488: \"$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:2494: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2321,7 +2519,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:2324: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2522: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2334,14 +2532,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:2337: checking whether $CC needs -traditional" >&5 + echo "$as_me:2535: 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 2344 "configure" +#line 2542 "configure" #include "confdefs.h" #include int Autoconf = TIOCGETP; @@ -2356,7 +2554,7 @@ rm -rf conftest* if test $ac_cv_prog_gcc_traditional = no; then cat >conftest.$ac_ext <<_ACEOF -#line 2359 "configure" +#line 2557 "configure" #include "confdefs.h" #include int Autoconf = TCGETA; @@ -2369,38 +2567,37 @@ rm -rf conftest* fi fi -echo "$as_me:2372: result: $ac_cv_prog_gcc_traditional" >&5 +echo "$as_me:2570: 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:2379: checking whether $CC understands -c and -o together" >&5 +echo "$as_me:2577: 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:2395: \"$ac_try\"") >&5 +ac_try='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +if { (eval echo "$as_me:2592: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2398: \$? = $ac_status" >&5 + echo "$as_me:2595: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:2400: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:2597: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2403: \$? = $ac_status" >&5 + echo "$as_me:2600: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CC_c_o=yes @@ -2411,24 +2608,24 @@ rm -rf conftest* fi if test $cf_cv_prog_CC_c_o = yes; then - echo "$as_me:2414: result: yes" >&5 + echo "$as_me:2611: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2417: result: no" >&5 + echo "$as_me:2614: 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:2431: checking for $ac_word" >&5 +echo "$as_me:2628: 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 @@ -2445,7 +2642,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:2448: found $ac_dir/$ac_word" >&5 + echo "$as_me:2645: found $ac_dir/$ac_word" >&5 break fi done @@ -2456,18 +2653,18 @@ fi LDCONFIG=$ac_cv_path_LDCONFIG if test -n "$LDCONFIG"; then - echo "$as_me:2459: result: $LDCONFIG" >&5 + echo "$as_me:2656: result: $LDCONFIG" >&5 echo "${ECHO_T}$LDCONFIG" >&6 else - echo "$as_me:2462: result: no" >&5 + echo "$as_me:2659: result: no" >&5 echo "${ECHO_T}no" >&6 fi - ;; -esac + ;; + esac fi -echo "$as_me:2470: checking if you want to ensure bool is consistent with C++" >&5 +echo "$as_me:2667: 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. @@ -2477,7 +2674,7 @@ if test "${with_cxx+set}" = set; then else cf_with_cxx=yes fi; -echo "$as_me:2480: result: $cf_with_cxx" >&5 +echo "$as_me:2677: result: $cf_with_cxx" >&5 echo "${ECHO_T}$cf_with_cxx" >&6 if test "X$cf_with_cxx" = Xno ; then CXX="" @@ -2495,7 +2692,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:2498: checking for $ac_word" >&5 +echo "$as_me:2695: 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 @@ -2510,7 +2707,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:2513: found $ac_dir/$ac_word" >&5 +echo "$as_me:2710: found $ac_dir/$ac_word" >&5 break done @@ -2518,10 +2715,10 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:2521: result: $CXX" >&5 + echo "$as_me:2718: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:2524: result: no" >&5 + echo "$as_me:2721: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2534,7 +2731,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:2537: checking for $ac_word" >&5 +echo "$as_me:2734: 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 @@ -2549,7 +2746,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:2552: found $ac_dir/$ac_word" >&5 +echo "$as_me:2749: found $ac_dir/$ac_word" >&5 break done @@ -2557,10 +2754,10 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:2560: result: $ac_ct_CXX" >&5 + echo "$as_me:2757: result: $ac_ct_CXX" >&5 echo "${ECHO_T}$ac_ct_CXX" >&6 else - echo "$as_me:2563: result: no" >&5 + echo "$as_me:2760: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2572,36 +2769,36 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++" fi # Provide some information about the compiler. -echo "$as_me:2575:" \ +echo "$as_me:2772:" \ "checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:2578: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:2775: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:2581: \$? = $ac_status" >&5 + echo "$as_me:2778: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:2583: \"$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:2586: \$? = $ac_status" >&5 + echo "$as_me:2783: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:2588: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:2785: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:2591: \$? = $ac_status" >&5 + echo "$as_me:2788: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:2594: checking whether we are using the GNU C++ compiler" >&5 +echo "$as_me:2791: 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 2600 "configure" +#line 2797 "configure" #include "confdefs.h" int -main () +main (void) { #ifndef __GNUC__ choke me @@ -2612,16 +2809,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2615: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2812: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2618: \$? = $ac_status" >&5 + echo "$as_me:2815: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2621: \"$ac_try\"") >&5 + { (eval echo "$as_me:2818: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2624: \$? = $ac_status" >&5 + echo "$as_me:2821: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -2633,23 +2830,23 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:2636: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "$as_me:2833: 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:2642: checking whether $CXX accepts -g" >&5 +echo "$as_me:2839: 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 2648 "configure" +#line 2845 "configure" #include "confdefs.h" int -main () +main (void) { ; @@ -2657,16 +2854,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2660: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2857: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2663: \$? = $ac_status" >&5 + echo "$as_me:2860: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2666: \"$ac_try\"") >&5 + { (eval echo "$as_me:2863: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2669: \$? = $ac_status" >&5 + echo "$as_me:2866: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else @@ -2676,7 +2873,7 @@ ac_cv_prog_cxx_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2679: result: $ac_cv_prog_cxx_g" >&5 +echo "$as_me:2876: 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 @@ -2703,12 +2900,12 @@ for ac_declaration in \ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 2706 "configure" +#line 2903 "configure" #include "confdefs.h" #include $ac_declaration int -main () +main (void) { exit (42); ; @@ -2716,16 +2913,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2719: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2916: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2722: \$? = $ac_status" >&5 + echo "$as_me:2919: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2725: \"$ac_try\"") >&5 + { (eval echo "$as_me:2922: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2728: \$? = $ac_status" >&5 + echo "$as_me:2925: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2735,11 +2932,11 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2738 "configure" +#line 2935 "configure" #include "confdefs.h" $ac_declaration int -main () +main (void) { exit (42); ; @@ -2747,16 +2944,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2750: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2947: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2753: \$? = $ac_status" >&5 + echo "$as_me:2950: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2756: \"$ac_try\"") >&5 + { (eval echo "$as_me:2953: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2759: \$? = $ac_status" >&5 + echo "$as_me:2956: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -2779,11 +2976,83 @@ 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 - # autoconf 2.5x removed the error (hardcoding it to g++, or just blank) + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +ac_main_return=return + + if test "x$cf_with_cxx" != xno + then + # Several of the C++ configurations do not work, particularly when + # cross-compiling (20140913 -TD) + echo "$as_me:2990: checking if $CXX works" >&5 +echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6 + + save_CPPFLAGS="$CPPFLAGS" + eval cf_includedir=${includedir} + CPPFLAGS="$CPPFLAGS -I${cf_includedir}" + +cat >conftest.$ac_ext <<_ACEOF +#line 2998 "configure" +#include "confdefs.h" + +#include +#include + +int +main (void) +{ + + printf("Hello world!\n") + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3015: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3018: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3021: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3024: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cxx_works=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cxx_works=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="$save_CPPFLAGS" + + echo "$as_me:3035: result: $cf_cxx_works" >&5 +echo "${ECHO_T}$cf_cxx_works" >&6 + if test "x$cf_cxx_works" = xno + then + { echo "$as_me:3039: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5 +echo "$as_me: WARNING: Ignore $CXX, since it cannot compile hello-world." >&2;} + cf_with_cxx=no; CXX=""; GXX=""; + fi + fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_main_return=return + + # autoconf 2.5x removed the error (hardcoding it to g++, or just blank) if test "$CXX" = "g++" ; then # Extract the first word of "g++", so it can be a program name with args. set dummy g++; ac_word=$2 -echo "$as_me:2786: checking for $ac_word" >&5 +echo "$as_me:3055: 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 @@ -2800,7 +3069,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:2803: found $ac_dir/$ac_word" >&5 + echo "$as_me:3072: found $ac_dir/$ac_word" >&5 break fi done @@ -2811,17 +3080,17 @@ fi CXX=$ac_cv_path_CXX if test -n "$CXX"; then - echo "$as_me:2814: result: $CXX" >&5 + echo "$as_me:3083: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:2817: result: no" >&5 + echo "$as_me:3086: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi - case "x$CXX" in #(vi - x|xg++) - { echo "$as_me:2824: WARNING: You don't have any C++ compiler, too bad" >&5 + case "x$CXX" in + (x|xg++) + { echo "$as_me:3093: 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=""; ;; @@ -2830,24 +3099,28 @@ fi GXX_VERSION=none if test "$GXX" = yes; then - echo "$as_me:2833: checking version of ${CXX:-g++}" >&5 + echo "$as_me:3102: 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:2837: result: $GXX_VERSION" >&5 + if test -z "$GXX_VERSION" + then + GXX_VERSION=unknown + GXX=no + fi + echo "$as_me:3110: 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:2845: WARNING: templates do not work" >&5 + { echo "$as_me:3118: WARNING: templates do not work" >&5 echo "$as_me: WARNING: templates do not work" >&2;} ;; esac -echo "$as_me:2850: checking if you want to build C++ binding and demo" >&5 +echo "$as_me:3123: 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. @@ -2857,15 +3130,28 @@ if test "${with_cxx_binding+set}" = set; then else cf_with_cxx_binding=$cf_with_cxx fi; -echo "$as_me:2860: result: $cf_with_cxx_binding" >&5 +echo "$as_me:3133: result: $cf_with_cxx_binding" >&5 echo "${ECHO_T}$cf_with_cxx_binding" >&6 -echo "$as_me:2863: checking if you want to build with Ada95" >&5 +echo "$as_me:3136: 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:2865: result: $cf_with_ada" >&5 +echo "$as_me:3138: result: $cf_with_ada" >&5 echo "${ECHO_T}$cf_with_ada" >&6 -echo "$as_me:2868: checking if you want to install manpages" >&5 +echo "$as_me:3141: checking if you want to install terminal database" >&5 +echo $ECHO_N "checking if you want to install terminal database... $ECHO_C" >&6 + +# Check whether --enable-db-install or --disable-db-install was given. +if test "${enable_db_install+set}" = set; then + enableval="$enable_db_install" + cf_with_db_install=$enableval +else + cf_with_db_install=yes +fi; +echo "$as_me:3151: result: $cf_with_db_install" >&5 +echo "${ECHO_T}$cf_with_db_install" >&6 + +echo "$as_me:3154: 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. @@ -2875,10 +3161,10 @@ if test "${with_manpages+set}" = set; then else cf_with_manpages=yes fi; -echo "$as_me:2878: result: $cf_with_manpages" >&5 +echo "$as_me:3164: result: $cf_with_manpages" >&5 echo "${ECHO_T}$cf_with_manpages" >&6 -echo "$as_me:2881: checking if you want to build programs such as tic" >&5 +echo "$as_me:3167: 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. @@ -2888,10 +3174,35 @@ if test "${with_progs+set}" = set; then else cf_with_progs=yes fi; -echo "$as_me:2891: result: $cf_with_progs" >&5 +echo "$as_me:3177: result: $cf_with_progs" >&5 echo "${ECHO_T}$cf_with_progs" >&6 -echo "$as_me:2894: checking if you want to build test-programs" >&5 +if test -f $srcdir/tack/tack.h; then + if test "x$cross_compiling" = xyes ; then + test -n "$verbose" && echo " ignoring tack because we are cross-compiling" 1>&6 + +echo "${as_me:-configure}:3184: testing ignoring tack because we are cross-compiling ..." 1>&5 + + cf_with_tack=no + else + echo "$as_me:3188: checking if you want to build the tack program" >&5 +echo $ECHO_N "checking if you want to build the tack program... $ECHO_C" >&6 + +# Check whether --with-tack or --without-tack was given. +if test "${with_tack+set}" = set; then + withval="$with_tack" + cf_with_tack=$withval +else + cf_with_tack=$cf_with_progs +fi; + echo "$as_me:3198: result: $cf_with_tack" >&5 +echo "${ECHO_T}$cf_with_tack" >&6 + fi +else + cf_with_tack=no +fi + +echo "$as_me:3205: 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. @@ -2901,10 +3212,10 @@ if test "${with_tests+set}" = set; then else cf_with_tests=yes fi; -echo "$as_me:2904: result: $cf_with_tests" >&5 +echo "$as_me:3215: result: $cf_with_tests" >&5 echo "${ECHO_T}$cf_with_tests" >&6 -echo "$as_me:2907: checking if you wish to install curses.h" >&5 +echo "$as_me:3218: 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. @@ -2914,13 +3225,12 @@ if test "${with_curses_h+set}" = set; then else with_curses_h=yes fi; -echo "$as_me:2917: result: $with_curses_h" >&5 +echo "$as_me:3228: result: $with_curses_h" >&5 echo "${ECHO_T}$with_curses_h" >&6 modules_to_build="ncurses" -if test "X$cf_with_progs" != Xno ; then -modules_to_build="$modules_to_build progs tack" -fi +test "X$cf_with_progs" != Xno && modules_to_build="$modules_to_build progs" +test "X$cf_with_tack" != Xno && modules_to_build="$modules_to_build tack" modules_to_build="$modules_to_build panel menu form" test "$program_prefix" != NONE && @@ -2940,7 +3250,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:2943: checking for $ac_word" >&5 +echo "$as_me:3253: 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 @@ -2955,7 +3265,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:2958: found $ac_dir/$ac_word" >&5 +echo "$as_me:3268: found $ac_dir/$ac_word" >&5 break done @@ -2963,35 +3273,35 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:2966: result: $AWK" >&5 + echo "$as_me:3276: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:2969: result: no" >&5 + echo "$as_me:3279: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -test -z "$AWK" && { { echo "$as_me:2976: error: No awk program found" >&5 +test -z "$AWK" && { { echo "$as_me:3286: error: No awk program found" >&5 echo "$as_me: error: No awk program found" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:2980: checking for egrep" >&5 +echo "$as_me:3290: 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:2990: result: $ac_cv_prog_egrep" >&5 +echo "$as_me:3300: 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:2994: error: No egrep program found" >&5 + test -z "$EGREP" && { { echo "$as_me:3304: error: No egrep program found" >&5 echo "$as_me: error: No egrep program found" >&2;} { (exit 1); exit 1; }; } @@ -3007,7 +3317,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:3010: checking for a BSD compatible install" >&5 +echo "$as_me:3320: 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 @@ -3056,7 +3366,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:3059: result: $INSTALL" >&5 +echo "$as_me:3369: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -3068,20 +3378,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:3084: checking for $ac_word" >&5 +echo "$as_me:3394: 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 @@ -3096,7 +3406,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:3099: found $ac_dir/$ac_word" >&5 +echo "$as_me:3409: found $ac_dir/$ac_word" >&5 break done @@ -3104,28 +3414,28 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:3107: result: $LINT" >&5 + echo "$as_me:3417: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:3110: result: no" >&5 + echo "$as_me:3420: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$LINT" && break done -echo "$as_me:3117: checking whether ln -s works" >&5 +echo "$as_me:3427: 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:3121: result: yes" >&5 + echo "$as_me:3431: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:3124: result: no, using $LN_S" >&5 + echo "$as_me:3434: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:3128: checking if $LN_S -f options work" >&5 +echo "$as_me:3438: 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 @@ -3137,12 +3447,12 @@ else cf_prog_ln_sf=no fi rm -f conf$$.dst conf$$src -echo "$as_me:3140: result: $cf_prog_ln_sf" >&5 +echo "$as_me:3450: 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:3145: checking for long file names" >&5 +echo "$as_me:3455: 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 @@ -3181,7 +3491,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:3184: result: $ac_cv_sys_long_file_names" >&5 +echo "$as_me:3494: 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 @@ -3191,9 +3501,26 @@ EOF fi -# if we find pkg-config, check if we should install the ".pc" files. +# Provide for renaming "ncurses5-config" to "ncurses5X-config", etc., in case +# of package conflict. +cf_config_suffix= + +# Check whether --with-config-suffix or --without-config-suffix was given. +if test "${with_config_suffix+set}" = set; then + withval="$with_config_suffix" + case "x$withval" in + (xyes|xno) + { echo "$as_me:3513: WARNING: expected a value for config-suffix option" >&5 +echo "$as_me: WARNING: expected a value for config-suffix option" >&2;} + ;; + (*) cf_config_suffix="$withval" + ;; + esac +fi; + +# If we find pkg-config, check if we should install the ".pc" files. -echo "$as_me:3196: checking if you want to use pkg-config" >&5 +echo "$as_me:3523: 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. @@ -3203,19 +3530,19 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:3206: result: $cf_pkg_config" >&5 +echo "$as_me:3533: 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:3218: checking for $ac_word" >&5 +echo "$as_me:3545: 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 @@ -3232,7 +3559,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:3235: found $ac_dir/$ac_word" >&5 + echo "$as_me:3562: found $ac_dir/$ac_word" >&5 break fi done @@ -3243,10 +3570,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:3246: result: $PKG_CONFIG" >&5 + echo "$as_me:3573: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:3249: result: no" >&5 + echo "$as_me:3576: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3255,7 +3582,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:3258: checking for $ac_word" >&5 +echo "$as_me:3585: 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 @@ -3272,7 +3599,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:3275: found $ac_dir/$ac_word" >&5 + echo "$as_me:3602: found $ac_dir/$ac_word" >&5 break fi done @@ -3284,10 +3611,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:3287: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:3614: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:3290: result: no" >&5 + echo "$as_me:3617: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3297,7 +3624,7 @@ else fi ;; -*) +(*) PKG_CONFIG=$withval ;; esac @@ -3306,83 +3633,136 @@ 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:3333: 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:3660: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } - ;; + ;; esac +elif test "x$cf_pkg_config" != xno ; then + { echo "$as_me:3667: WARNING: pkg-config is not installed" >&5 +echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi -if test "$PKG_CONFIG" != none ; then - echo "$as_me:3342: checking for $PKG_CONFIG library directory" >&5 +case $PKG_CONFIG in +(no|none|yes) + echo "$as_me:3673: checking for pkg-config library directory" >&5 +echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6 + ;; +(*) + echo "$as_me:3677: 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 - ;; - xyes) #(vi - # look for the library directory using the same prefix as the executable +case x$PKG_CONFIG_LIBDIR in +(x/*) + ;; +(xyes) + # Look for the library directory using the same prefix as the executable + if test "x$PKG_CONFIG" = xnone + then + cf_path=$prefix + else cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'` - case x`(arch) 2>/dev/null` in #(vi - *64) #(vi - for cf_config in $cf_path/share $cf_path/lib64 $cf_path/lib32 $cf_path/lib - do - if test -d $cf_config/pkgconfig - then - PKG_CONFIG_LIBDIR=$cf_config/pkgconfig - break - fi - done - ;; - *) - PKG_CONFIG_LIBDIR=$cf_path/lib/pkgconfig - ;; - esac + fi + + # If you don't like using the default architecture, you have to specify the + # intended library directory and corresponding compiler/linker options. + # + # This case allows for Debian's 2014-flavor of multiarch, along with the + # 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 + (*64) + cf_search_path="\ + $cf_path/lib/*64-linux-gnu \ + $cf_path/share \ + $cf_path/lib64 \ + $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/libdata" ;; esac - echo "$as_me:3379: result: $PKG_CONFIG_LIBDIR" >&5 + test -n "$verbose" && echo " list..." 1>&6 + +echo "${as_me:-configure}:3732: 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}:3738: testing checking $cf_config/pkgconfig ..." 1>&5 + + if test -d $cf_config/pkgconfig + then + PKG_CONFIG_LIBDIR=$cf_config/pkgconfig + echo "$as_me:3743: checking done" >&5 +echo $ECHO_N "checking done... $ECHO_C" >&6 + break + fi + done + ;; +(*) + ;; +esac + +if test "x$PKG_CONFIG_LIBDIR" != xno ; then + echo "$as_me:3754: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 fi -if test "$PKG_CONFIG" != none ; then - echo "$as_me:3384: checking if we should install .pc files for $PKG_CONFIG" >&5 +if test "x$PKG_CONFIG" != xnone +then + echo "$as_me:3760: 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:3763: checking if we should install .pc files" >&5 +echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6 +fi # Check whether --enable-pc-files or --disable-pc-files was given. if test "${enable_pc_files+set}" = set; then @@ -3391,73 +3771,105 @@ if test "${enable_pc_files+set}" = set; then else enable_pc_files=no fi; - echo "$as_me:3394: result: $enable_pc_files" >&5 +echo "$as_me:3774: result: $enable_pc_files" >&5 echo "${ECHO_T}$enable_pc_files" >&6 - if test "$enable_pc_files" != no - then + +if test "x$enable_pc_files" != xno +then + MAKE_PC_FILES= + case "x$PKG_CONFIG_LIBDIR" in + (xno|xyes) + { echo "$as_me:3782: 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:3424: 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:3812: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;} { (exit 1); exit 1; }; } - ;; + ;; esac - fi + ;; + esac else - enable_pc_files=no + MAKE_PC_FILES="#" fi -echo "$as_me:3435: 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. +if test -z "$MAKE_PC_FILES" +then + echo "$as_me:3826: 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 + (xyes|xno) + PC_MODULE_SUFFIX= + ;; + (*) PC_MODULE_SUFFIX="$withval" + ;; + esac +fi; + test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none + echo "$as_me:3841: result: $PC_MODULE_SUFFIX" >&5 +echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6 + test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX= + +fi + +echo "$as_me:3847: 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. if test "${enable_mixed_case+set}" = set; then enableval="$enable_mixed_case" enable_mixedcase=$enableval else enable_mixedcase=auto fi; -echo "$as_me:3445: result: $enable_mixedcase" >&5 +echo "$as_me:3857: result: $enable_mixedcase" >&5 echo "${ECHO_T}$enable_mixedcase" >&6 if test "$enable_mixedcase" = "auto" ; then -echo "$as_me:3449: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:3861: 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*|*-mingw32*|*-uwin*) #(vi + case $target_alias in + (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) cf_cv_mixedcase=no ;; - *) + (*) cf_cv_mixedcase=yes ;; esac @@ -3473,7 +3885,7 @@ else fi fi -echo "$as_me:3476: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3888: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -3481,18 +3893,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:3495: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:3907: 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 @@ -3512,11 +3924,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:3515: result: yes" >&5 + echo "$as_me:3927: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:3519: result: no" >&5 + echo "$as_me:3931: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -3525,7 +3937,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:3528: checking for $ac_word" >&5 +echo "$as_me:3940: 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 @@ -3540,7 +3952,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:3543: found $ac_dir/$ac_word" >&5 +echo "$as_me:3955: found $ac_dir/$ac_word" >&5 break done @@ -3548,10 +3960,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:3551: result: $CTAGS" >&5 + echo "$as_me:3963: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:3554: result: no" >&5 + echo "$as_me:3966: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3562,7 +3974,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:3565: checking for $ac_word" >&5 +echo "$as_me:3977: 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 @@ -3577,7 +3989,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:3580: found $ac_dir/$ac_word" >&5 +echo "$as_me:3992: found $ac_dir/$ac_word" >&5 break done @@ -3585,10 +3997,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:3588: result: $ETAGS" >&5 + echo "$as_me:4000: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:3591: result: no" >&5 + echo "$as_me:4003: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3597,7 +4009,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:3600: checking for $ac_word" >&5 +echo "$as_me:4012: 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 @@ -3612,7 +4024,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:3615: found $ac_dir/$ac_word" >&5 +echo "$as_me:4027: found $ac_dir/$ac_word" >&5 break done @@ -3621,17 +4033,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:3624: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:4036: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:3627: result: no" >&5 + echo "$as_me:4039: 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:3634: checking for $ac_word" >&5 +echo "$as_me:4046: 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 @@ -3646,7 +4058,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:3649: found $ac_dir/$ac_word" >&5 +echo "$as_me:4061: found $ac_dir/$ac_word" >&5 break done @@ -3655,10 +4067,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:3658: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:4070: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:3661: result: no" >&5 + echo "$as_me:4073: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3678,7 +4090,7 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:3681: checking for makeflags variable" >&5 +echo "$as_me:4093: 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 @@ -3688,37 +4100,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) + (.*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:3715: result: $cf_cv_makeflags" >&5 +echo "$as_me:4127: 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:3721: checking for $ac_word" >&5 +echo "$as_me:4133: 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 @@ -3733,7 +4145,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:3736: found $ac_dir/$ac_word" >&5 +echo "$as_me:4148: found $ac_dir/$ac_word" >&5 break done @@ -3741,10 +4153,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:3744: result: $RANLIB" >&5 + echo "$as_me:4156: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:3747: result: no" >&5 + echo "$as_me:4159: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3753,7 +4165,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:3756: checking for $ac_word" >&5 +echo "$as_me:4168: 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 @@ -3768,7 +4180,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:3771: found $ac_dir/$ac_word" >&5 +echo "$as_me:4183: found $ac_dir/$ac_word" >&5 break done @@ -3777,10 +4189,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:3780: result: $ac_ct_RANLIB" >&5 + echo "$as_me:4192: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:3783: result: no" >&5 + echo "$as_me:4195: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3792,7 +4204,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:3795: checking for $ac_word" >&5 +echo "$as_me:4207: 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 @@ -3807,7 +4219,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:3810: found $ac_dir/$ac_word" >&5 +echo "$as_me:4222: found $ac_dir/$ac_word" >&5 break done @@ -3815,10 +4227,10 @@ fi fi LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$as_me:3818: result: $LD" >&5 + echo "$as_me:4230: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:3821: result: no" >&5 + echo "$as_me:4233: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3827,7 +4239,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:3830: checking for $ac_word" >&5 +echo "$as_me:4242: 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 @@ -3842,7 +4254,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:3845: found $ac_dir/$ac_word" >&5 +echo "$as_me:4257: found $ac_dir/$ac_word" >&5 break done @@ -3851,10 +4263,10 @@ fi fi ac_ct_LD=$ac_cv_prog_ac_ct_LD if test -n "$ac_ct_LD"; then - echo "$as_me:3854: result: $ac_ct_LD" >&5 + echo "$as_me:4266: result: $ac_ct_LD" >&5 echo "${ECHO_T}$ac_ct_LD" >&6 else - echo "$as_me:3857: result: no" >&5 + echo "$as_me:4269: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3866,7 +4278,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:3869: checking for $ac_word" >&5 +echo "$as_me:4281: 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 @@ -3881,7 +4293,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:3884: found $ac_dir/$ac_word" >&5 +echo "$as_me:4296: found $ac_dir/$ac_word" >&5 break done @@ -3889,10 +4301,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:3892: result: $AR" >&5 + echo "$as_me:4304: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:3895: result: no" >&5 + echo "$as_me:4307: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3901,7 +4313,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:3904: checking for $ac_word" >&5 +echo "$as_me:4316: 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 @@ -3916,7 +4328,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:3919: found $ac_dir/$ac_word" >&5 +echo "$as_me:4331: found $ac_dir/$ac_word" >&5 break done @@ -3925,10 +4337,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:3928: result: $ac_ct_AR" >&5 + echo "$as_me:4340: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:3931: result: no" >&5 + echo "$as_me:4343: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3940,7 +4352,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:3943: checking for $ac_word" >&5 +echo "$as_me:4355: 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 @@ -3955,7 +4367,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:3958: found $ac_dir/$ac_word" >&5 +echo "$as_me:4370: found $ac_dir/$ac_word" >&5 break done @@ -3963,10 +4375,10 @@ fi fi NM=$ac_cv_prog_NM if test -n "$NM"; then - echo "$as_me:3966: result: $NM" >&5 + echo "$as_me:4378: result: $NM" >&5 echo "${ECHO_T}$NM" >&6 else - echo "$as_me:3969: result: no" >&5 + echo "$as_me:4381: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3975,7 +4387,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:3978: checking for $ac_word" >&5 +echo "$as_me:4390: 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 @@ -3990,7 +4402,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:3993: found $ac_dir/$ac_word" >&5 +echo "$as_me:4405: found $ac_dir/$ac_word" >&5 break done @@ -3999,10 +4411,10 @@ fi fi ac_ct_NM=$ac_cv_prog_ac_ct_NM if test -n "$ac_ct_NM"; then - echo "$as_me:4002: result: $ac_ct_NM" >&5 + echo "$as_me:4414: result: $ac_ct_NM" >&5 echo "${ECHO_T}$ac_ct_NM" >&6 else - echo "$as_me:4005: result: no" >&5 + echo "$as_me:4417: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4014,7 +4426,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:4017: checking for $ac_word" >&5 +echo "$as_me:4429: 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 @@ -4029,7 +4441,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:4032: found $ac_dir/$ac_word" >&5 +echo "$as_me:4444: found $ac_dir/$ac_word" >&5 break done @@ -4037,10 +4449,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:4040: result: $AR" >&5 + echo "$as_me:4452: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:4043: result: no" >&5 + echo "$as_me:4455: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4049,7 +4461,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:4052: checking for $ac_word" >&5 +echo "$as_me:4464: 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 @@ -4064,7 +4476,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:4067: found $ac_dir/$ac_word" >&5 +echo "$as_me:4479: found $ac_dir/$ac_word" >&5 break done @@ -4073,10 +4485,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:4076: result: $ac_ct_AR" >&5 + echo "$as_me:4488: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4079: result: no" >&5 + echo "$as_me:4491: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4085,14 +4497,14 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:4088: checking for options to update archives" >&5 +echo "$as_me:4500: 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 @@ -4108,13 +4520,13 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:4526: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4117: \$? = $ac_status" >&5 + echo "$as_me:4529: \$? = $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 @@ -4125,7 +4537,7 @@ EOF else test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me:-configure}:4128: testing cannot compile test-program ..." 1>&5 +echo "${as_me:-configure}:4540: testing cannot compile test-program ..." 1>&5 break fi @@ -4133,7 +4545,7 @@ echo "${as_me:-configure}:4128: testing cannot compile test-program ..." 1>&5 rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext fi -echo "$as_me:4136: result: $cf_cv_ar_flags" >&5 +echo "$as_me:4548: result: $cf_cv_ar_flags" >&5 echo "${ECHO_T}$cf_cv_ar_flags" >&6 if test -n "$ARFLAGS" ; then @@ -4144,20 +4556,20 @@ else ARFLAGS=$cf_cv_ar_flags fi -echo "$as_me:4147: checking if you have specified an install-prefix" >&5 +echo "$as_me:4559: 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:4160: result: $DESTDIR" >&5 +echo "$as_me:4572: result: $DESTDIR" >&5 echo "${ECHO_T}$DESTDIR" >&6 ############################################################################### @@ -4181,11 +4593,11 @@ if test "${with_build_cc+set}" = set; then withval="$with_build_cc" BUILD_CC="$withval" else - for ac_prog in gcc cc cl + for ac_prog in gcc clang c99 c89 cc cl do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4188: checking for $ac_word" >&5 +echo "$as_me:4600: 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 @@ -4200,7 +4612,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:4203: found $ac_dir/$ac_word" >&5 +echo "$as_me:4615: found $ac_dir/$ac_word" >&5 break done @@ -4208,23 +4620,24 @@ fi fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - echo "$as_me:4211: result: $BUILD_CC" >&5 + echo "$as_me:4623: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 else - echo "$as_me:4214: result: no" >&5 + echo "$as_me:4626: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$BUILD_CC" && break done +test -n "$BUILD_CC" || BUILD_CC="none" fi; - echo "$as_me:4222: checking for native build C compiler" >&5 + echo "$as_me:4635: checking for native build C compiler" >&5 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 - echo "$as_me:4224: result: $BUILD_CC" >&5 + echo "$as_me:4637: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 - echo "$as_me:4227: checking for native build C preprocessor" >&5 + echo "$as_me:4640: 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. @@ -4234,10 +4647,10 @@ if test "${with_build_cpp+set}" = set; then else BUILD_CPP='${BUILD_CC} -E' fi; - echo "$as_me:4237: result: $BUILD_CPP" >&5 + echo "$as_me:4650: result: $BUILD_CPP" >&5 echo "${ECHO_T}$BUILD_CPP" >&6 - echo "$as_me:4240: checking for native build C flags" >&5 + echo "$as_me:4653: 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. @@ -4245,10 +4658,10 @@ if test "${with_build_cflags+set}" = set; then withval="$with_build_cflags" BUILD_CFLAGS="$withval" fi; - echo "$as_me:4248: result: $BUILD_CFLAGS" >&5 + echo "$as_me:4661: result: $BUILD_CFLAGS" >&5 echo "${ECHO_T}$BUILD_CFLAGS" >&6 - echo "$as_me:4251: checking for native build C preprocessor-flags" >&5 + echo "$as_me:4664: 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. @@ -4256,10 +4669,10 @@ if test "${with_build_cppflags+set}" = set; then withval="$with_build_cppflags" BUILD_CPPFLAGS="$withval" fi; - echo "$as_me:4259: result: $BUILD_CPPFLAGS" >&5 + echo "$as_me:4672: result: $BUILD_CPPFLAGS" >&5 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - echo "$as_me:4262: checking for native build linker-flags" >&5 + echo "$as_me:4675: 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. @@ -4267,10 +4680,10 @@ if test "${with_build_ldflags+set}" = set; then withval="$with_build_ldflags" BUILD_LDFLAGS="$withval" fi; - echo "$as_me:4270: result: $BUILD_LDFLAGS" >&5 + echo "$as_me:4683: result: $BUILD_LDFLAGS" >&5 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - echo "$as_me:4273: checking for native build linker-libraries" >&5 + echo "$as_me:4686: 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. @@ -4278,7 +4691,7 @@ if test "${with_build_libs+set}" = set; then withval="$with_build_libs" BUILD_LIBS="$withval" fi; - echo "$as_me:4281: result: $BUILD_LIBS" >&5 + echo "$as_me:4694: result: $BUILD_LIBS" >&5 echo "${ECHO_T}$BUILD_LIBS" >&6 # this assumes we're on Unix. @@ -4288,7 +4701,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6 : ${BUILD_CC:='${CC}'} if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then - { { echo "$as_me:4291: error: Cross-build requires two compilers. + { { echo "$as_me:4704: 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;} @@ -4313,30 +4726,54 @@ fi ### shared, for example. cf_list_models="" -echo "$as_me:4316: checking if libtool -version-number should be used" >&5 +echo "$as_me:4729: 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:4333: result: $cf_libtool_version" >&5 +echo "$as_me:4746: 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 + (x) + { echo "$as_me:4755: WARNING: VERSION was not set" >&5 +echo "$as_me: WARNING: VERSION was not set" >&2;} + ;; + (x*.*.*) + ABI_VERSION="$VERSION" + test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 + +echo "${as_me:-configure}:4762: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 + + ;; + (x*:*:*) + ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'` + test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 + +echo "${as_me:-configure}:4769: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 + + ;; + (*) + { echo "$as_me:4773: WARNING: unexpected VERSION value: $VERSION" >&5 +echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;} + ;; + esac fi LIBTOOL= @@ -4355,7 +4792,7 @@ LIB_LINK='${CC}' LIB_INSTALL= LIB_UNINSTALL= -echo "$as_me:4358: checking if you want to build libraries with libtool" >&5 +echo "$as_me:4795: 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. @@ -4365,41 +4802,41 @@ if test "${with_libtool+set}" = set; then else with_libtool=no fi; -echo "$as_me:4368: result: $with_libtool" >&5 +echo "$as_me:4805: 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:4399: 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:4836: 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 @@ -4409,7 +4846,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:4412: checking for $ac_word" >&5 +echo "$as_me:4849: 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 @@ -4424,7 +4861,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:4427: found $ac_dir/$ac_word" >&5 +echo "$as_me:4864: found $ac_dir/$ac_word" >&5 break done @@ -4432,10 +4869,10 @@ fi fi LIBTOOL=$ac_cv_prog_LIBTOOL if test -n "$LIBTOOL"; then - echo "$as_me:4435: result: $LIBTOOL" >&5 + echo "$as_me:4872: result: $LIBTOOL" >&5 echo "${ECHO_T}$LIBTOOL" >&6 else - echo "$as_me:4438: result: no" >&5 + echo "$as_me:4875: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4448,7 +4885,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:4451: checking for $ac_word" >&5 +echo "$as_me:4888: 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 @@ -4463,7 +4900,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:4466: found $ac_dir/$ac_word" >&5 +echo "$as_me:4903: found $ac_dir/$ac_word" >&5 break done @@ -4471,10 +4908,10 @@ fi fi ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL if test -n "$ac_ct_LIBTOOL"; then - echo "$as_me:4474: result: $ac_ct_LIBTOOL" >&5 + echo "$as_me:4911: result: $ac_ct_LIBTOOL" >&5 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 else - echo "$as_me:4477: result: no" >&5 + echo "$as_me:4914: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4505,7 +4942,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:4508: checking for $ac_word" >&5 +echo "$as_me:4945: 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 @@ -4520,7 +4957,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:4523: found $ac_dir/$ac_word" >&5 +echo "$as_me:4960: found $ac_dir/$ac_word" >&5 break done @@ -4528,10 +4965,10 @@ fi fi LIBTOOL=$ac_cv_prog_LIBTOOL if test -n "$LIBTOOL"; then - echo "$as_me:4531: result: $LIBTOOL" >&5 + echo "$as_me:4968: result: $LIBTOOL" >&5 echo "${ECHO_T}$LIBTOOL" >&6 else - echo "$as_me:4534: result: no" >&5 + echo "$as_me:4971: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4544,7 +4981,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:4547: checking for $ac_word" >&5 +echo "$as_me:4984: 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 @@ -4559,7 +4996,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:4562: found $ac_dir/$ac_word" >&5 +echo "$as_me:4999: found $ac_dir/$ac_word" >&5 break done @@ -4567,10 +5004,10 @@ fi fi ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL if test -n "$ac_ct_LIBTOOL"; then - echo "$as_me:4570: result: $ac_ct_LIBTOOL" >&5 + echo "$as_me:5007: result: $ac_ct_LIBTOOL" >&5 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 else - echo "$as_me:4573: result: no" >&5 + echo "$as_me:5010: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4592,11 +5029,11 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version fi fi if test -z "$LIBTOOL" ; then - { { echo "$as_me:4595: error: Cannot find libtool" >&5 + { { echo "$as_me:5032: 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 ${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' @@ -4608,7 +5045,7 @@ echo "$as_me: error: Cannot find libtool" >&2;} if test -n "$LIBTOOL" && test "$LIBTOOL" != none then - echo "$as_me:4611: checking version of $LIBTOOL" >&5 + echo "$as_me:5048: checking version of $LIBTOOL" >&5 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6 if test -n "$LIBTOOL" && test "$LIBTOOL" != none @@ -4619,34 +5056,34 @@ else fi test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version - echo "$as_me:4622: result: $cf_cv_libtool_version" >&5 + echo "$as_me:5059: 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:4625: error: This is not GNU libtool" >&5 + { { echo "$as_me:5062: 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:4630: error: GNU libtool has not been found" >&5 + { { echo "$as_me:5067: error: GNU libtool has not been found" >&5 echo "$as_me: error: GNU libtool has not been found" >&2;} { (exit 1); exit 1; }; } fi # special hack to add -no-undefined (which libtool should do for itself) LT_UNDEF= - case "$cf_cv_system_name" in #(vi - cygwin*|mingw32*|uwin*|aix[4-7]) #(vi + 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 @@ -4663,7 +5100,7 @@ cf_list_models="$cf_list_models libtool" else -echo "$as_me:4666: checking if you want to build shared libraries" >&5 +echo "$as_me:5103: 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. @@ -4673,11 +5110,11 @@ if test "${with_shared+set}" = set; then else with_shared=no fi; -echo "$as_me:4676: result: $with_shared" >&5 +echo "$as_me:5113: 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:4680: checking if you want to build static libraries" >&5 +echo "$as_me:5117: 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. @@ -4687,11 +5124,11 @@ if test "${with_normal+set}" = set; then else with_normal=yes fi; -echo "$as_me:4690: result: $with_normal" >&5 +echo "$as_me:5127: 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:4694: checking if you want to build debug libraries" >&5 +echo "$as_me:5131: 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. @@ -4701,11 +5138,11 @@ if test "${with_debug+set}" = set; then else with_debug=yes fi; -echo "$as_me:4704: result: $with_debug" >&5 +echo "$as_me:5141: 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:4708: checking if you want to build profiling libraries" >&5 +echo "$as_me:5145: 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. @@ -4715,7 +5152,7 @@ if test "${with_profile+set}" = set; then else with_profile=no fi; -echo "$as_me:4718: result: $with_profile" >&5 +echo "$as_me:5155: result: $with_profile" >&5 echo "${ECHO_T}$with_profile" >&6 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile" @@ -4723,7 +5160,7 @@ fi if test "X$cf_with_cxx_binding" != Xno; then if test "x$with_shared" = "xyes"; then -echo "$as_me:4726: checking if you want to build C++ shared libraries" >&5 +echo "$as_me:5163: 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. @@ -4733,26 +5170,26 @@ if test "${with_cxx_shared+set}" = set; then else with_shared_cxx=no fi; -echo "$as_me:4736: result: $with_shared_cxx" >&5 +echo "$as_me:5173: result: $with_shared_cxx" >&5 echo "${ECHO_T}$with_shared_cxx" >&6 fi fi ############################################################################### -echo "$as_me:4743: checking for specified models" >&5 +echo "$as_me:5180: 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:4747: result: $cf_list_models" >&5 +echo "$as_me:5184: 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:4752: checking for default model" >&5 +echo "$as_me:5189: 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:4755: result: $DFT_LWR_MODEL" >&5 +echo "$as_me:5192: result: $DFT_LWR_MODEL" >&5 echo "${ECHO_T}$DFT_LWR_MODEL" >&6 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -4766,7 +5203,7 @@ LIB_NAME=ncurses LIB_DIR=../lib LIB_2ND=../../lib -echo "$as_me:4769: checking if you want to have a library-prefix" >&5 +echo "$as_me:5206: 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. @@ -4776,18 +5213,22 @@ if test "${with_lib_prefix+set}" = set; then else with_lib_prefix=auto fi; -echo "$as_me:4779: result: $with_lib_prefix" >&5 +echo "$as_me:5216: 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 @@ -4800,19 +5241,19 @@ fi LIB_SUFFIX= - echo "$as_me:4803: checking for PATH separator" >&5 + echo "$as_me:5244: 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:4810: result: $PATH_SEPARATOR" >&5 + echo "$as_me:5251: result: $PATH_SEPARATOR" >&5 echo "${ECHO_T}$PATH_SEPARATOR" >&6 ############################################################################### -echo "$as_me:4815: checking if you want to build a separate terminfo library" >&5 +echo "$as_me:5256: 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. @@ -4822,10 +5263,10 @@ if test "${with_termlib+set}" = set; then else with_termlib=no fi; -echo "$as_me:4825: result: $with_termlib" >&5 +echo "$as_me:5266: result: $with_termlib" >&5 echo "${ECHO_T}$with_termlib" >&6 -echo "$as_me:4828: checking if you want to build a separate tic library" >&5 +echo "$as_me:5269: 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. @@ -4835,13 +5276,13 @@ if test "${with_ticlib+set}" = set; then else with_ticlib=no fi; -echo "$as_me:4838: result: $with_ticlib" >&5 +echo "$as_me:5279: result: $with_ticlib" >&5 echo "${ECHO_T}$with_ticlib" >&6 ### Checks for special libraries, must be done up-front. SHLIB_LIST="" -echo "$as_me:4844: checking if you want to link with the GPM mouse library" >&5 +echo "$as_me:5285: 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. @@ -4851,27 +5292,27 @@ if test "${with_gpm+set}" = set; then else with_gpm=maybe fi; -echo "$as_me:4854: result: $with_gpm" >&5 +echo "$as_me:5295: result: $with_gpm" >&5 echo "${ECHO_T}$with_gpm" >&6 if test "$with_gpm" != no ; then - echo "$as_me:4858: checking for gpm.h" >&5 + echo "$as_me:5299: 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 4864 "configure" +#line 5305 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:4868: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5309: \"$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:4874: \$? = $ac_status" >&5 + echo "$as_me:5315: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4890,7 +5331,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4893: result: $ac_cv_header_gpm_h" >&5 +echo "$as_me:5334: 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 @@ -4901,14 +5342,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}:4904: testing assuming we really have GPM library ..." 1>&5 +echo "${as_me:-configure}:5345: 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:4911: checking for Gpm_Open in -lgpm" >&5 + echo "$as_me:5353: 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 @@ -4916,7 +5358,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4919 "configure" +#line 5361 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4927,7 +5369,7 @@ extern "C" builtin and then its argument prototype would still apply. */ char Gpm_Open (); int -main () +main (void) { Gpm_Open (); ; @@ -4935,16 +5377,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4938: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5380: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4941: \$? = $ac_status" >&5 + echo "$as_me:5383: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4944: \"$ac_try\"") >&5 + { (eval echo "$as_me:5386: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4947: \$? = $ac_status" >&5 + echo "$as_me:5389: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -4955,23 +5397,29 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4958: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:5400: 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 - : + with_gpm=yes else - { { echo "$as_me:4964: error: Cannot link with GPM library" >&5 + if test "$with_gpm" = maybe; then + { echo "$as_me:5407: WARNING: Cannot link with GPM library" >&5 +echo "$as_me: WARNING: Cannot link with GPM library" >&2;} + with_gpm=no + else + { { echo "$as_me:5411: 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:4974: WARNING: Cannot find GPM header" >&5 + test "$with_gpm" != maybe && { echo "$as_me:5422: WARNING: Cannot find GPM header" >&5 echo "$as_me: WARNING: Cannot find GPM header" >&2;} with_gpm=no @@ -4980,7 +5428,7 @@ fi fi if test "$with_gpm" != no ; then - echo "$as_me:4983: checking if you want to load GPM dynamically" >&5 + echo "$as_me:5431: 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. @@ -4990,18 +5438,18 @@ if test "${with_dlsym+set}" = set; then else with_dlsym=yes fi; - echo "$as_me:4993: result: $with_dlsym" >&5 + echo "$as_me:5441: result: $with_dlsym" >&5 echo "${ECHO_T}$with_dlsym" >&6 if test "x$with_dlsym" = xyes ; then cf_have_dlsym=no -echo "$as_me:4998: checking for dlsym" >&5 +echo "$as_me:5446: 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 5004 "configure" +#line 5452 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlsym (); below. */ @@ -5016,7 +5464,7 @@ char dlsym (); char (*f) (); 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 @@ -5032,16 +5480,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:5035: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5483: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5038: \$? = $ac_status" >&5 + echo "$as_me:5486: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5041: \"$ac_try\"") >&5 + { (eval echo "$as_me:5489: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5044: \$? = $ac_status" >&5 + echo "$as_me:5492: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_dlsym=yes else @@ -5051,14 +5499,14 @@ ac_cv_func_dlsym=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5054: result: $ac_cv_func_dlsym" >&5 +echo "$as_me:5502: 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:5061: checking for dlsym in -ldl" >&5 +echo "$as_me:5509: 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 @@ -5066,7 +5514,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5069 "configure" +#line 5517 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5077,7 +5525,7 @@ extern "C" builtin and then its argument prototype would still apply. */ char dlsym (); int -main () +main (void) { dlsym (); ; @@ -5085,16 +5533,16 @@ dlsym (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5088: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5536: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5091: \$? = $ac_status" >&5 + echo "$as_me:5539: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5094: \"$ac_try\"") >&5 + { (eval echo "$as_me:5542: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5097: \$? = $ac_status" >&5 + echo "$as_me:5545: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dl_dlsym=yes else @@ -5105,7 +5553,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5108: result: $ac_cv_lib_dl_dlsym" >&5 +echo "$as_me:5556: 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 @@ -5116,16 +5564,32 @@ fi fi if test "$cf_have_dlsym" = yes ; then - test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS" + test "$cf_have_libdl" = yes && { +cf_add_libs="-ldl" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + } - echo "$as_me:5121: checking whether able to link to dl*() functions" >&5 + echo "$as_me:5585: 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 5124 "configure" +#line 5588 "configure" #include "confdefs.h" #include int -main () +main (void) { void *obj; @@ -5139,16 +5603,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5142: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5606: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5145: \$? = $ac_status" >&5 + echo "$as_me:5609: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5148: \"$ac_try\"") >&5 + { (eval echo "$as_me:5612: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5151: \$? = $ac_status" >&5 + echo "$as_me:5615: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\EOF @@ -5159,15 +5623,15 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - { { echo "$as_me:5162: error: Cannot link test program for libdl" >&5 + { { echo "$as_me:5626: 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:5167: result: ok" >&5 + echo "$as_me:5631: result: ok" >&5 echo "${ECHO_T}ok" >&6 else - { { echo "$as_me:5170: error: Cannot find dlsym function" >&5 + { { echo "$as_me:5634: error: Cannot find dlsym function" >&5 echo "$as_me: error: Cannot find dlsym function" >&2;} { (exit 1); exit 1; }; } fi @@ -5175,12 +5639,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}:5178: testing assuming soname for gpm is $with_gpm ..." 1>&5 +echo "${as_me:-configure}:5642: testing assuming soname for gpm is $with_gpm ..." 1>&5 cf_cv_gpm_soname="$with_gpm" else -echo "$as_me:5183: checking for soname of gpm library" >&5 +echo "$as_me:5647: 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 @@ -5190,23 +5654,39 @@ 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); } CF_EOF cf_save_LIBS="$LIBS" - LIBS="-lgpm $LIBS" - if { (eval echo "$as_me:5201: \"$ac_compile\"") >&5 + +cf_add_libs="-lgpm" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + + if { (eval echo "$as_me:5681: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5204: \$? = $ac_status" >&5 + echo "$as_me:5684: \$? = $ac_status" >&5 (exit $ac_status); } ; then - if { (eval echo "$as_me:5206: \"$ac_link\"") >&5 + if { (eval echo "$as_me:5686: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5209: \$? = $ac_status" >&5 + echo "$as_me:5689: \$? = $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 @@ -5217,7 +5697,7 @@ LIBS="$cf_save_LIBS" fi fi -echo "$as_me:5220: result: $cf_cv_gpm_soname" >&5 +echo "$as_me:5700: result: $cf_cv_gpm_soname" >&5 echo "${ECHO_T}$cf_cv_gpm_soname" >&6 fi @@ -5229,14 +5709,30 @@ EOF SHLIB_LIST="-ldl $SHLIB_LIST" else SHLIB_LIST="-lgpm $SHLIB_LIST" - TEST_LIBS="-lgpm $TEST_LIBS" + +cf_add_libs="-lgpm" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $TEST_LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +TEST_LIBS="$cf_add_libs" + fi cat >>confdefs.h <<\EOF #define HAVE_LIBGPM 1 EOF -echo "$as_me:5239: checking for Gpm_Wgetch in -lgpm" >&5 +echo "$as_me:5735: 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 @@ -5244,7 +5740,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5247 "configure" +#line 5743 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5255,7 +5751,7 @@ extern "C" builtin and then its argument prototype would still apply. */ char Gpm_Wgetch (); int -main () +main (void) { Gpm_Wgetch (); ; @@ -5263,16 +5759,16 @@ Gpm_Wgetch (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5266: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5762: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5269: \$? = $ac_status" >&5 + echo "$as_me:5765: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5272: \"$ac_try\"") >&5 + { (eval echo "$as_me:5768: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5275: \$? = $ac_status" >&5 + echo "$as_me:5771: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Wgetch=yes else @@ -5283,11 +5779,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5286: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 +echo "$as_me:5782: 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:5290: checking if GPM is weakly bound to curses library" >&5 +echo "$as_me:5786: 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 @@ -5298,7 +5794,7 @@ if test "$cross_compiling" != yes ; then cat >conftest.$ac_ext < -int main() +int main(void) { Gpm_Wgetch(); ${cf_cv_main_return:-return}(0); @@ -5311,15 +5807,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:5314: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5810: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5317: \$? = $ac_status" >&5 + echo "$as_me:5813: \$? = $ac_status" >&5 (exit $ac_status); } ; then - if { (eval echo "$as_me:5319: \"$ac_link\"") >&5 + if { (eval echo "$as_me:5815: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5322: \$? = $ac_status" >&5 + echo "$as_me:5818: \$? = $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 @@ -5331,11 +5827,11 @@ CF_EOF fi fi -echo "$as_me:5334: result: $cf_cv_check_gpm_wgetch" >&5 +echo "$as_me:5830: 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:5338: WARNING: GPM library is already linked with curses - read the FAQ" >&5 + { echo "$as_me:5834: 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 @@ -5345,7 +5841,7 @@ fi # not everyone has "test -c" if test -c /dev/sysmouse 2>/dev/null ; then -echo "$as_me:5348: checking if you want to use sysmouse" >&5 +echo "$as_me:5844: 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. @@ -5357,7 +5853,7 @@ else fi; if test "$cf_with_sysmouse" != no ; then cat >conftest.$ac_ext <<_ACEOF -#line 5360 "configure" +#line 5856 "configure" #include "confdefs.h" #include @@ -5369,7 +5865,7 @@ fi; #endif int -main () +main (void) { struct mouse_info the_mouse; @@ -5380,16 +5876,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5383: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5879: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5386: \$? = $ac_status" >&5 + echo "$as_me:5882: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5389: \"$ac_try\"") >&5 + { (eval echo "$as_me:5885: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5392: \$? = $ac_status" >&5 + echo "$as_me:5888: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_with_sysmouse=yes else @@ -5399,7 +5895,7 @@ cf_with_sysmouse=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5402: result: $cf_with_sysmouse" >&5 +echo "$as_me:5898: result: $cf_with_sysmouse" >&5 echo "${ECHO_T}$cf_with_sysmouse" >&6 test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF @@ -5418,22 +5914,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:5421: checking for default loader flags" >&5 +echo "$as_me:5917: 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:5430: result: $LD_MODEL" >&5 +echo "$as_me:5926: result: $LD_MODEL" >&5 echo "${ECHO_T}$LD_MODEL" >&6 case $DFT_LWR_MODEL in -shared) +(shared) -echo "$as_me:5436: checking if rpath option should be used" >&5 +echo "$as_me:5932: 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. @@ -5443,10 +5939,10 @@ if test "${enable_rpath+set}" = set; then else cf_cv_enable_rpath=no fi; -echo "$as_me:5446: result: $cf_cv_enable_rpath" >&5 +echo "$as_me:5942: result: $cf_cv_enable_rpath" >&5 echo "${ECHO_T}$cf_cv_enable_rpath" >&6 -echo "$as_me:5449: checking if shared libraries should be relinked during install" >&5 +echo "$as_me:5945: 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. @@ -5456,58 +5952,77 @@ if test "${enable_relink+set}" = set; then else cf_cv_do_relink=yes fi; -echo "$as_me:5459: result: $cf_cv_do_relink" >&5 +echo "$as_me:5955: result: $cf_cv_do_relink" >&5 echo "${ECHO_T}$cf_cv_do_relink" >&6 ;; esac +# we will build libraries one-level down. +rel_builddir=.. + LD_RPATH_OPT= -echo "$as_me:5465: checking for an rpath option" >&5 +echo "$as_me:5964: 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:5496: result: $LD_RPATH_OPT" >&5 +echo "$as_me:5995: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 -case "x$LD_RPATH_OPT" in #(vi -x-R*) - echo "$as_me:5501: checking if we need a space after rpath option" >&5 +case "x$LD_RPATH_OPT" in +(x-R*) + echo "$as_me:6000: checking if we need a space after rpath option" >&5 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 cf_save_LIBS="$LIBS" - LIBS="${LD_RPATH_OPT}$libdir $LIBS" + +cf_add_libs="${LD_RPATH_OPT}$libdir" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + cat >conftest.$ac_ext <<_ACEOF -#line 5506 "configure" +#line 6021 "configure" #include "confdefs.h" int -main () +main (void) { ; @@ -5515,16 +6030,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5518: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6033: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5521: \$? = $ac_status" >&5 + echo "$as_me:6036: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5524: \"$ac_try\"") >&5 + { (eval echo "$as_me:6039: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5527: \$? = $ac_status" >&5 + echo "$as_me:6042: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_space=no else @@ -5534,38 +6049,46 @@ cf_rpath_space=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:5537: result: $cf_rpath_space" >&5 + echo "$as_me:6052: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; esac + RM_SHARED_OPTS= LOCAL_LDFLAGS= LOCAL_LDFLAGS2= LD_SHARED_OPTS= INSTALL_LIB="-m 644" + : ${rel_builddir:=.} + + shlibdir=$libdir + + MAKE_DLLS="#" cf_cv_do_symlinks=no cf_ld_rpath_opt= test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - echo "$as_me:5552: checking if release/abi version should be used for shared libs" >&5 + echo "$as_me:6073: 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:5567: 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:6088: result: $withval" >&5 +echo "${ECHO_T}$withval" >&6 + { { echo "$as_me:6090: 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 @@ -5573,7 +6096,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:5576: result: $cf_cv_shlib_version" >&5 + echo "$as_me:6099: result: $cf_cv_shlib_version" >&5 echo "${ECHO_T}$cf_cv_shlib_version" >&6 cf_cv_rm_so_locs=no @@ -5581,20 +6104,33 @@ 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:5586: 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:6122: 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 5593 "configure" +#line 6129 "configure" #include "confdefs.h" #include int -main () +main (void) { int x = 1 ; @@ -5602,16 +6138,16 @@ int x = 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5605: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6141: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5608: \$? = $ac_status" >&5 + echo "$as_me:6144: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5611: \"$ac_try\"") >&5 + { (eval echo "$as_me:6147: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5614: \$? = $ac_status" >&5 + echo "$as_me:6150: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -5620,34 +6156,37 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done - echo "$as_me:5623: result: $CC_SHARED_OPTS" >&5 + echo "$as_me:6159: 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= - MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@' + CC_SHARED_OPTS='-Wl,-brtl' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@' else - # CC_SHARED_OPTS='-qpic=large -G' - # perhaps "-bM:SRE -bnoentry -bexpall" - MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@' + CC_SHARED_OPTS='-brtl' + # as well as '-qpic=large -G' or perhaps "-bM:SRE -bnoentry -bexpall" + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@' fi ;; - beos*) #(vi - MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0' + (beos*) + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0' ;; - cygwin*) #(vi + (cygwin*) CC_SHARED_OPTS= - MK_SHARED_LIB='sh ../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 @@ -5656,17 +6195,39 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6 ** SHARED_LIB \$SHARED_LIB ** IMPORT_LIB \$IMPORT_LIB EOF - exec \$* -shared -Wl,--out-implib=../lib/\${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\${SHARED_LIB} + exec \$* ${LDFLAGS} -shared -Wl,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB} +CF_EOF + chmod +x mk_shared_lib.sh + ;; + (msys*) + CC_SHARED_OPTS= + 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 + #!$SHELL + SHARED_LIB=\$1 + IMPORT_LIB=\`echo "\$1" | sed -e 's/msys-/lib/' -e 's/[0-9]*\.dll$/.dll.a/'\` + shift + cat <<-EOF + Linking shared library + ** SHARED_LIB \$SHARED_LIB + ** IMPORT_LIB \$IMPORT_LIB +EOF + exec \$* ${LDFLAGS} -shared -Wl,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB} 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 $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi cf_cv_shlib_version_infix=yes - echo "$as_me:5669: checking if ld -search_paths_first works" >&5 + echo "$as_me:6230: 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 @@ -5675,11 +6236,11 @@ else cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" cat >conftest.$ac_ext <<_ACEOF -#line 5678 "configure" +#line 6239 "configure" #include "confdefs.h" int -main () +main (void) { int i; ; @@ -5687,16 +6248,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5690: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6251: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5693: \$? = $ac_status" >&5 + echo "$as_me:6254: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5696: \"$ac_try\"") >&5 + { (eval echo "$as_me:6257: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5699: \$? = $ac_status" >&5 + echo "$as_me:6260: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ldflags_search_paths_first=yes else @@ -5707,21 +6268,21 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS=$cf_save_LDFLAGS fi -echo "$as_me:5710: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "$as_me:6271: 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' fi - MK_SHARED_LIB='${LD} -b -o $@' + MK_SHARED_LIB='${LD} ${LDFLAGS} -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}' @@ -5729,35 +6290,35 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 CC_SHARED_OPTS='+Z' LD_SHARED_OPTS='-Wl,+b,${libdir}' fi - MK_SHARED_LIB='${LD} +b ${libdir} -b -o $@' + MK_SHARED_LIB='${LD} ${LDFLAGS} +b ${libdir} -b -o $@' # HP-UX shared libraries must be executable, and should be # 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}' + cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}' else - cf_shared_soname='`basename `' + cf_shared_soname='`basename $@`' fi CC_SHARED_OPTS= - MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o ' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -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 # tested with IRIX 5.2 and 'cc'. if test "$GCC" != yes; then CC_SHARED_OPTS='-KPIC' - MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $@` -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -rdata_shared -soname `basename $@` -o $@' else - MK_SHARED_LIB='${CC} -shared -Wl,-soname,`basename $@` -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,`basename $@` -o $@' 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" @@ -5773,20 +6334,23 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 cf_cv_shared_soname='`basename $@`' fi - MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${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 + MAKE_DLLS= if test "$DFT_LWR_MODEL" = "shared" ; then LOCAL_LDFLAGS="-Wl,--enable-auto-import" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" EXTRA_LDFLAGS="-Wl,--enable-auto-import $EXTRA_LDFLAGS" fi CC_SHARED_OPTS= - MK_SHARED_LIB='sh ../mk_shared_lib.sh $@ ${CC} ${CFLAGS}' + MK_SHARED_LIB=$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 @@ -5795,11 +6359,11 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 ** SHARED_LIB \$SHARED_LIB ** IMPORT_LIB \$IMPORT_LIB EOF - exec \$* -shared -Wl,--enable-auto-import,--out-implib=../lib/\${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\${SHARED_LIB} + exec \$* ${LDFLAGS} -shared -Wl,--enable-auto-import,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB} 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" @@ -5816,14 +6380,14 @@ CF_EOF cf_cv_shared_soname='`basename $@`' fi - MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${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 $@' + MK_SHARED_LIB='${LD} ${LDFLAGS} -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)" @@ -5838,9 +6402,9 @@ CF_EOF cf_cv_shared_soname='`basename $@`' fi - MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $@` -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${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)" @@ -5861,18 +6425,18 @@ CF_EOF cf_cv_shared_soname='`basename $@`' fi - MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@' else - MK_SHARED_LIB='${LD} -shared -Bshareable -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -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*) + MK_SHARED_LIB='${LD} ${LDFLAGS} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $@`' + case $host_os in + (osf4*) MK_SHARED_LIB="${MK_SHARED_LIB} -msym" ;; esac @@ -5883,12 +6447,12 @@ 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' fi - MK_SHARED_LIB='${LD} -dy -G -h `basename $@ .${REL_VERSION}`.${ABI_VERSION} -o $@' + MK_SHARED_LIB='${LD} ${LDFLAGS} -dy -G -h `basename $@ .${REL_VERSION}`.${ABI_VERSION} -o $@' if test "$cf_cv_enable_rpath" = yes ; then # only way is to set LD_RUN_PATH but no switch for it RUN_PATH=$libdir @@ -5897,15 +6461,15 @@ 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' fi - MK_SHARED_LIB='${LD} -assert pure-text -o $@' + MK_SHARED_LIB='${LD} ${LDFLAGS} -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 @@ -5929,11 +6493,11 @@ CF_EOF do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" cat >conftest.$ac_ext <<_ACEOF -#line 5932 "configure" +#line 6496 "configure" #include "confdefs.h" #include int -main () +main (void) { printf("Hello\n"); ; @@ -5941,16 +6505,16 @@ printf("Hello\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5944: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6508: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5947: \$? = $ac_status" >&5 + echo "$as_me:6511: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5950: \"$ac_try\"") >&5 + { (eval echo "$as_me:6514: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5953: \$? = $ac_status" >&5 + echo "$as_me:6517: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -5961,33 +6525,33 @@ rm -f conftest.$ac_objext conftest.$ac_ext done CFLAGS="$cf_save_CFLAGS" CC_SHARED_OPTS=$cf_shared_opts - MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $@' else - MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -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 $@' + MK_SHARED_LIB='${LD} ${LDFLAGS} -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:5990: WARNING: ignored --with-shlib-version" >&5 + (*) + { echo "$as_me:6554: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac @@ -5997,7 +6561,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[]) { @@ -6009,18 +6573,18 @@ EOF for cf_opt in $cf_try_cflags do CFLAGS="$cf_save_CFLAGS -$cf_opt" - echo "$as_me:6012: checking if CFLAGS option -$cf_opt works" >&5 + echo "$as_me:6576: 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:6014: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:6578: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6017: \$? = $ac_status" >&5 + echo "$as_me:6581: \$? = $ac_status" >&5 (exit $ac_status); }; then - echo "$as_me:6019: result: yes" >&5 + echo "$as_me:6583: result: yes" >&5 echo "${ECHO_T}yes" >&6 cf_save_CFLAGS="$CFLAGS" else - echo "$as_me:6023: result: no" >&5 + echo "$as_me:6587: result: no" >&5 echo "${ECHO_T}no" >&6 fi done @@ -6031,59 +6595,305 @@ echo "${ECHO_T}no" >&6 test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}" test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}" + test $cf_cv_rm_so_locs = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations" + test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 -echo "${as_me:-configure}:6036: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 +echo "${as_me:-configure}:6602: 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}:6040: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:6606: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + +for model in $cf_list_models; do + case $model in + (libtool) + +echo "$as_me:6612: 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. +if test "${with_libtool_opts+set}" = set; then + withval="$with_libtool_opts" + with_libtool_opts=$withval +else + with_libtool_opts=no +fi; +echo "$as_me:6622: result: $with_libtool_opts" >&5 +echo "${ECHO_T}$with_libtool_opts" >&6 + +case .$with_libtool_opts in +(.yes|.no|.) + ;; +(*) + LIBTOOL_OPTS="$LIBTOOL_OPTS $with_libtool_opts" + ;; +esac + +echo "$as_me:6633: 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. +if test "${with_export_syms+set}" = set; then + withval="$with_export_syms" + with_export_syms=$withval +else + with_export_syms=no +fi; +if test "x$with_export_syms" = xyes +then + with_export_syms='${top_srcdir}/package/${PACKAGE}.sym' + +fi +echo "$as_me:6648: result: $with_export_syms" >&5 +echo "${ECHO_T}$with_export_syms" >&6 +if test "x$with_export_syms" != xno +then + EXPORT_SYMS="-export-symbols $with_export_syms" + +fi -if test "$CC_SHARED_OPTS" = "unknown"; then - for model in $cf_list_models; do - if test "$model" = "shared"; then - { { echo "$as_me:6045: error: Shared libraries are not supported in this version" >&5 + ;; + (shared) + if test "$CC_SHARED_OPTS" = "unknown"; then + { { echo "$as_me:6659: error: Shared libraries are not supported in this version" >&5 echo "$as_me: error: Shared libraries are not supported in this version" >&2;} { (exit 1); exit 1; }; } fi - done + # workaround for inept transition to PIE vs PIC... + echo "$as_me:6664: 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 6667 "configure" +#include "confdefs.h" +#include +int +main (void) +{ +printf("Hello work\n"); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6679: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6682: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6685: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6688: \$? = $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:6697: 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}:6703: testing try to work around by appending shared-options ..." 1>&5 + + CFLAGS="$CFLAGS $CC_SHARED_OPTS" + fi + +echo "$as_me:6708: 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. +if test "${with_versioned_syms+set}" = set; then + withval="$with_versioned_syms" + with_versioned_syms=$withval +else + with_versioned_syms=no +fi; +if test "x$with_versioned_syms" = xyes +then + with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map' + +fi +echo "$as_me:6723: 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,*) + 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}:6739: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + ;; + (*-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}:6747: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + ;; + (*) + { echo "$as_me:6751: 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:6763: 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:6831: result: $WILDCARD_SYMS" >&5 +echo "${ECHO_T}$WILDCARD_SYMS" >&6 + rm -f conftest.* + fi fi + ;; + esac +done + +# pretend that ncurses==ncursesw==ncursest +echo "$as_me:6842: 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" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + disable_lib_suffixes=yes + else + disable_lib_suffixes=no + fi +else + enableval=yes + disable_lib_suffixes=no + +fi; +echo "$as_me:6859: 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:6055: checking if rpath-hack should be disabled" >&5 +echo "$as_me:6865: 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:6072: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:6882: 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:6076: checking for updated LDFLAGS" >&5 +echo "$as_me:6886: 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:6079: result: maybe" >&5 + echo "$as_me:6889: 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:6086: checking for $ac_word" >&5 +echo "$as_me:6896: 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 @@ -6098,7 +6908,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:6101: found $ac_dir/$ac_word" >&5 +echo "$as_me:6911: found $ac_dir/$ac_word" >&5 break done @@ -6106,10 +6916,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:6109: result: $cf_ldd_prog" >&5 + echo "$as_me:6919: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:6112: result: no" >&5 + echo "$as_me:6922: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6123,11 +6933,11 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >conftest.$ac_ext <<_ACEOF -#line 6126 "configure" +#line 6936 "configure" #include "confdefs.h" #include int -main () +main (void) { printf("Hello"); ; @@ -6135,19 +6945,19 @@ printf("Hello"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6138: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6948: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6141: \$? = $ac_status" >&5 + echo "$as_me:6951: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6144: \"$ac_try\"") >&5 + { (eval echo "$as_me:6954: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6147: \$? = $ac_status" >&5 + echo "$as_me:6957: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u` - cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort -u` + cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq` + cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -6172,7 +6982,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}:6175: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:6985: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -6184,17 +6994,17 @@ echo "${as_me:-configure}:6175: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:6187: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:6997: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:6191: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:7001: 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 @@ -6225,7 +7035,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:6228: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:7038: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -6238,17 +7048,17 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:6241: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:7051: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:6245: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:7055: 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 @@ -6279,7 +7089,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:6282: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:7092: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -6292,12 +7102,15 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:6295: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:7105: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:6299: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:7109: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +else + echo "$as_me:7112: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi @@ -6306,8 +7119,31 @@ fi ############################################################################### +### use option --with-extra-suffix to append suffix to headers and libraries +echo "$as_me:7123: 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:7142: result: $EXTRA_SUFFIX" >&5 +echo "${ECHO_T}$EXTRA_SUFFIX" >&6 + ### use option --disable-overwrite to leave out the link to -lcurses -echo "$as_me:6310: checking if you wish to install ncurses overwriting curses" >&5 +echo "$as_me:7146: 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. @@ -6317,10 +7153,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:6320: result: $with_overwrite" >&5 +echo "$as_me:7156: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 -echo "$as_me:6323: checking if external terminfo-database is used" >&5 +echo "$as_me:7159: 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. @@ -6330,14 +7166,14 @@ if test "${enable_database+set}" = set; then else use_database=yes fi; -echo "$as_me:6333: result: $use_database" >&5 +echo "$as_me:7169: 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 @@ -6346,7 +7182,7 @@ NCURSES_USE_DATABASE=0 if test "$use_database" != no ; then NCURSES_USE_DATABASE=1 - echo "$as_me:6349: checking which terminfo source-file will be installed" >&5 + echo "$as_me:7185: 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. @@ -6354,10 +7190,10 @@ if test "${with_database+set}" = set; then withval="$with_database" TERMINFO_SRC=$withval fi; - echo "$as_me:6357: result: $TERMINFO_SRC" >&5 + echo "$as_me:7193: result: $TERMINFO_SRC" >&5 echo "${ECHO_T}$TERMINFO_SRC" >&6 - echo "$as_me:6360: checking whether to use hashed database instead of directory/tree" >&5 + echo "$as_me:7196: 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. @@ -6367,13 +7203,13 @@ if test "${with_hashed_db+set}" = set; then else with_hashed_db=no fi; - echo "$as_me:6370: result: $with_hashed_db" >&5 + echo "$as_me:7206: result: $with_hashed_db" >&5 echo "${ECHO_T}$with_hashed_db" >&6 else with_hashed_db=no fi -echo "$as_me:6376: checking for list of fallback descriptions" >&5 +echo "$as_me:7212: 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. @@ -6383,11 +7219,11 @@ if test "${with_fallbacks+set}" = set; then else with_fallback= fi; -echo "$as_me:6386: result: $with_fallback" >&5 +echo "$as_me:7222: 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:6390: checking if you want modern xterm or antique" >&5 +echo "$as_me:7226: 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. @@ -6398,14 +7234,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:6404: result: $with_xterm_new" >&5 +echo "$as_me:7240: result: $with_xterm_new" >&5 echo "${ECHO_T}$with_xterm_new" >&6 WHICH_XTERM=$with_xterm_new -echo "$as_me:6408: checking if xterm backspace sends BS or DEL" >&5 +echo "$as_me:7244: 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. @@ -6416,17 +7252,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:6429: result: $with_xterm_kbs" >&5 +echo "$as_me:7265: result: $with_xterm_kbs" >&5 echo "${ECHO_T}$with_xterm_kbs" >&6 XTERM_KBS=$with_xterm_kbs @@ -6436,7 +7272,7 @@ if test "$use_database" = no ; then MAKE_TERMINFO="#" else -echo "$as_me:6439: checking for list of terminfo directories" >&5 +echo "$as_me:7275: 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. @@ -6452,34 +7288,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:6479: 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:7315: 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" @@ -6490,23 +7326,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:6502: result: $TERMINFO_DIRS" >&5 +echo "$as_me:7338: result: $TERMINFO_DIRS" >&5 echo "${ECHO_T}$TERMINFO_DIRS" >&6 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <&5 +echo "$as_me:7345: 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. @@ -6518,40 +7354,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:6545: 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:7381: 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:6554: result: $TERMINFO" >&5 +echo "$as_me:7390: result: $TERMINFO" >&5 echo "${ECHO_T}$TERMINFO" >&6 cat >>confdefs.h <&5 +echo "$as_me:7401: 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. @@ -6574,7 +7410,7 @@ else with_big_core=no else cat >conftest.$ac_ext <<_ACEOF -#line 6577 "configure" +#line 7413 "configure" #include "confdefs.h" #include @@ -6588,15 +7424,15 @@ int main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6591: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7427: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6594: \$? = $ac_status" >&5 + echo "$as_me:7430: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6596: \"$ac_try\"") >&5 + { (eval echo "$as_me:7432: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6599: \$? = $ac_status" >&5 + echo "$as_me:7435: \$? = $ac_status" >&5 (exit $ac_status); }; }; then with_big_core=yes else @@ -6608,7 +7444,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi; -echo "$as_me:6611: result: $with_big_core" >&5 +echo "$as_me:7447: result: $with_big_core" >&5 echo "${ECHO_T}$with_big_core" >&6 test "x$with_big_core" = "xyes" && cat >>confdefs.h <<\EOF @@ -6618,7 +7454,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:6621: checking if big-strings option selected" >&5 +echo "$as_me:7457: 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. @@ -6627,11 +7463,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 @@ -6642,14 +7478,14 @@ else esac fi; -echo "$as_me:6645: result: $with_big_strings" >&5 +echo "$as_me:7481: 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:6652: checking if you want termcap-fallback support" >&5 +echo "$as_me:7488: 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. @@ -6659,14 +7495,14 @@ if test "${enable_termcap+set}" = set; then else with_termcap=no fi; -echo "$as_me:6662: result: $with_termcap" >&5 +echo "$as_me:7498: 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:6669: error: You have disabled the database w/o specifying fallbacks" >&5 + { { echo "$as_me:7505: 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 @@ -6679,13 +7515,13 @@ EOF else if test "$with_ticlib" != no ; then - { { echo "$as_me:6682: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 + { { echo "$as_me:7518: 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:6688: checking for list of termcap files" >&5 + echo "$as_me:7524: 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. @@ -6701,34 +7537,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:6728: 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:7564: 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" @@ -6739,16 +7575,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:6751: result: $TERMPATH" >&5 + echo "$as_me:7587: result: $TERMPATH" >&5 echo "${ECHO_T}$TERMPATH" >&6 test -n "$TERMPATH" && cat >>confdefs.h <>confdefs.h <&5 + echo "$as_me:7595: 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. @@ -6766,14 +7602,14 @@ if test "${enable_getcap+set}" = set; then else with_getcap=no fi; - echo "$as_me:6769: result: $with_getcap" >&5 + echo "$as_me:7605: 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:6776: checking if translated termcaps will be cached in ~/.terminfo" >&5 + echo "$as_me:7612: 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. @@ -6783,7 +7619,7 @@ if test "${enable_getcap_cache+set}" = set; then else with_getcap_cache=no fi; - echo "$as_me:6786: result: $with_getcap_cache" >&5 + echo "$as_me:7622: result: $with_getcap_cache" >&5 echo "${ECHO_T}$with_getcap_cache" >&6 test "x$with_getcap_cache" = "xyes" && cat >>confdefs.h <<\EOF @@ -6793,7 +7629,7 @@ EOF fi ### Use option --disable-home-terminfo to completely remove ~/.terminfo -echo "$as_me:6796: checking if ~/.terminfo is wanted" >&5 +echo "$as_me:7632: 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. @@ -6803,14 +7639,14 @@ if test "${enable_home_terminfo+set}" = set; then else with_home_terminfo=yes fi; -echo "$as_me:6806: result: $with_home_terminfo" >&5 +echo "$as_me:7642: 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:6813: checking if you want to use restricted environment when running as root" >&5 +echo "$as_me:7649: 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. @@ -6820,7 +7656,7 @@ if test "${enable_root_environ+set}" = set; then else with_root_environ=yes fi; -echo "$as_me:6823: result: $with_root_environ" >&5 +echo "$as_me:7659: result: $with_root_environ" >&5 echo "${ECHO_T}$with_root_environ" >&6 test "x$with_root_environ" = xyes && cat >>confdefs.h <<\EOF @@ -6830,18 +7666,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:7674: 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 7680 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:7684: \"$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:7690: \$? = $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:7709: 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:7724: 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 6844 "configure" +#line 7730 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6856,7 +7742,7 @@ char $ac_func (); char (*f) (); 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 @@ -6872,16 +7758,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:6875: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7761: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6878: \$? = $ac_status" >&5 + echo "$as_me:7764: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6881: \"$ac_try\"") >&5 + { (eval echo "$as_me:7767: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6884: \$? = $ac_status" >&5 + echo "$as_me:7770: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6891,7 +7777,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6894: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:7780: 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:7797: 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 6917 "configure" +#line 7803 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6929,7 +7815,7 @@ char $ac_func (); char (*f) (); 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 @@ -6945,16 +7831,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:6948: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7834: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6951: \$? = $ac_status" >&5 + echo "$as_me:7837: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6954: \"$ac_try\"") >&5 + { (eval echo "$as_me:7840: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6957: \$? = $ac_status" >&5 + echo "$as_me:7843: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6964,7 +7850,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6967: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:7853: 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:7864: 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 @@ -6988,7 +7874,7 @@ else eval 'ac_cv_func_'$cf_func'=error' else cat >conftest.$ac_ext <<_ACEOF -#line 6991 "configure" +#line 7877 "configure" #include "confdefs.h" #include @@ -6996,7 +7882,7 @@ else #ifdef HAVE_UNISTD_H #include #endif -int main() +int main(void) { int fail = 0; char *src = "config.log"; @@ -7018,15 +7904,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:7021: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7907: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7024: \$? = $ac_status" >&5 + echo "$as_me:7910: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7026: \"$ac_try\"") >&5 + { (eval echo "$as_me:7912: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7029: \$? = $ac_status" >&5 + echo "$as_me:7915: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" @@ -7044,7 +7930,7 @@ fi test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no fi -echo "$as_me:7047: result: $cf_cv_link_funcs" >&5 +echo "$as_me:7933: result: $cf_cv_link_funcs" >&5 echo "${ECHO_T}$cf_cv_link_funcs" >&6 test "$ac_cv_func_link" = yes && cat >>confdefs.h <<\EOF @@ -7064,7 +7950,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:7067: checking if tic should use symbolic links" >&5 + echo "$as_me:7953: 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. @@ -7074,21 +7960,21 @@ if test "${enable_symlinks+set}" = set; then else with_symlinks=no fi; - echo "$as_me:7077: result: $with_symlinks" >&5 + echo "$as_me:7963: 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:7084: checking if tic should use hard links" >&5 + echo "$as_me:7970: 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:7091: result: $with_links" >&5 + if test "x$ac_cv_func_link" = xyes ; then + with_links=yes + else + with_links=no + fi + echo "$as_me:7977: result: $with_links" >&5 echo "${ECHO_T}$with_links" >&6 fi @@ -7103,7 +7989,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-broken-linker to force on use of broken-linker support -echo "$as_me:7106: checking if you want broken-linker support code" >&5 +echo "$as_me:7992: 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. @@ -7113,7 +7999,7 @@ if test "${enable_broken_linker+set}" = set; then else with_broken_linker=${BROKEN_LINKER:-no} fi; -echo "$as_me:7116: result: $with_broken_linker" >&5 +echo "$as_me:8002: result: $with_broken_linker" >&5 echo "${ECHO_T}$with_broken_linker" >&6 BROKEN_LINKER=0 @@ -7125,8 +8011,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 @@ -7135,14 +8021,14 @@ EOF BROKEN_LINKER=1 test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 -echo "${as_me:-configure}:7138: testing cygwin linker is broken anyway ..." 1>&5 +echo "${as_me:-configure}:8024: 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:7145: checking if tputs should process BSD-style prefix padding" >&5 +echo "$as_me:8031: 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. @@ -7152,7 +8038,7 @@ if test "${enable_bsdpad+set}" = set; then else with_bsdpad=no fi; -echo "$as_me:7155: result: $with_bsdpad" >&5 +echo "$as_me:8041: result: $with_bsdpad" >&5 echo "${ECHO_T}$with_bsdpad" >&6 test "x$with_bsdpad" = xyes && cat >>confdefs.h <<\EOF @@ -7169,26 +8055,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) #(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 @@ -7196,30 +8083,30 @@ 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:7211: checking if we must define _GNU_SOURCE" >&5 +echo "$as_me:8098: 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 7218 "configure" +#line 8105 "configure" #include "confdefs.h" #include int -main () +main (void) { #ifndef _XOPEN_SOURCE @@ -7230,16 +8117,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7233: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8120: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7236: \$? = $ac_status" >&5 + echo "$as_me:8123: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7239: \"$ac_try\"") >&5 + { (eval echo "$as_me:8126: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7242: \$? = $ac_status" >&5 + echo "$as_me:8129: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -7248,11 +8135,11 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 7251 "configure" +#line 8138 "configure" #include "confdefs.h" #include int -main () +main (void) { #ifdef _XOPEN_SOURCE @@ -7263,16 +8150,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7266: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8153: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7269: \$? = $ac_status" >&5 + echo "$as_me:8156: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7272: \"$ac_try\"") >&5 + { (eval echo "$as_me:8159: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7275: \$? = $ac_status" >&5 + echo "$as_me:8162: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -7287,12 +8174,64 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7290: result: $cf_cv_gnu_source" >&5 +echo "$as_me:8177: 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:8182: 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 8190 "configure" +#include "confdefs.h" +#include +int +main (void) +{ + +#ifdef _DEFAULT_SOURCE +make an error +#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:8205: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:8208: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:8211: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8214: \$? = $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:8225: 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*) + 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= @@ -7309,20 +8248,20 @@ 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:7312: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:8251: 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}:7318: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:8257: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 7321 "configure" +#line 8260 "configure" #include "confdefs.h" #include int -main () +main (void) { #ifndef _POSIX_C_SOURCE @@ -7333,41 +8272,41 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7336: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8275: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7339: \$? = $ac_status" >&5 + echo "$as_me:8278: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7342: \"$ac_try\"") >&5 + { (eval echo "$as_me:8281: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7345: \$? = $ac_status" >&5 + echo "$as_me:8284: \$? = $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 7366 "configure" +#line 8305 "configure" #include "confdefs.h" #include int -main () +main (void) { #ifdef _POSIX_SOURCE @@ -7378,16 +8317,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7381: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8320: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7384: \$? = $ac_status" >&5 + echo "$as_me:8323: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7387: \"$ac_try\"") >&5 + { (eval echo "$as_me:8326: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7390: \$? = $ac_status" >&5 + echo "$as_me:8329: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7398,19 +8337,19 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:7401: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:8340: 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}:7406: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:8345: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 7409 "configure" +#line 8348 "configure" #include "confdefs.h" #include int -main () +main (void) { #ifndef _POSIX_C_SOURCE @@ -7421,16 +8360,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7424: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8363: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7427: \$? = $ac_status" >&5 + echo "$as_me:8366: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7430: \"$ac_try\"") >&5 + { (eval echo "$as_me:8369: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7433: \$? = $ac_status" >&5 + echo "$as_me:8372: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7446,7 +8385,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7449: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:8388: 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 @@ -7461,32 +8400,38 @@ 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 "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - 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" | \ @@ -7495,21 +8440,29 @@ 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/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -7518,55 +8471,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) + cf_XOPEN_SOURCE= + cf_POSIX_C_SOURCE= ;; -*) +(*) -echo "$as_me:7562: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:8526: 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 7569 "configure" +#line 8533 "configure" #include "confdefs.h" #include @@ -7574,7 +8538,7 @@ else #include int -main () +main (void) { #ifndef _XOPEN_SOURCE @@ -7585,16 +8549,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7588: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8552: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7591: \$? = $ac_status" >&5 + echo "$as_me:8555: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7594: \"$ac_try\"") >&5 + { (eval echo "$as_me:8558: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7597: \$? = $ac_status" >&5 + echo "$as_me:8561: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -7603,7 +8567,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 7606 "configure" +#line 8570 "configure" #include "confdefs.h" #include @@ -7611,7 +8575,7 @@ cf_save="$CPPFLAGS" #include int -main () +main (void) { #ifdef _XOPEN_SOURCE @@ -7622,16 +8586,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7625: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8589: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7628: \$? = $ac_status" >&5 + echo "$as_me:8592: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7631: \"$ac_try\"") >&5 + { (eval echo "$as_me:8595: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7634: \$? = $ac_status" >&5 + echo "$as_me:8598: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -7646,7 +8610,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7649: result: $cf_cv_xopen_source" >&5 +echo "$as_me:8613: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -7669,32 +8633,38 @@ 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 "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - 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" | \ @@ -7703,21 +8673,29 @@ 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/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -7726,17 +8704,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 @@ -7754,20 +8738,20 @@ 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:7757: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:8741: 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}:7763: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:8747: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 7766 "configure" +#line 8750 "configure" #include "confdefs.h" #include int -main () +main (void) { #ifndef _POSIX_C_SOURCE @@ -7778,41 +8762,41 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7781: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8765: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7784: \$? = $ac_status" >&5 + echo "$as_me:8768: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7787: \"$ac_try\"") >&5 + { (eval echo "$as_me:8771: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7790: \$? = $ac_status" >&5 + echo "$as_me:8774: \$? = $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 7811 "configure" +#line 8795 "configure" #include "confdefs.h" #include int -main () +main (void) { #ifdef _POSIX_SOURCE @@ -7823,16 +8807,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7826: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8810: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7829: \$? = $ac_status" >&5 + echo "$as_me:8813: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7832: \"$ac_try\"") >&5 + { (eval echo "$as_me:8816: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7835: \$? = $ac_status" >&5 + echo "$as_me:8819: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7843,19 +8827,19 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:7846: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:8830: 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}:7851: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:8835: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 7854 "configure" +#line 8838 "configure" #include "confdefs.h" #include int -main () +main (void) { #ifndef _POSIX_C_SOURCE @@ -7866,16 +8850,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7869: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8853: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7872: \$? = $ac_status" >&5 + echo "$as_me:8856: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7875: \"$ac_try\"") >&5 + { (eval echo "$as_me:8859: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7878: \$? = $ac_status" >&5 + echo "$as_me:8862: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7891,7 +8875,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7894: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:8878: 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 @@ -7906,32 +8890,38 @@ 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 "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - 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" | \ @@ -7940,21 +8930,29 @@ 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/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -7963,17 +8961,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 @@ -7991,32 +8995,38 @@ 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 "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - 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" | \ @@ -8025,21 +9035,29 @@ 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/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -8047,31 +9065,46 @@ esac done if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +echo "${as_me:-configure}:9070: 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}:9080: 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}:9090: 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:8067: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:9100: 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 8070 "configure" +#line 9103 "configure" #include "confdefs.h" #include int -main () +main (void) { #ifndef _XOPEN_SOURCE @@ -8082,16 +9115,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8085: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9118: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8088: \$? = $ac_status" >&5 + echo "$as_me:9121: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8091: \"$ac_try\"") >&5 + { (eval echo "$as_me:9124: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8094: \$? = $ac_status" >&5 + echo "$as_me:9127: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -8100,16 +9133,16 @@ cat conftest.$ac_ext >&5 cf_XOPEN_SOURCE_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:8103: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:9136: 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 8108 "configure" +#line 9141 "configure" #include "confdefs.h" #include int -main () +main (void) { #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE @@ -8120,16 +9153,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8123: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9156: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8126: \$? = $ac_status" >&5 + echo "$as_me:9159: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8129: \"$ac_try\"") >&5 + { (eval echo "$as_me:9162: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8132: \$? = $ac_status" >&5 + echo "$as_me:9165: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -8140,19 +9173,19 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext if test $cf_XOPEN_SOURCE_set_ok = no then - { echo "$as_me:8143: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:9176: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:8148: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:9181: 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 8155 "configure" +#line 9188 "configure" #include "confdefs.h" #include @@ -8160,7 +9193,7 @@ else #include int -main () +main (void) { #ifndef _XOPEN_SOURCE @@ -8171,16 +9204,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8174: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9207: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8177: \$? = $ac_status" >&5 + echo "$as_me:9210: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8180: \"$ac_try\"") >&5 + { (eval echo "$as_me:9213: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8183: \$? = $ac_status" >&5 + echo "$as_me:9216: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8189,7 +9222,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 8192 "configure" +#line 9225 "configure" #include "confdefs.h" #include @@ -8197,7 +9230,7 @@ cf_save="$CPPFLAGS" #include int -main () +main (void) { #ifdef _XOPEN_SOURCE @@ -8208,16 +9241,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8211: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9244: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8214: \$? = $ac_status" >&5 + echo "$as_me:9247: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8217: \"$ac_try\"") >&5 + { (eval echo "$as_me:9250: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8220: \$? = $ac_status" >&5 + echo "$as_me:9253: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8232,7 +9265,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8235: result: $cf_cv_xopen_source" >&5 +echo "$as_me:9268: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -8255,32 +9288,38 @@ 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 "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - 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" | \ @@ -8289,21 +9328,29 @@ 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/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -8312,17 +9359,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 @@ -8330,23 +9383,25 @@ fi fi fi +CPPFLAGS_after_XOPEN="$CPPFLAGS" + # Work around breakage on OS X -echo "$as_me:8335: checking if SIGWINCH is defined" >&5 +echo "$as_me:9390: 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 8342 "configure" +#line 9397 "configure" #include "confdefs.h" #include #include int -main () +main (void) { int x = SIGWINCH ; @@ -8354,23 +9409,23 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8357: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9412: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8360: \$? = $ac_status" >&5 + echo "$as_me:9415: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8363: \"$ac_try\"") >&5 + { (eval echo "$as_me:9418: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8366: \$? = $ac_status" >&5 + echo "$as_me:9421: \$? = $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 8373 "configure" +#line 9428 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -8380,7 +9435,7 @@ cat >conftest.$ac_ext <<_ACEOF #include int -main () +main (void) { int x = SIGWINCH ; @@ -8388,16 +9443,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8391: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9446: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8394: \$? = $ac_status" >&5 + echo "$as_me:9449: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8397: \"$ac_try\"") >&5 + { (eval echo "$as_me:9452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8400: \$? = $ac_status" >&5 + echo "$as_me:9455: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=maybe else @@ -8411,11 +9466,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8414: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:9469: 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:8418: checking for actual SIGWINCH definition" >&5 +echo "$as_me:9473: 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 @@ -8426,7 +9481,7 @@ cf_sigwinch=32 while test $cf_sigwinch != 1 do cat >conftest.$ac_ext <<_ACEOF -#line 8429 "configure" +#line 9484 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -8436,7 +9491,7 @@ do #include int -main () +main (void) { #if SIGWINCH != $cf_sigwinch @@ -8448,16 +9503,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8451: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9506: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8454: \$? = $ac_status" >&5 + echo "$as_me:9509: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8457: \"$ac_try\"") >&5 + { (eval echo "$as_me:9512: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8460: \$? = $ac_status" >&5 + echo "$as_me:9515: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -8471,7 +9526,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1` done fi -echo "$as_me:8474: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:9529: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -8481,17 +9536,17 @@ fi # Checks for CODESET support. - echo "$as_me:8484: checking for nl_langinfo and CODESET" >&5 +echo "$as_me:9539: 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 8490 "configure" +#line 9545 "configure" #include "confdefs.h" #include int -main () +main (void) { char* cs = nl_langinfo(CODESET); ; @@ -8499,16 +9554,16 @@ char* cs = nl_langinfo(CODESET); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8502: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9557: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8505: \$? = $ac_status" >&5 + echo "$as_me:9560: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8508: \"$ac_try\"") >&5 + { (eval echo "$as_me:9563: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8511: \$? = $ac_status" >&5 + echo "$as_me:9566: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else @@ -8519,21 +9574,21 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8522: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:9577: 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:8536: checking if you want wide-character code" >&5 +echo "$as_me:9591: 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. @@ -8543,10 +9598,15 @@ if test "${enable_widec+set}" = set; then else with_widec=no fi; -echo "$as_me:8546: result: $with_widec" >&5 +echo "$as_me:9601: result: $with_widec" >&5 echo "${ECHO_T}$with_widec" >&6 + +NCURSES_WCWIDTH_GRAPHICS=1 + if test "x$with_widec" = xyes ; then - LIB_SUFFIX="w${LIB_SUFFIX}" + if test "x$disable_lib_suffixes" = xno ; then + LIB_SUFFIX="w${LIB_SUFFIX}" + fi cat >>confdefs.h <<\EOF #define USE_WIDEC_SUPPORT 1 @@ -8556,21 +9616,77 @@ cat >>confdefs.h <<\EOF #define NCURSES_WIDECHAR 1 EOF -echo "$as_me:8559: 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:9625: 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 9631 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:9635: \"$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:9641: \$? = $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:9660: 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 8566 "configure" +#line 9677 "configure" #include "confdefs.h" #include +#ifdef HAVE_WCHAR_H #include +#endif +#ifdef HAVE_WCTYPE_H +#include +#endif int -main () +main (void) { wint_t foo = 0; @@ -8580,16 +9696,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8583: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9699: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8586: \$? = $ac_status" >&5 + echo "$as_me:9702: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8589: \"$ac_try\"") >&5 + { (eval echo "$as_me:9705: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8592: \$? = $ac_status" >&5 + echo "$as_me:9708: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_h_okay=yes else @@ -8599,21 +9715,21 @@ cf_cv_wchar_h_okay=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8602: result: $cf_cv_wchar_h_okay" >&5 +echo "$as_me:9718: 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:8608: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "$as_me:9724: 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 8611 "configure" +#line 9727 "configure" #include "confdefs.h" #include int -main () +main (void) { #ifndef _XOPEN_SOURCE_EXTENDED @@ -8624,16 +9740,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8627: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9743: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8630: \$? = $ac_status" >&5 + echo "$as_me:9746: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8633: \"$ac_try\"") >&5 + { (eval echo "$as_me:9749: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8636: \$? = $ac_status" >&5 + echo "$as_me:9752: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=no else @@ -8642,21 +9758,21 @@ cat conftest.$ac_ext >&5 cf_result=yes fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:8645: result: $cf_result" >&5 +echo "$as_me:9761: 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:8651: checking checking for compatible value versus " >&5 + echo "$as_me:9767: 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 8654 "configure" +#line 9770 "configure" #include "confdefs.h" #include int -main () +main (void) { #if _XOPEN_SOURCE_EXTENDED- < 0 @@ -8667,16 +9783,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8670: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9786: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8673: \$? = $ac_status" >&5 + echo "$as_me:9789: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8676: \"$ac_try\"") >&5 + { (eval echo "$as_me:9792: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8679: \$? = $ac_status" >&5 + echo "$as_me:9795: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -8685,7 +9801,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:8688: result: $cf_result" >&5 + echo "$as_me:9804: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then # perhaps we can override it - try... @@ -8695,40 +9811,181 @@ 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:8704: 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:9814: 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 8710 "configure" +#line 9885 "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 + 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:9929: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9932: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:9934: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9937: \$? = $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:9950: 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:9961: 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 9967 "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 (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 @@ -8738,16 +9995,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:8741: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9998: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8744: \$? = $ac_status" >&5 + echo "$as_me:10001: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8747: \"$ac_try\"") >&5 + { (eval echo "$as_me:10004: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8750: \$? = $ac_status" >&5 + echo "$as_me:10007: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -8757,7 +10014,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8760: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:10017: 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:10029: 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 @@ -8777,12 +10034,12 @@ else cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8780 "configure" +#line 10037 "configure" #include "confdefs.h" #include int -main () +main (void) { putwc(0,0); ; @@ -8790,16 +10047,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8793: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10050: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8796: \$? = $ac_status" >&5 + echo "$as_me:10053: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8799: \"$ac_try\"") >&5 + { (eval echo "$as_me:10056: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8802: \$? = $ac_status" >&5 + echo "$as_me:10059: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_utf8_lib=yes else @@ -8811,17 +10068,17 @@ cat conftest.$ac_ext >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:8814: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:10071: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8819 "configure" +#line 10076 "configure" #include "confdefs.h" #include int -main () +main (void) { putwc(0,0); ; @@ -8829,16 +10086,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8832: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10089: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8835: \$? = $ac_status" >&5 + echo "$as_me:10092: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8838: \"$ac_try\"") >&5 + { (eval echo "$as_me:10095: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8841: \$? = $ac_status" >&5 + echo "$as_me:10098: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -8852,12 +10109,12 @@ cat conftest.$ac_ext >&5 LIBS="-lutf8 $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8855 "configure" +#line 10112 "configure" #include "confdefs.h" #include int -main () +main (void) { putwc(0,0); ; @@ -8865,16 +10122,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8868: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10125: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8871: \$? = $ac_status" >&5 + echo "$as_me:10128: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8874: \"$ac_try\"") >&5 + { (eval echo "$as_me:10131: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8877: \$? = $ac_status" >&5 + echo "$as_me:10134: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -8889,14 +10146,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}:8894: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:10151: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:8896: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:10153: 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= @@ -8905,11 +10162,11 @@ 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 "$cf_header_path" != "NONE" && \ +test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" @@ -8930,18 +10187,7 @@ fi cf_search= -test "/usr" != "$prefix" && \ -test -d "/usr" && \ -(test $prefix = NONE || test "/usr" != "$prefix") && { - test -n "$verbose" && echo " ... testing for include-directories under /usr" - test -d /usr/include && cf_search="$cf_search /usr/include" - test -d /usr/include/utf8 && cf_search="$cf_search /usr/include/utf8" - test -d /usr/include/utf8/include && cf_search="$cf_search /usr/include/utf8/include" - test -d /usr/utf8/include && cf_search="$cf_search /usr/utf8/include" - test -d /usr/utf8/include/utf8 && cf_search="$cf_search /usr/utf8/include/utf8" -} - -test "$prefix" != "NONE" && \ +test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for include-directories under $prefix" @@ -8952,38 +10198,27 @@ test -d "$prefix" && \ test -d $prefix/utf8/include/utf8 && cf_search="$cf_search $prefix/utf8/include/utf8" } -test "/usr/local" != "$prefix" && \ -test -d "/usr/local" && \ -(test $prefix = NONE || test "/usr/local" != "$prefix") && { - test -n "$verbose" && echo " ... testing for include-directories under /usr/local" - test -d /usr/local/include && cf_search="$cf_search /usr/local/include" - test -d /usr/local/include/utf8 && cf_search="$cf_search /usr/local/include/utf8" - test -d /usr/local/include/utf8/include && cf_search="$cf_search /usr/local/include/utf8/include" - test -d /usr/local/utf8/include && cf_search="$cf_search /usr/local/utf8/include" - test -d /usr/local/utf8/include/utf8 && cf_search="$cf_search /usr/local/utf8/include/utf8" -} +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do -test "/opt" != "$prefix" && \ -test -d "/opt" && \ -(test $prefix = NONE || test "/opt" != "$prefix") && { - test -n "$verbose" && echo " ... testing for include-directories under /opt" - test -d /opt/include && cf_search="$cf_search /opt/include" - test -d /opt/include/utf8 && cf_search="$cf_search /opt/include/utf8" - test -d /opt/include/utf8/include && cf_search="$cf_search /opt/include/utf8/include" - test -d /opt/utf8/include && cf_search="$cf_search /opt/utf8/include" - test -d /opt/utf8/include/utf8 && cf_search="$cf_search /opt/utf8/include/utf8" +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include" + test -d $cf_subdir_prefix/include/utf8 && cf_search="$cf_search $cf_subdir_prefix/include/utf8" + test -d $cf_subdir_prefix/include/utf8/include && cf_search="$cf_search $cf_subdir_prefix/include/utf8/include" + test -d $cf_subdir_prefix/utf8/include && cf_search="$cf_search $cf_subdir_prefix/utf8/include" + test -d $cf_subdir_prefix/utf8/include/utf8 && cf_search="$cf_search $cf_subdir_prefix/utf8/include/utf8" } -test "$HOME" != "$prefix" && \ -test -d "$HOME" && \ -(test $prefix = NONE || test "$HOME" != "$prefix") && { - test -n "$verbose" && echo " ... testing for include-directories under $HOME" - test -d $HOME/include && cf_search="$cf_search $HOME/include" - test -d $HOME/include/utf8 && cf_search="$cf_search $HOME/include/utf8" - test -d $HOME/include/utf8/include && cf_search="$cf_search $HOME/include/utf8/include" - test -d $HOME/utf8/include && cf_search="$cf_search $HOME/utf8/include" - test -d $HOME/utf8/include/utf8 && cf_search="$cf_search $HOME/utf8/include/utf8" -} +done test "$includedir" != NONE && \ test "$includedir" != "/usr/include" && \ @@ -9001,21 +10236,21 @@ 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}:9009: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:10244: 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 9013 "configure" + CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" + cat >conftest.$ac_ext <<_ACEOF +#line 10248 "configure" #include "confdefs.h" #include int -main () +main (void) { putwc(0,0); ; @@ -9023,55 +10258,55 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9026: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10261: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9029: \$? = $ac_status" >&5 + echo "$as_me:10264: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9032: \"$ac_try\"") >&5 + { (eval echo "$as_me:10267: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9035: \$? = $ac_status" >&5 + echo "$as_me:10270: \$? = $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}:9040: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:10275: 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}:9058: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:10293: 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 "$cf_library_path" != "NONE" && \ +test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" @@ -9090,18 +10325,7 @@ fi cf_search= -test "/usr" != "$prefix" && \ -test -d "/usr" && \ -(test $prefix = NONE || test "/usr" != "$prefix") && { - test -n "$verbose" && echo " ... testing for lib-directories under /usr" - test -d /usr/lib && cf_search="$cf_search /usr/lib" - test -d /usr/lib/utf8 && cf_search="$cf_search /usr/lib/utf8" - test -d /usr/lib/utf8/lib && cf_search="$cf_search /usr/lib/utf8/lib" - test -d /usr/utf8/lib && cf_search="$cf_search /usr/utf8/lib" - test -d /usr/utf8/lib/utf8 && cf_search="$cf_search /usr/utf8/lib/utf8" -} - -test "$prefix" != "NONE" && \ +test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $prefix" @@ -9112,58 +10336,47 @@ test -d "$prefix" && \ test -d $prefix/utf8/lib/utf8 && cf_search="$cf_search $prefix/utf8/lib/utf8" } -test "/usr/local" != "$prefix" && \ -test -d "/usr/local" && \ -(test $prefix = NONE || test "/usr/local" != "$prefix") && { - test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" - test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" - test -d /usr/local/lib/utf8 && cf_search="$cf_search /usr/local/lib/utf8" - test -d /usr/local/lib/utf8/lib && cf_search="$cf_search /usr/local/lib/utf8/lib" - test -d /usr/local/utf8/lib && cf_search="$cf_search /usr/local/utf8/lib" - test -d /usr/local/utf8/lib/utf8 && cf_search="$cf_search /usr/local/utf8/lib/utf8" -} +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do -test "/opt" != "$prefix" && \ -test -d "/opt" && \ -(test $prefix = NONE || test "/opt" != "$prefix") && { - test -n "$verbose" && echo " ... testing for lib-directories under /opt" - test -d /opt/lib && cf_search="$cf_search /opt/lib" - test -d /opt/lib/utf8 && cf_search="$cf_search /opt/lib/utf8" - test -d /opt/lib/utf8/lib && cf_search="$cf_search /opt/lib/utf8/lib" - test -d /opt/utf8/lib && cf_search="$cf_search /opt/utf8/lib" - test -d /opt/utf8/lib/utf8 && cf_search="$cf_search /opt/utf8/lib/utf8" +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d $cf_subdir_prefix/lib/utf8 && cf_search="$cf_search $cf_subdir_prefix/lib/utf8" + test -d $cf_subdir_prefix/lib/utf8/lib && cf_search="$cf_search $cf_subdir_prefix/lib/utf8/lib" + test -d $cf_subdir_prefix/utf8/lib && cf_search="$cf_search $cf_subdir_prefix/utf8/lib" + test -d $cf_subdir_prefix/utf8/lib/utf8 && cf_search="$cf_search $cf_subdir_prefix/utf8/lib/utf8" } -test "$HOME" != "$prefix" && \ -test -d "$HOME" && \ -(test $prefix = NONE || test "$HOME" != "$prefix") && { - test -n "$verbose" && echo " ... testing for lib-directories under $HOME" - test -d $HOME/lib && cf_search="$cf_search $HOME/lib" - test -d $HOME/lib/utf8 && cf_search="$cf_search $HOME/lib/utf8" - test -d $HOME/lib/utf8/lib && cf_search="$cf_search $HOME/lib/utf8/lib" - test -d $HOME/utf8/lib && cf_search="$cf_search $HOME/utf8/lib" - test -d $HOME/utf8/lib/utf8 && cf_search="$cf_search $HOME/utf8/lib/utf8" -} +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}:9155: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:10368: 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 9161 "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 10374 "configure" #include "confdefs.h" #include int -main () +main (void) { putwc(0,0); ; @@ -9171,44 +10384,44 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9174: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10387: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9177: \$? = $ac_status" >&5 + echo "$as_me:10390: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9180: \"$ac_try\"") >&5 + { (eval echo "$as_me:10393: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9183: \$? = $ac_status" >&5 + echo "$as_me:10396: \$? = $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}:9188: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:10401: 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 @@ -9227,7 +10440,7 @@ fi fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9230: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:10443: 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 @@ -9262,11 +10475,11 @@ 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 9265 "configure" +#line 10478 "configure" #include "confdefs.h" #include int -main () +main (void) { printf("Hello") ; @@ -9274,16 +10487,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9277: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10490: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9280: \$? = $ac_status" >&5 + echo "$as_me:10493: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9283: \"$ac_try\"") >&5 + { (eval echo "$as_me:10496: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9286: \$? = $ac_status" >&5 + echo "$as_me:10499: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9300,7 +10513,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}:9303: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10516: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9310,39 +10523,56 @@ echo "${as_me:-configure}:9303: 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}:9337: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:10552: 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 - LIBS="$cf_cv_library_file_utf8 $LIBS" +cf_add_libs="$cf_cv_library_file_utf8" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + fi if test "$cf_cv_utf8_lib" != no ; then @@ -9351,14 +10581,14 @@ fi fi # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:9354: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:10584: 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 9361 "configure" +#line 10591 "configure" #include "confdefs.h" #include @@ -9368,7 +10598,7 @@ cat >conftest.$ac_ext <<_ACEOF #include #endif int -main () +main (void) { mbstate_t state ; @@ -9376,23 +10606,23 @@ mbstate_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9379: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10609: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9382: \$? = $ac_status" >&5 + echo "$as_me:10612: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9385: \"$ac_try\"") >&5 + { (eval echo "$as_me:10615: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9388: \$? = $ac_status" >&5 + echo "$as_me:10618: \$? = $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 9395 "configure" +#line 10625 "configure" #include "confdefs.h" #include @@ -9403,7 +10633,7 @@ cat >conftest.$ac_ext <<_ACEOF #include #endif int -main () +main (void) { mbstate_t value ; @@ -9411,16 +10641,16 @@ mbstate_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9414: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10644: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9417: \$? = $ac_status" >&5 + echo "$as_me:10647: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9420: \"$ac_try\"") >&5 + { (eval echo "$as_me:10650: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9423: \$? = $ac_status" >&5 + echo "$as_me:10653: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=yes else @@ -9432,7 +10662,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9435: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:10665: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -9450,14 +10680,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:9453: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:10683: 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 9460 "configure" +#line 10690 "configure" #include "confdefs.h" #include @@ -9467,7 +10697,7 @@ cat >conftest.$ac_ext <<_ACEOF #include #endif int -main () +main (void) { wchar_t state ; @@ -9475,23 +10705,23 @@ wchar_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9478: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10708: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9481: \$? = $ac_status" >&5 + echo "$as_me:10711: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9484: \"$ac_try\"") >&5 + { (eval echo "$as_me:10714: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9487: \$? = $ac_status" >&5 + echo "$as_me:10717: \$? = $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 9494 "configure" +#line 10724 "configure" #include "confdefs.h" #include @@ -9502,7 +10732,7 @@ cat >conftest.$ac_ext <<_ACEOF #include #endif int -main () +main (void) { wchar_t value ; @@ -9510,16 +10740,16 @@ wchar_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9513: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10743: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9516: \$? = $ac_status" >&5 + echo "$as_me:10746: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9519: \"$ac_try\"") >&5 + { (eval echo "$as_me:10749: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9522: \$? = $ac_status" >&5 + echo "$as_me:10752: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_t=yes else @@ -9531,7 +10761,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9534: result: $cf_cv_wchar_t" >&5 +echo "$as_me:10764: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -9554,14 +10784,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:9557: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:10787: 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 9564 "configure" +#line 10794 "configure" #include "confdefs.h" #include @@ -9571,7 +10801,7 @@ cat >conftest.$ac_ext <<_ACEOF #include #endif int -main () +main (void) { wint_t state ; @@ -9579,23 +10809,23 @@ wint_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9582: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10812: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9585: \$? = $ac_status" >&5 + echo "$as_me:10815: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9588: \"$ac_try\"") >&5 + { (eval echo "$as_me:10818: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9591: \$? = $ac_status" >&5 + echo "$as_me:10821: \$? = $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 9598 "configure" +#line 10828 "configure" #include "confdefs.h" #include @@ -9606,7 +10836,7 @@ cat >conftest.$ac_ext <<_ACEOF #include #endif int -main () +main (void) { wint_t value ; @@ -9614,16 +10844,16 @@ wint_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9617: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10847: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9620: \$? = $ac_status" >&5 + echo "$as_me:10850: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9623: \"$ac_try\"") >&5 + { (eval echo "$as_me:10853: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9626: \$? = $ac_status" >&5 + echo "$as_me:10856: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wint_t=yes else @@ -9635,7 +10865,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9638: result: $cf_cv_wint_t" >&5 +echo "$as_me:10868: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -9667,16 +10897,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:9679: checking whether to enable _LP64 definition in curses.h" >&5 +echo "$as_me:10900: 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. @@ -9684,9 +10905,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:9689: result: $with_lp64" >&5 +echo "$as_me:10910: result: $with_lp64" >&5 echo "${ECHO_T}$with_lp64" >&6 if test "x$with_lp64" = xyes ; then @@ -9702,7 +10923,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:9705: checking for special C compiler options needed for large files" >&5 + echo "$as_me:10926: 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 @@ -9714,7 +10935,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 9717 "configure" +#line 10938 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -9726,7 +10947,7 @@ else && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; @@ -9734,16 +10955,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9737: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10958: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9740: \$? = $ac_status" >&5 + echo "$as_me:10961: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9743: \"$ac_try\"") >&5 + { (eval echo "$as_me:10964: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9746: \$? = $ac_status" >&5 + echo "$as_me:10967: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -9753,16 +10974,16 @@ fi rm -f conftest.$ac_objext CC="$CC -n32" rm -f conftest.$ac_objext -if { (eval echo "$as_me:9756: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10977: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9759: \$? = $ac_status" >&5 + echo "$as_me:10980: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9762: \"$ac_try\"") >&5 + { (eval echo "$as_me:10983: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9765: \$? = $ac_status" >&5 + echo "$as_me:10986: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -9776,13 +10997,13 @@ rm -f conftest.$ac_objext rm -f conftest.$ac_ext fi fi -echo "$as_me:9779: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:11000: 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:9785: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:11006: 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 @@ -9790,7 +11011,7 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF -#line 9793 "configure" +#line 11014 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -9802,7 +11023,7 @@ else && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; @@ -9810,16 +11031,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9813: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11034: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9816: \$? = $ac_status" >&5 + echo "$as_me:11037: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9819: \"$ac_try\"") >&5 + { (eval echo "$as_me:11040: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9822: \$? = $ac_status" >&5 + echo "$as_me:11043: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -9828,7 +11049,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 9831 "configure" +#line 11052 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -9841,7 +11062,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; @@ -9849,16 +11070,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9852: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11073: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9855: \$? = $ac_status" >&5 + echo "$as_me:11076: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9858: \"$ac_try\"") >&5 + { (eval echo "$as_me:11079: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9861: \$? = $ac_status" >&5 + echo "$as_me:11082: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -9869,7 +11090,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:9872: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:11093: 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 @@ -9879,7 +11100,7 @@ EOF fi rm -rf conftest* - echo "$as_me:9882: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:11103: 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 @@ -9887,7 +11108,7 @@ else while :; do ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF -#line 9890 "configure" +#line 11111 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -9899,7 +11120,7 @@ else && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; @@ -9907,16 +11128,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9910: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11131: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9913: \$? = $ac_status" >&5 + echo "$as_me:11134: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9916: \"$ac_try\"") >&5 + { (eval echo "$as_me:11137: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9919: \$? = $ac_status" >&5 + echo "$as_me:11140: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -9925,7 +11146,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 9928 "configure" +#line 11149 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -9938,7 +11159,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; @@ -9946,16 +11167,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9949: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11170: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9952: \$? = $ac_status" >&5 + echo "$as_me:11173: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9955: \"$ac_try\"") >&5 + { (eval echo "$as_me:11176: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9958: \$? = $ac_status" >&5 + echo "$as_me:11179: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_large_files=1; break else @@ -9966,7 +11187,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:9969: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:11190: 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 @@ -9978,8 +11199,8 @@ fi rm -rf conftest* fi - if test "$enable_largefile" != no ; then - echo "$as_me:9982: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + if test "$enable_largefile" != no ; then + echo "$as_me:11203: 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 @@ -9987,11 +11208,11 @@ else while :; do ac_cv_sys_largefile_source=no cat >conftest.$ac_ext <<_ACEOF -#line 9990 "configure" +#line 11211 "configure" #include "confdefs.h" #include int -main () +main (void) { return !fseeko; ; @@ -9999,16 +11220,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10002: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11223: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10005: \$? = $ac_status" >&5 + echo "$as_me:11226: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10008: \"$ac_try\"") >&5 + { (eval echo "$as_me:11229: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10011: \$? = $ac_status" >&5 + echo "$as_me:11232: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -10017,12 +11238,12 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 10020 "configure" +#line 11241 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include int -main () +main (void) { return !fseeko; ; @@ -10030,16 +11251,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10033: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11254: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10036: \$? = $ac_status" >&5 + echo "$as_me:11257: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10039: \"$ac_try\"") >&5 + { (eval echo "$as_me:11260: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10042: \$? = $ac_status" >&5 + echo "$as_me:11263: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_source=1; break else @@ -10050,7 +11271,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:10053: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:11274: 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 @@ -10064,17 +11285,17 @@ 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:10067: checking for fseeko" >&5 +echo "$as_me:11288: 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 10073 "configure" +#line 11294 "configure" #include "confdefs.h" #include int -main () +main (void) { return fseeko && fseeko (stdin, 0, 0); ; @@ -10082,16 +11303,16 @@ return fseeko && fseeko (stdin, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10085: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11306: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10088: \$? = $ac_status" >&5 + echo "$as_me:11309: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10091: \"$ac_try\"") >&5 + { (eval echo "$as_me:11312: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10094: \$? = $ac_status" >&5 + echo "$as_me:11315: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fseeko=yes else @@ -10101,7 +11322,7 @@ ac_cv_func_fseeko=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10104: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:11325: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -10122,21 +11343,22 @@ 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:10125: checking whether to use struct dirent64" >&5 + echo "$as_me:11346: 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 10132 "configure" +#line 11353 "configure" #include "confdefs.h" +#pragma GCC diagnostic error "-Wincompatible-pointer-types" #include #include int -main () +main (void) { /* if transitional largefile support is setup, this is true */ @@ -10150,16 +11372,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10153: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11375: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10156: \$? = $ac_status" >&5 + echo "$as_me:11378: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10159: \"$ac_try\"") >&5 + { (eval echo "$as_me:11381: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10162: \$? = $ac_status" >&5 + echo "$as_me:11384: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_struct_dirent64=yes else @@ -10170,17 +11392,17 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10173: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:11395: 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:10183: checking if you want tparm not to use X/Open fixed-parameter list" >&5 +echo "$as_me:11405: 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. @@ -10190,14 +11412,14 @@ if test "${enable_tparm_varargs+set}" = set; then else with_tparm_varargs=yes fi; -echo "$as_me:10193: result: $with_tparm_varargs" >&5 +echo "$as_me:11415: 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:10200: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 +echo "$as_me:11422: 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. @@ -10207,14 +11429,120 @@ if test "${enable_tic_depends+set}" = set; then else with_tic_depends=yes fi; -echo "$as_me:10210: result: $with_tic_depends" >&5 +echo "$as_me:11432: 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:11439: 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:11451: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + NCURSES_WATTR_MACROS=1 + echo "$as_me:11455: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +echo "$as_me:11459: checking for X11 rgb file" >&5 +echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6 + +# Check whether --with-x11-rgb or --without-x11-rgb was given. +if test "${with_x11_rgb+set}" = set; then + withval="$with_x11_rgb" + RGB_PATH=$withval +else + RGB_PATH=auto +fi; + +if test "x$RGB_PATH" = xauto +then + RGB_PATH='${exec_prefix}/lib/X11/rgb.txt' + for cf_path in \ + /opt/local/share/X11/rgb.txt \ + /opt/X11/share/X11/rgb.txt \ + /usr/share/X11/rgb.txt \ + /usr/X11/share/X11/rgb.txt \ + /usr/X11/lib/X11/rgb.txt \ + /usr/lib/X11/rgb.txt \ + /etc/X11/rgb.txt \ + /usr/pkg/lib/X11/rgb.txt \ + /usr/X11R7/lib/X11/rgb.txt \ + /usr/X11R6/lib/X11/rgb.txt \ + /usr/X11R5/lib/X11/rgb.txt \ + /usr/X11R4/lib/X11/rgb.txt \ + /usr/local/lib/X11/rgb.txt \ + /usr/local/share/X11/rgb.txt \ + /usr/lib64/X11/rgb.txt + do + if test -f "$cf_path" ; then + RGB_PATH="$cf_path" + break + fi + done +else + cf_path=$RGB_PATH + +if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" +else + cf_path_syntax="$ac_default_prefix" +fi + +case ".$cf_path" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval cf_path="$cf_path" + case ".$cf_path" in + (.NONE/*) + cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { { echo "$as_me:11523: error: expected a pathname, not \"$cf_path\"" >&5 +echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} + { (exit 1); exit 1; }; } + ;; +esac + +fi + +echo "$as_me:11531: result: $RGB_PATH" >&5 +echo "${ECHO_T}$RGB_PATH" >&6 + +cat >>confdefs.h <&5 +echo "$as_me:11545: 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. @@ -10224,10 +11552,10 @@ if test "${with_bool+set}" = set; then else NCURSES_BOOL=auto fi; -echo "$as_me:10227: result: $NCURSES_BOOL" >&5 +echo "$as_me:11555: result: $NCURSES_BOOL" >&5 echo "${ECHO_T}$NCURSES_BOOL" >&6 -echo "$as_me:10230: checking for alternate terminal capabilities file" >&5 +echo "$as_me:11558: 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. @@ -10238,11 +11566,11 @@ else TERMINFO_CAPS=Caps fi; test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps -echo "$as_me:10241: result: $TERMINFO_CAPS" >&5 +echo "$as_me:11569: result: $TERMINFO_CAPS" >&5 echo "${ECHO_T}$TERMINFO_CAPS" >&6 ### use option --with-chtype to override chtype's type -echo "$as_me:10245: checking for type of chtype" >&5 +echo "$as_me:11573: 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. @@ -10250,13 +11578,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:10255: result: $NCURSES_CHTYPE" >&5 +echo "$as_me:11583: result: $NCURSES_CHTYPE" >&5 echo "${ECHO_T}$NCURSES_CHTYPE" >&6 ### use option --with-ospeed to override ospeed's type -echo "$as_me:10259: checking for type of ospeed" >&5 +echo "$as_me:11587: 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. @@ -10266,11 +11594,11 @@ if test "${with_ospeed+set}" = set; then else NCURSES_OSPEED=short fi; -echo "$as_me:10269: result: $NCURSES_OSPEED" >&5 +echo "$as_me:11597: result: $NCURSES_OSPEED" >&5 echo "${ECHO_T}$NCURSES_OSPEED" >&6 ### use option --with-mmask-t to override mmask_t's type -echo "$as_me:10273: checking for type of mmask_t" >&5 +echo "$as_me:11601: 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. @@ -10278,13 +11606,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:10283: result: $NCURSES_MMASK_T" >&5 +echo "$as_me:11611: 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:10287: checking for size CCHARW_MAX" >&5 +echo "$as_me:11615: 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. @@ -10294,360 +11622,801 @@ if test "${with_ccharw_max+set}" = set; then else NCURSES_CCHARW_MAX=5 fi; -echo "$as_me:10297: result: $NCURSES_CCHARW_MAX" >&5 +echo "$as_me:11625: 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:10301: checking for type of tparm args" >&5 -echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6 +echo "$as_me:11628: 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 11634 "configure" +#include "confdefs.h" +#include +#include +#include +#include -# Check whether --with-tparm-arg or --without-tparm-arg was given. -if test "${with_tparm_arg+set}" = set; then - withval="$with_tparm_arg" - NCURSES_TPARM_ARG="$withval" +_ACEOF +if { (eval echo "$as_me:11642: \"$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:11648: \$? = $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 - NCURSES_TPARM_ARG=long -fi; -echo "$as_me:10311: result: $NCURSES_TPARM_ARG" >&5 -echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6 + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_stdc=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_stdc=no +fi +rm -f conftest.err conftest.$ac_ext -### Enable compiling-in rcs id's -echo "$as_me:10315: checking if RCS identifiers should be compiled-in" >&5 -echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 +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 11670 "configure" +#include "confdefs.h" +#include -# Check whether --with-rcs-ids or --without-rcs-ids was given. -if test "${with_rcs_ids+set}" = set; then - withval="$with_rcs_ids" - with_rcs_ids=$withval +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "memchr" >/dev/null 2>&1; then + : else - with_rcs_ids=no -fi; -echo "$as_me:10325: result: $with_rcs_ids" >&5 -echo "${ECHO_T}$with_rcs_ids" >&6 -test "x$with_rcs_ids" = xyes && -cat >>confdefs.h <<\EOF -#define USE_RCS_IDS 1 -EOF + ac_cv_header_stdc=no +fi +rm -rf conftest* -############################################################################### +fi -echo "$as_me:10334: checking format of man-pages" >&5 -echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 +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 11688 "configure" +#include "confdefs.h" +#include -# Check whether --with-manpage-format or --without-manpage-format was given. -if test "${with_manpage_format+set}" = set; then - withval="$with_manpage_format" - MANPAGE_FORMAT=$withval +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "free" >/dev/null 2>&1; then + : else - MANPAGE_FORMAT=unknown -fi; - -test -z "$MANPAGE_FORMAT" && MANPAGE_FORMAT=unknown -MANPAGE_FORMAT=`echo "$MANPAGE_FORMAT" | sed -e 's/,/ /g'` + ac_cv_header_stdc=no +fi +rm -rf conftest* -cf_unknown= +fi -case $MANPAGE_FORMAT in -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 - - 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 +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else + cat >conftest.$ac_ext <<_ACEOF +#line 11709 "configure" +#include "confdefs.h" +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif - case "$cf_name" in - $cf_dir/man*) - cf_catonly=no - ;; - $cf_dir/cat*) - cf_preform=yes - ;; - esac - break - fi +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main (void) +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + $ac_main_return(2); + $ac_main_return (0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:11735: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:11738: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:11740: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11743: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_header_stdc=no +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +fi +echo "$as_me:11756: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 +if test $ac_cv_header_stdc = yes; then - # 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 #(vi - gzip|compress|BSDI|normal|formatted|catonly) - ;; - *) - cf_unknown="$cf_unknown $cf_option" - ;; - esac - done - ;; -esac +cat >>confdefs.h <<\EOF +#define STDC_HEADERS 1 +EOF -echo "$as_me:10423: result: $MANPAGE_FORMAT" >&5 -echo "${ECHO_T}$MANPAGE_FORMAT" >&6 -if test -n "$cf_unknown" ; then - { echo "$as_me:10426: WARNING: Unexpected manpage-format $cf_unknown" >&5 -echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} fi -echo "$as_me:10430: checking for manpage renaming" >&5 -echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 +# On IRIX 5.3, sys/types and inttypes.h are conflicting. -# Check whether --with-manpage-renames or --without-manpage-renames was given. -if test "${with_manpage_renames+set}" = set; then - withval="$with_manpage_renames" - MANPAGE_RENAMES=$withval +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:11772: 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 - 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 - ;; -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:10458: error: not a filename: $MANPAGE_RENAMES" >&5 -echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} - { (exit 1); exit 1; }; } - fi - - 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 + cat >conftest.$ac_ext <<_ACEOF +#line 11778 "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11784: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11787: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11790: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11793: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_Header=no" fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:11803: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 -echo "${ECHO_T}$MANPAGE_RENAMES" >&6 - -echo "$as_me:10475: checking if manpage aliases will be installed" >&5 -echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 +fi +done -# Check whether --with-manpage-aliases or --without-manpage-aliases was given. -if test "${with_manpage_aliases+set}" = set; then - withval="$with_manpage_aliases" - MANPAGE_ALIASES=$withval +echo "$as_me:11813: 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 - MANPAGE_ALIASES=yes -fi; - -echo "$as_me:10486: result: $MANPAGE_ALIASES" >&5 -echo "${ECHO_T}$MANPAGE_ALIASES" >&6 - -case "x$LN_S" in #(vi -xln*) #(vi - cf_use_symlinks=yes - ;; -*) - cf_use_symlinks=no - ;; -esac - -MANPAGE_SYMLINKS=no -if test "$MANPAGE_ALIASES" = yes ; then -echo "$as_me:10500: 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. -if test "${with_manpage_symlinks+set}" = set; then - withval="$with_manpage_symlinks" - MANPAGE_SYMLINKS=$withval + cat >conftest.$ac_ext <<_ACEOF +#line 11819 "configure" +#include "confdefs.h" +$ac_includes_default +int +main (void) +{ +if ((signed char *) 0) + return 0; +if (sizeof (signed char)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11834: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11837: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11840: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11843: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_signed_char=yes else - MANPAGE_SYMLINKS=$cf_use_symlinks -fi; - -if test "$$cf_use_symlinks" = no; then -if test "$MANPAGE_SYMLINKS" = yes ; then - { echo "$as_me:10513: WARNING: cannot make symlinks" >&5 -echo "$as_me: WARNING: cannot make symlinks" >&2;} - MANPAGE_SYMLINKS=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_signed_char=no fi +rm -f conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:11853: result: $ac_cv_type_signed_char" >&5 +echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:10519: result: $MANPAGE_SYMLINKS" >&5 -echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 +echo "$as_me:11856: 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 +else + if test "$ac_cv_type_signed_char" = yes; then + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +#line 11865 "configure" +#include "confdefs.h" +$ac_includes_default +int +main (void) +{ +int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11877: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11880: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11883: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11886: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 11891 "configure" +#include "confdefs.h" +$ac_includes_default +int +main (void) +{ +int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11903: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11906: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11909: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11912: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` fi - -echo "$as_me:10523: 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. -if test "${with_manpage_tbl+set}" = set; then - withval="$with_manpage_tbl" - MANPAGE_TBL=$withval +rm -f conftest.$ac_objext conftest.$ac_ext + done else - MANPAGE_TBL=no -fi; - -echo "$as_me:10534: result: $MANPAGE_TBL" >&5 -echo "${ECHO_T}$MANPAGE_TBL" >&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 11928 "configure" +#include "confdefs.h" +$ac_includes_default +int +main (void) +{ +int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11940: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11943: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11946: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11949: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +fi +rm -f conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +#line 11965 "configure" +#include "confdefs.h" +$ac_includes_default +int +main (void) +{ +int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11977: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11980: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11983: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11986: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +ac_cv_sizeof_signed_char=$ac_lo +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:11999: 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 12004 "configure" +#include "confdefs.h" +$ac_includes_default +int +main (void) +{ +FILE *f = fopen ("conftest.val", "w"); +if (!f) + $ac_main_return (1); +fprintf (f, "%d", (sizeof (signed char))); +fclose (f); + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:12020: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12023: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:12025: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12028: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_signed_char=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +rm -f conftest.val +else + ac_cv_sizeof_signed_char=0 +fi +fi +echo "$as_me:12044: result: $ac_cv_sizeof_signed_char" >&5 +echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 +cat >>confdefs.h <&5 +echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 - 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 +# Check whether --enable-signed-char or --disable-signed-char was given. +if test "${enable_signed_char+set}" = set; then + enableval="$enable_signed_char" + with_signed_char=$enableval +else + with_signed_char=no +fi; +echo "$as_me:12065: result: $with_signed_char" >&5 +echo "${ECHO_T}$with_signed_char" >&6 +test "x$with_signed_char" != xyes && NCURSES_SBOOL="char" -test ! -d man && mkdir man +### use option --with-tparm-arg to override tparm's argument type +echo "$as_me:12070: checking for type of tparm args" >&5 +echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6 -cf_so_strip= -cf_compress= -case "$MANPAGE_FORMAT" in #(vi -*compress*) #(vi - cf_so_strip="Z" - cf_compress=compress - ;; -*gzip*) - cf_so_strip="gz" - cf_compress=gzip - ;; -esac +# Check whether --with-tparm-arg or --without-tparm-arg was given. +if test "${with_tparm_arg+set}" = set; then + withval="$with_tparm_arg" + NCURSES_TPARM_ARG="$withval" +else + NCURSES_TPARM_ARG=$cf_dft_tparm_arg +fi; +echo "$as_me:12080: result: $NCURSES_TPARM_ARG" >&5 +echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6 -cf_edit_man=./edit_man.sh -cf_man_alias=`pwd`/man_alias.sed +### Enable compiling-in rcs id's +echo "$as_me:12084: checking if RCS identifiers should be compiled-in" >&5 +echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 -cat >$cf_edit_man <&5 +echo "${ECHO_T}$with_rcs_ids" >&6 +test "x$with_rcs_ids" = xyes && +cat >>confdefs.h <<\EOF +#define USE_RCS_IDS 1 +EOF -prefix="$cf_prefix" -datarootdir="$datarootdir" -datadir="$datadir" +############################################################################### -NCURSES_MAJOR="$NCURSES_MAJOR" -NCURSES_MINOR="$NCURSES_MINOR" -NCURSES_PATCH="$NCURSES_PATCH" +echo "$as_me:12103: checking format of man-pages" >&5 +echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 -NCURSES_OSPEED="$NCURSES_OSPEED" -TERMINFO="$TERMINFO" +# Check whether --with-manpage-format or --without-manpage-format was given. +if test "${with_manpage_format+set}" = set; then + withval="$with_manpage_format" + MANPAGE_FORMAT=$withval +else + MANPAGE_FORMAT=unknown +fi; -INSTALL="$INSTALL" -INSTALL_DATA="$INSTALL_DATA" +test -z "$MANPAGE_FORMAT" && MANPAGE_FORMAT=unknown +MANPAGE_FORMAT=`echo "$MANPAGE_FORMAT" | sed -e 's/,/ /g'` -transform="$program_transform_name" +cf_unknown= -TMP=\${TMPDIR:=/tmp}/man\$\$ -trap "rm -f \$TMP" 0 1 2 5 15 +case $MANPAGE_FORMAT in +(unknown) + if test -z "$MANPATH" ; then + MANPATH="/usr/man:/usr/share/man" + fi -form=\$1 -shift || exit 1 + # look for the 'date' man-page (it's most likely to be installed!) + MANPAGE_FORMAT= + cf_preform=no + cf_catonly=yes + cf_example=date -verb=\$1 -shift || exit 1 + 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 -mandir=\$1 -shift || exit 1 + case "$cf_name" in + ($cf_dir/man*) + cf_catonly=no + ;; + ($cf_dir/cat*) + cf_preform=yes + ;; + esac + break + fi -srcdir=\$1 -top_srcdir=\$srcdir/.. -shift || exit 1 + # 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 + done + ;; +esac -if test "\$form" = normal ; then - if test "$cf_format" = yes ; then - if test "$cf_inboth" = no ; then - sh \$0 format \$verb \$mandir \$srcdir \$* - exit $? - fi - fi - cf_subdir=\$mandir/man - cf_tables=$MANPAGE_TBL -else - cf_subdir=\$mandir/cat - cf_tables=yes +echo "$as_me:12192: result: $MANPAGE_FORMAT" >&5 +echo "${ECHO_T}$MANPAGE_FORMAT" >&6 +if test -n "$cf_unknown" ; then + { echo "$as_me:12195: WARNING: Unexpected manpage-format $cf_unknown" >&5 +echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} fi -# process the list of source-files -for i in \$* ; do -case \$i in #(vi -*.orig|*.rej) ;; #(vi -*.[0-9]*) - section=\`expr "\$i" : '.*\\.\\([0-9]\\)[xm]*'\`; - if test \$verb = installing ; then - if test ! -d \$cf_subdir\${section} ; then - mkdir -p \$cf_subdir\$section - fi - fi +echo "$as_me:12199: checking for manpage renaming" >&5 +echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 - # replace variables in man page - if test ! -f $cf_man_alias ; then -cat >>$cf_man_alias <<-CF_EOF2 - s,@DATADIR@,\$datadir,g - s,@TERMINFO@,\${TERMINFO:="no default value"},g - s,@TERMINFO_DIRS@,\${TERMINFO_DIRS:="no default value"},g - s,@NCURSES_MAJOR@,\${NCURSES_MAJOR:="no default value"},g - s,@NCURSES_MINOR@,\${NCURSES_MINOR:="no default value"},g - s,@NCURSES_PATCH@,\${NCURSES_PATCH:="no default value"},g - s,@NCURSES_OSPEED@,\${NCURSES_OSPEED:="no default value"},g -CF_EOF +# Check whether --with-manpage-renames or --without-manpage-renames was given. +if test "${with_manpage_renames+set}" = set; then + withval="$with_manpage_renames" + MANPAGE_RENAMES=$withval +else + MANPAGE_RENAMES=yes +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:12227: error: not a filename: $MANPAGE_RENAMES" >&5 +echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} + { (exit 1); exit 1; }; } + fi + + 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 + $SHELL $srcdir/man/make_sed.sh $MANPAGE_RENAMES >./edit_man.sed + fi +fi + +echo "$as_me:12241: result: $MANPAGE_RENAMES" >&5 +echo "${ECHO_T}$MANPAGE_RENAMES" >&6 + +echo "$as_me:12244: 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. +if test "${with_manpage_aliases+set}" = set; then + withval="$with_manpage_aliases" + MANPAGE_ALIASES=$withval +else + MANPAGE_ALIASES=yes +fi; + +echo "$as_me:12255: result: $MANPAGE_ALIASES" >&5 +echo "${ECHO_T}$MANPAGE_ALIASES" >&6 + +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:12269: 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. +if test "${with_manpage_symlinks+set}" = set; then + withval="$with_manpage_symlinks" + MANPAGE_SYMLINKS=$withval +else + MANPAGE_SYMLINKS=$cf_use_symlinks +fi; + +if test "$$cf_use_symlinks" = no; then +if test "$MANPAGE_SYMLINKS" = yes ; then + { echo "$as_me:12282: WARNING: cannot make symlinks" >&5 +echo "$as_me: WARNING: cannot make symlinks" >&2;} + MANPAGE_SYMLINKS=no +fi +fi + +echo "$as_me:12288: result: $MANPAGE_SYMLINKS" >&5 +echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 +fi + +echo "$as_me:12292: 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. +if test "${with_manpage_tbl+set}" = set; then + withval="$with_manpage_tbl" + MANPAGE_TBL=$withval +else + MANPAGE_TBL=no +fi; + +echo "$as_me:12303: 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 + +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 +(*compress*) + cf_so_strip="Z" + cf_compress=compress + ;; +(*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,@DATADIR@,\$datadir,g + s,@TERMINFO@,\${TERMINFO:="no default value"},g + s,@TERMINFO_DIRS@,\${TERMINFO_DIRS:="no default value"},g + s,@NCURSES_MAJOR@,\${NCURSES_MAJOR:="no default value"},g + s,@NCURSES_MINOR@,\${NCURSES_MINOR:="no default value"},g + s,@NCURSES_PATCH@,\${NCURSES_PATCH:="no default value"},g + s,@NCURSES_OSPEED@,\${NCURSES_OSPEED:="no default value"},g +CF_EOF - for cf_name in captoinfo clear infocmp infotocap tabs tic toe tput tset + 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"` @@ -10754,8 +12523,8 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <&5 +echo "$as_me:12636: 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. @@ -10874,11 +12643,15 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:10877: result: $with_ext_funcs" >&5 +echo "$as_me:12646: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "x$with_ext_funcs" = xyes ; then NCURSES_EXT_FUNCS=1 +cat >>confdefs.h <<\EOF +#define NCURSES_EXT_FUNCS 1 +EOF + cat >>confdefs.h <<\EOF #define HAVE_ASSUME_DEFAULT_COLORS 1 EOF @@ -10908,788 +12681,263 @@ cat >>confdefs.h <<\EOF EOF cat >>confdefs.h <<\EOF -#define HAVE_USE_SCREEN 1 -EOF - -cat >>confdefs.h <<\EOF -#define HAVE_USE_WINDOW 1 -EOF - -cat >>confdefs.h <<\EOF -#define HAVE_WRESIZE 1 +#define HAVE_USE_EXTENDED_NAMES 1 EOF cat >>confdefs.h <<\EOF -#define NCURSES_EXT_FUNCS 1 +#define HAVE_USE_SCREEN 1 EOF - GENERATED_EXT_FUNCS=generated -else - NCURSES_EXT_FUNCS=0 - GENERATED_EXT_FUNCS= -fi - -echo "$as_me:10932: checking if you want to build with experimental SCREEN extensions" >&5 -echo $ECHO_N "checking if you want to build with experimental SCREEN extensions... $ECHO_C" >&6 - -# Check whether --enable-sp-funcs or --disable-sp-funcs was given. -if test "${enable_sp_funcs+set}" = set; then - enableval="$enable_sp_funcs" - with_sp_funcs=$enableval -else - with_sp_funcs=no -fi; -echo "$as_me:10942: result: $with_sp_funcs" >&5 -echo "${ECHO_T}$with_sp_funcs" >&6 -if test "x$with_sp_funcs" = xyes ; then - NCURSES_SP_FUNCS=1 - cat >>confdefs.h <<\EOF -#define NCURSES_SP_FUNCS 1 +#define HAVE_USE_WINDOW 1 EOF - GENERATED_SP_FUNCS=generated -else - NCURSES_SP_FUNCS=0 - GENERATED_SP_FUNCS= -fi - -echo "$as_me:10957: checking if you want to build with experimental terminal-driver" >&5 -echo $ECHO_N "checking if you want to build with experimental terminal-driver... $ECHO_C" >&6 - -# Check whether --enable-term-driver or --disable-term-driver was given. -if test "${enable_term_driver+set}" = set; then - enableval="$enable_term_driver" - with_term_driver=$enableval -else - with_term_driver=no -fi; -echo "$as_me:10967: result: $with_term_driver" >&5 -echo "${ECHO_T}$with_term_driver" >&6 -if test "x$with_term_driver" = xyes ; then - cat >>confdefs.h <<\EOF -#define USE_TERM_DRIVER 1 -EOF - - if test "x$with_sp_funcs" != xyes ; then - { { echo "$as_me:10976: 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:10983: 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. -if test "${enable_const+set}" = set; then - enableval="$enable_const" - with_ext_const=$enableval -else - with_ext_const=no -fi; -echo "$as_me:10993: result: $with_ext_const" >&5 -echo "${ECHO_T}$with_ext_const" >&6 -NCURSES_CONST='/*nothing*/' -if test "x$with_ext_const" = xyes ; then - NCURSES_CONST=const -fi - -### use option --enable-ext-colors to turn on use of colors beyond 16. -echo "$as_me:11001: 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. -if test "${enable_ext_colors+set}" = set; then - enableval="$enable_ext_colors" - with_ext_colors=$enableval -else - with_ext_colors=no -fi; -echo "$as_me:11011: 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:11016: error: This option applies only to wide-character library" >&5 -echo "$as_me: error: This option applies only to wide-character library" >&2;} - { (exit 1); exit 1; }; } - else - # 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.*) - cf_cv_rel_version=6.0 - cf_cv_abi_version=6 - { echo "$as_me:11027: 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 - -cat >>confdefs.h <<\EOF -#define NCURSES_EXT_COLORS 1 -EOF - -fi - -### use option --enable-ext-mouse to modify coding to support 5-button mice -echo "$as_me:11043: 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. -if test "${enable_ext_mouse+set}" = set; then - enableval="$enable_ext_mouse" - with_ext_mouse=$enableval -else - with_ext_mouse=no -fi; -echo "$as_me:11053: result: $with_ext_mouse" >&5 -echo "${ECHO_T}$with_ext_mouse" >&6 -NCURSES_MOUSE_VERSION=1 -if test "x$with_ext_mouse" = xyes ; then - NCURSES_MOUSE_VERSION=2 - -if test "${with_abi_version+set}" != set; then - case $cf_cv_rel_version in - 5.*) - cf_cv_rel_version=6.0 - cf_cv_abi_version=6 - { echo "$as_me:11064: 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:11072: 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. -if test "${enable_no_padding+set}" = set; then - enableval="$enable_no_padding" - with_no_padding=$enableval -else - with_no_padding=$with_ext_funcs -fi; -echo "$as_me:11082: 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:11089: 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 11095 "configure" -#include "confdefs.h" -#include -#include -#include -#include - -_ACEOF -if { (eval echo "$as_me:11103: \"$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:11109: \$? = $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 - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_stdc=no -fi -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 11131 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -rf conftest* - -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 11149 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -rf conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -#line 11170 "configure" -#include "confdefs.h" -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - $ac_main_return(2); - $ac_main_return (0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:11196: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:11199: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11201: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11204: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_header_stdc=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -fi -echo "$as_me:11217: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - -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:11233: 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 11239 "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11245: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:11248: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11251: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11254: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:11264: 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 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 11280 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -if ((signed char *) 0) - return 0; -if (sizeof (signed char)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11295: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:11298: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11301: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11304: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_signed_char=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_signed_char=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:11314: result: $ac_cv_type_signed_char" >&5 -echo "${ECHO_T}$ac_cv_type_signed_char" >&6 - -echo "$as_me:11317: 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 -else - if test "$ac_cv_type_signed_char" = yes; then - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -#line 11326 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11338: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:11341: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11344: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11347: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 11352 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11364: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:11367: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11370: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11373: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 11389 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11401: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:11404: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11407: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11410: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` -fi -rm -f conftest.$ac_objext conftest.$ac_ext - done -fi -rm -f conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -#line 11426 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11438: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:11441: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11444: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11447: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -ac_cv_sizeof_signed_char=$ac_lo -else - if test "$cross_compiling" = yes; then - { { echo "$as_me:11460: 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 11465 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -FILE *f = fopen ("conftest.val", "w"); -if (!f) - $ac_main_return (1); -fprintf (f, "%d", (sizeof (signed char))); -fclose (f); - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:11481: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:11484: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11486: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11489: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_signed_char=`cat conftest.val` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -rm -f conftest.val -else - ac_cv_sizeof_signed_char=0 -fi -fi -echo "$as_me:11505: result: $ac_cv_sizeof_signed_char" >&5 -echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 -cat >>confdefs.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. -if test "${enable_signed_char+set}" = set; then - enableval="$enable_signed_char" - with_signed_char=$enableval +echo "$as_me:12706: 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_signed_char=no + with_sp_funcs=$cf_dft_ext_spfuncs fi; -echo "$as_me:11526: result: $with_signed_char" >&5 -echo "${ECHO_T}$with_signed_char" >&6 -test "x$with_signed_char" != xyes && NCURSES_SBOOL="char" +echo "$as_me:12716: result: $with_sp_funcs" >&5 +echo "${ECHO_T}$with_sp_funcs" >&6 +if test "x$with_sp_funcs" = xyes ; then + NCURSES_SP_FUNCS=1 -### use option --enable-sigwinch to turn on use of SIGWINCH logic -echo "$as_me:11531: checking if you want SIGWINCH handler" >&5 -echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 +cat >>confdefs.h <<\EOF +#define NCURSES_SP_FUNCS 1 +EOF -# Check whether --enable-sigwinch or --disable-sigwinch was given. -if test "${enable_sigwinch+set}" = set; then - enableval="$enable_sigwinch" - with_sigwinch=$enableval -else - with_sigwinch=$with_ext_funcs -fi; -echo "$as_me:11541: result: $with_sigwinch" >&5 -echo "${ECHO_T}$with_sigwinch" >&6 -test "x$with_sigwinch" = xyes && cat >>confdefs.h <<\EOF -#define USE_SIGWINCH 1 +#define HAVE_TPUTS_SP 1 EOF -### use option --enable-tcap-names to allow user to define new capabilities -echo "$as_me:11549: 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 + GENERATED_SP_FUNCS=generated +else + NCURSES_SP_FUNCS=0 + GENERATED_SP_FUNCS= +fi -# Check whether --enable-tcap-names or --disable-tcap-names was given. -if test "${enable_tcap_names+set}" = set; then - enableval="$enable_tcap_names" - with_tcap_names=$enableval +echo "$as_me:12735: 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 + enableval="$enable_term_driver" + with_term_driver=$enableval else - with_tcap_names=$with_ext_funcs + with_term_driver=no fi; -echo "$as_me:11559: result: $with_tcap_names" >&5 -echo "${ECHO_T}$with_tcap_names" >&6 -NCURSES_XNAMES=0 -test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1 +echo "$as_me:12745: result: $with_term_driver" >&5 +echo "${ECHO_T}$with_term_driver" >&6 +if test "x$with_term_driver" = xyes ; then -############################################################################### -# These options are relatively safe to experiment with. +cat >>confdefs.h <<\EOF +#define USE_TERM_DRIVER 1 +EOF -echo "$as_me:11567: checking if you want all development code" >&5 -echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 + if test "x$with_termlib" != xno ; then + { { echo "$as_me:12754: 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:12759: 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 -# Check whether --with-develop or --without-develop was given. -if test "${with_develop+set}" = set; then - withval="$with_develop" - with_develop=$withval +### use option --enable-const to turn on use of const beyond that in XSI. +echo "$as_me:12766: 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. +if test "${enable_const+set}" = set; then + enableval="$enable_const" + with_ext_const=$enableval else - with_develop=no + with_ext_const=$cf_dft_ext_const fi; -echo "$as_me:11577: 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:11581: checking if you want hard-tabs code" >&5 -echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 +echo "$as_me:12776: result: $with_ext_const" >&5 +echo "${ECHO_T}$with_ext_const" >&6 +NCURSES_CONST='/*nothing*/' +if test "x$with_ext_const" = xyes ; then + NCURSES_CONST=const +fi -# Check whether --enable-hard-tabs or --disable-hard-tabs was given. -if test "${enable_hard_tabs+set}" = set; then - enableval="$enable_hard_tabs" +### use option --enable-ext-colors to turn on use of colors beyond 16. +echo "$as_me:12784: 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. +if test "${enable_ext_colors+set}" = set; then + enableval="$enable_ext_colors" + with_ext_colors=$enableval else - enable_hard_tabs=$with_develop + with_ext_colors=$cf_dft_ext_colors fi; -echo "$as_me:11591: result: $enable_hard_tabs" >&5 -echo "${ECHO_T}$enable_hard_tabs" >&6 -test "x$enable_hard_tabs" = xyes && +echo "$as_me:12794: 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:12799: 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.*) + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 + { echo "$as_me:12809: 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 + + NCURSES_EXT_COLORS=1 + cat >>confdefs.h <<\EOF -#define USE_HARD_TABS 1 +#define NCURSES_EXT_COLORS 1 EOF -### use option --enable-xmc-glitch to turn on use of magic-cookie optimize -echo "$as_me:11599: checking if you want limited support for xmc" >&5 -echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 +cat >>confdefs.h <<\EOF +#define HAVE_ALLOC_PAIR 1 +EOF -# Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. -if test "${enable_xmc_glitch+set}" = set; then - enableval="$enable_xmc_glitch" +cat >>confdefs.h <<\EOF +#define HAVE_INIT_EXTENDED_COLOR 1 +EOF -else - enable_xmc_glitch=$with_develop -fi; -echo "$as_me:11609: 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 +#define HAVE_RESET_COLOR_PAIRS 1 EOF -############################################################################### -# These are just experimental, probably should not be in a package: + fi +fi -echo "$as_me:11619: 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 +### use option --enable-ext-mouse to modify coding to support 5-button mice +echo "$as_me:12837: 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-assumed-color or --disable-assumed-color was given. -if test "${enable_assumed_color+set}" = set; then - enableval="$enable_assumed_color" - with_assumed_color=$enableval +# Check whether --enable-ext-mouse or --disable-ext-mouse was given. +if test "${enable_ext_mouse+set}" = set; then + enableval="$enable_ext_mouse" + with_ext_mouse=$enableval else - with_assumed_color=yes + with_ext_mouse=$cf_dft_ext_mouse fi; -echo "$as_me:11629: result: $with_assumed_color" >&5 -echo "${ECHO_T}$with_assumed_color" >&6 -test "x$with_assumed_color" = xyes && +echo "$as_me:12847: result: $with_ext_mouse" >&5 +echo "${ECHO_T}$with_ext_mouse" >&6 +NCURSES_MOUSE_VERSION=1 +if test "x$with_ext_mouse" = xyes ; then + NCURSES_MOUSE_VERSION=2 + +if test "${with_abi_version+set}" != set; then + case $cf_cv_rel_version in + (5.*) + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 + { echo "$as_me:12858: 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 + +### use option --enable-ext-putwin to turn on extended screendumps +echo "$as_me:12867: 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:12877: 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 USE_ASSUMED_COLOR 1 +#define NCURSES_EXT_PUTWIN 1 EOF -### use option --enable-hashmap to turn on use of hashmap scrolling logic -echo "$as_me:11637: checking if you want hashmap scrolling-optimization code" >&5 -echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 +fi -# Check whether --enable-hashmap or --disable-hashmap was given. -if test "${enable_hashmap+set}" = set; then - enableval="$enable_hashmap" - with_hashmap=$enableval +echo "$as_me:12887: 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. +if test "${enable_no_padding+set}" = set; then + enableval="$enable_no_padding" + with_no_padding=$enableval else - with_hashmap=yes + with_no_padding=$with_ext_funcs fi; -echo "$as_me:11647: result: $with_hashmap" >&5 -echo "${ECHO_T}$with_hashmap" >&6 -test "x$with_hashmap" = xyes && +echo "$as_me:12897: result: $with_no_padding" >&5 +echo "${ECHO_T}$with_no_padding" >&6 +test "x$with_no_padding" = xyes && cat >>confdefs.h <<\EOF -#define USE_HASHMAP 1 +#define NCURSES_NO_PADDING 1 EOF -### use option --enable-colorfgbg to turn on use of $COLORFGBG environment -echo "$as_me:11655: checking if you want colorfgbg code" >&5 -echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 +### use option --enable-sigwinch to turn on use of SIGWINCH logic +echo "$as_me:12905: checking if you want SIGWINCH handler" >&5 +echo $ECHO_N "checking if you want SIGWINCH handler... $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 +# Check whether --enable-sigwinch or --disable-sigwinch was given. +if test "${enable_sigwinch+set}" = set; then + enableval="$enable_sigwinch" + with_sigwinch=$enableval else - with_colorfgbg=no + with_sigwinch=$with_ext_funcs fi; -echo "$as_me:11665: result: $with_colorfgbg" >&5 -echo "${ECHO_T}$with_colorfgbg" >&6 -test "x$with_colorfgbg" = xyes && +echo "$as_me:12915: result: $with_sigwinch" >&5 +echo "${ECHO_T}$with_sigwinch" >&6 +test "x$with_sigwinch" = xyes && cat >>confdefs.h <<\EOF -#define USE_COLORFGBG 1 +#define USE_SIGWINCH 1 EOF -### use option --enable-interop to turn on use of bindings used for interop -echo "$as_me:11673: checking if you want interop bindings" >&5 -echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6 +### use option --enable-tcap-names to allow user to define new capabilities +echo "$as_me:12923: 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-interop or --disable-interop was given. -if test "${enable_interop+set}" = set; then - enableval="$enable_interop" - with_exp_interop=$enableval +# Check whether --enable-tcap-names or --disable-tcap-names was given. +if test "${enable_tcap_names+set}" = set; then + enableval="$enable_tcap_names" + with_tcap_names=$enableval else - with_exp_interop=no + with_tcap_names=$with_ext_funcs fi; -echo "$as_me:11683: 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:12933: result: $with_tcap_names" >&5 +echo "${ECHO_T}$with_tcap_names" >&6 +NCURSES_XNAMES=0 +test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1 -# This is still experimental (20080329), but should ultimately be moved to -# the script-block --with-normal, etc. +############################################################################## -echo "$as_me:11692: checking if you want to link with the pthread library" >&5 +echo "$as_me:12940: 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. @@ -11699,27 +12947,27 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:11702: result: $with_pthread" >&5 +echo "$as_me:12950: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:11706: checking for pthread.h" >&5 + echo "$as_me:12954: 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 11712 "configure" +#line 12960 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:11716: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12964: \"$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:11722: \$? = $ac_status" >&5 + echo "$as_me:12970: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11738,7 +12986,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:11741: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:12989: 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 @@ -11748,18 +12996,34 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:11751: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:12999: checking if we can link with the $cf_lib_pthread library" >&5 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 cf_save_LIBS="$LIBS" - LIBS="-l$cf_lib_pthread $LIBS" + +cf_add_libs="-l$cf_lib_pthread" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + cat >conftest.$ac_ext <<_ACEOF -#line 11756 "configure" +#line 13020 "configure" #include "confdefs.h" #include int -main () +main (void) { int rc = pthread_create(0,0,0,0); @@ -11770,16 +13034,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11773: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13037: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11776: \$? = $ac_status" >&5 + echo "$as_me:13040: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11779: \"$ac_try\"") >&5 + { (eval echo "$as_me:13043: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11782: \$? = $ac_status" >&5 + echo "$as_me:13046: \$? = $ac_status" >&5 (exit $ac_status); }; }; then with_pthread=yes else @@ -11789,20 +13053,35 @@ with_pthread=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:11792: result: $with_pthread" >&5 + echo "$as_me:13056: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done - - if test "$with_pthread" = yes ; then - LIBS="-l$cf_lib_pthread $LIBS" + + if test "$with_pthread" = yes ; then + +cf_add_libs="-l$cf_lib_pthread" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" cat >>confdefs.h <<\EOF #define HAVE_LIBPTHREADS 1 EOF else - { { echo "$as_me:11805: error: Cannot link with pthread library" >&5 + { { echo "$as_me:13084: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -11812,13 +13091,13 @@ fi fi if test "x$with_pthread" != xno; then - echo "$as_me:11815: checking for pthread_kill" >&5 + echo "$as_me:13094: 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 11821 "configure" +#line 13100 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pthread_kill (); below. */ @@ -11833,7 +13112,7 @@ char pthread_kill (); char (*f) (); 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 @@ -11849,16 +13128,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:11852: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13131: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11855: \$? = $ac_status" >&5 + echo "$as_me:13134: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11858: \"$ac_try\"") >&5 + { (eval echo "$as_me:13137: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11861: \$? = $ac_status" >&5 + echo "$as_me:13140: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_pthread_kill=yes else @@ -11868,11 +13147,11 @@ ac_cv_func_pthread_kill=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11871: result: $ac_cv_func_pthread_kill" >&5 +echo "$as_me:13150: 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:11875: checking if you want to allow EINTR in wgetch with pthreads" >&5 + echo "$as_me:13154: 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. @@ -11882,7 +13161,7 @@ if test "${enable_pthreads_eintr+set}" = set; then else use_pthreads_eintr=no fi; - echo "$as_me:11885: result: $use_pthreads_eintr" >&5 + echo "$as_me:13164: result: $use_pthreads_eintr" >&5 echo "${ECHO_T}$use_pthreads_eintr" >&6 if test "x$use_pthreads_eintr" = xyes ; then @@ -11893,7 +13172,7 @@ EOF fi fi - echo "$as_me:11896: checking if you want to use weak-symbols for pthreads" >&5 + echo "$as_me:13175: checking if you want to use weak-symbols for pthreads" >&5 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. @@ -11903,23 +13182,23 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; - echo "$as_me:11906: result: $use_weak_symbols" >&5 + echo "$as_me:13185: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "x$use_weak_symbols" = xyes ; then -echo "$as_me:11910: checking if $CC supports weak symbols" >&5 +echo "$as_me:13189: checking if $CC supports weak symbols" >&5 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 if test "${cf_cv_weak_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11917 "configure" +#line 13196 "configure" #include "confdefs.h" #include int -main () +main (void) { #if defined(__GNUC__) @@ -11940,16 +13219,16 @@ weak_symbol(fopen); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11943: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13222: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11946: \$? = $ac_status" >&5 + echo "$as_me:13225: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11949: \"$ac_try\"") >&5 + { (eval echo "$as_me:13228: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11952: \$? = $ac_status" >&5 + echo "$as_me:13231: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_weak_symbols=yes else @@ -11960,7 +13239,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11963: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:13242: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -11983,18 +13262,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:11996: checking if you want experimental reentrant code" >&5 -echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 +echo "$as_me:13275: 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 @@ -12003,22 +13282,67 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=no fi; -echo "$as_me:12006: result: $with_reentrant" >&5 +echo "$as_me:13285: 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 # remove pthread library from $LIBS LIBS=`echo "$LIBS" | sed -e 's/-lpthread[ ]//g' -e 's/-lpthread$//'` - TEST_LIBS="-lpthread $TEST_LIBS" - TEST_LIBS2="-lpthread $TEST_LIBS2" +cf_add_libs="-lpthread" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $TEST_LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +TEST_LIBS="$cf_add_libs" + +cf_add_libs="-lpthread" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $TEST_LIBS2 +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +TEST_LIBS2="$cf_add_libs" + else - LIB_SUFFIX="t${LIB_SUFFIX}" + # when not using weak symbols but with_reentrant, + # add 't' to the library suffix on all platforms + # except cygwin, where we only do that if ALSO + # compiling with full thread support. + case "$host" in + (*cygwin* | *msys*) + if test "$with_pthread" = "yes" ; then + if test "x$disable_lib_suffixes" = "xno" ; then + LIB_SUFFIX="t${LIB_SUFFIX}" + fi + fi ;; + (*) + if test "x$disable_lib_suffixes" = "xno" ; then + LIB_SUFFIX="t${LIB_SUFFIX}" + fi + ;; + esac fi cat >>confdefs.h <<\EOF @@ -12027,11 +13351,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:12033: 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:13357: 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 @@ -12039,13 +13363,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:13369: 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:13391: 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:13396: error: reentrant configuration requires opaque library" >&5 +echo "$as_me: error: reentrant configuration requires opaque library" >&2;} + { (exit 1); exit 1; }; } + +echo "$as_me:13400: 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:13410: result: $enable_opaque_form" >&5 +echo "${ECHO_T}$enable_opaque_form" >&6 + +echo "$as_me:13413: 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:13423: result: $enable_opaque_menu" >&5 +echo "${ECHO_T}$enable_opaque_menu" >&6 + +echo "$as_me:13426: 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:13436: 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:12048: checking for prefix used to wrap public variables" >&5 + echo "$as_me:13446: 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. @@ -12055,7 +13453,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:12058: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:13456: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -12065,7 +13463,132 @@ cat >>confdefs.h <&5 +############################################################################### +# These options are relatively safe to experiment with. + +echo "$as_me:13469: 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:13479: 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:13483: 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:13493: 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:13501: 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:13511: 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:13521: 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:13531: 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:13539: 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:13549: 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:13557: 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:13567: 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:13575: 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:13585: 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:13591: 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. @@ -12075,17 +13598,13 @@ if test "${enable_safe_sprintf+set}" = set; then else with_safe_sprintf=no fi; -echo "$as_me:12078: result: $with_safe_sprintf" >&5 +echo "$as_me:13601: result: $with_safe_sprintf" >&5 echo "${ECHO_T}$with_safe_sprintf" >&6 -test "x$with_safe_sprintf" = xyes && -cat >>confdefs.h <<\EOF -#define USE_SAFE_SPRINTF 1 -EOF ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic # when hashmap is used scroll hints are useless if test "$with_hashmap" = no ; then -echo "$as_me:12088: checking if you want to experiment without scrolling-hints code" >&5 +echo "$as_me:13607: 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. @@ -12095,7 +13614,7 @@ if test "${enable_scroll_hints+set}" = set; then else with_scroll_hints=yes fi; -echo "$as_me:12098: result: $with_scroll_hints" >&5 +echo "$as_me:13617: result: $with_scroll_hints" >&5 echo "${ECHO_T}$with_scroll_hints" >&6 test "x$with_scroll_hints" = xyes && cat >>confdefs.h <<\EOF @@ -12104,8 +13623,8 @@ EOF fi -echo "$as_me:12107: 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:13626: 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 @@ -12114,7 +13633,7 @@ if test "${enable_wgetch_events+set}" = set; then else with_wgetch_events=no fi; -echo "$as_me:12117: result: $with_wgetch_events" >&5 +echo "$as_me:13636: result: $with_wgetch_events" >&5 echo "${ECHO_T}$with_wgetch_events" >&6 test "x$with_wgetch_events" = xyes && cat >>confdefs.h <<\EOF @@ -12125,41 +13644,41 @@ EOF ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:12128: checking if you want to see long compiling messages" >&5 +echo "$as_me:13647: 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:12162: result: $enableval" >&5 +echo "$as_me:13681: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "x$enable_echo" = xyes; then @@ -12170,8 +13689,57 @@ else test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent" fi +# --disable-stripping is used for debugging + +echo "$as_me:13694: checking if you want to install stripped executables" >&5 +echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6 + +# Check whether --enable-stripping or --disable-stripping was given. +if test "${enable_stripping+set}" = set; then + enableval="$enable_stripping" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + with_stripping=no + else + with_stripping=yes + fi +else + enableval=yes + with_stripping=yes + +fi; +echo "$as_me:13711: result: $with_stripping" >&5 +echo "${ECHO_T}$with_stripping" >&6 + +if test "$with_stripping" = yes +then + INSTALL_OPT_S="-s" +else + INSTALL_OPT_S= +fi + +echo "$as_me:13721: checking if install needs to be told about ownership" >&5 +echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6 +case `$ac_config_guess` in +(*minix) + with_install_o=yes + ;; +(*) + with_install_o=no + ;; +esac + +echo "$as_me:13732: result: $with_install_o" >&5 +echo "${ECHO_T}$with_install_o" >&6 +if test "x$with_install_o" = xyes +then + INSTALL_OPT_O=`id root|sed -e 's/uid=[0-9]*(/ -o /' -e 's/gid=[0-9]*(/ -g /' -e 's/ [^=[:space:]][^=[:space:]]*=.*/ /' -e 's/)//g'` +else + INSTALL_OPT_O= +fi + ### use option --enable-warnings to turn on all gcc warnings -echo "$as_me:12174: checking if you want to see compiler warnings" >&5 +echo "$as_me:13742: 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. @@ -12179,7 +13747,7 @@ if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" with_warnings=$enableval fi; -echo "$as_me:12182: result: $with_warnings" >&5 +echo "$as_me:13750: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "x$with_warnings" = "xyes"; then @@ -12190,17 +13758,17 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in - linux*|gnu*) - echo "$as_me:12194: checking if this is really Intel C compiler" >&5 + (linux*|gnu*) + echo "$as_me:13762: 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 12199 "configure" +#line 13767 "configure" #include "confdefs.h" int -main () +main (void) { #ifdef __INTEL_COMPILER @@ -12213,19 +13781,19 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12216: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13784: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12219: \$? = $ac_status" >&5 + echo "$as_me:13787: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12222: \"$ac_try\"") >&5 + { (eval echo "$as_me:13790: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12225: \$? = $ac_status" >&5 + echo "$as_me:13793: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +cf_save_CFLAGS="$cf_save_CFLAGS -we147" else echo "$as_me: failed program was:" >&5 @@ -12233,7 +13801,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:12236: result: $INTEL_COMPILER" >&5 + echo "$as_me:13804: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -12242,16 +13810,16 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:12245: checking if this is really Clang C compiler" >&5 + echo "$as_me:13813: 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 12250 "configure" +#line 13818 "configure" #include "confdefs.h" int -main () +main (void) { #ifdef __clang__ @@ -12264,16 +13832,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12267: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13835: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12270: \$? = $ac_status" >&5 + echo "$as_me:13838: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12273: \"$ac_try\"") >&5 + { (eval echo "$as_me:13841: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12276: \$? = $ac_status" >&5 + echo "$as_me:13844: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CLANG_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -12284,12 +13852,12 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:12287: result: $CLANG_COMPILER" >&5 + echo "$as_me:13855: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi cat > conftest.$ac_ext <&5 + { echo "$as_me:13877: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -12322,12 +13890,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:12325: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13893: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12328: \$? = $ac_status" >&5 + echo "$as_me:13896: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:12330: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13898: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -12336,16 +13904,20 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:12339: checking for $CC warning options..." >&5 + { echo "$as_me:13907: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= cf_warn_CONST="" test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" + cf_gcc_warnings="Wignored-qualifiers Wlogical-op Wvarargs" + test "x$CLANG_COMPILER" = xyes && cf_gcc_warnings= for cf_opt in W Wall \ Wbad-function-cast \ Wcast-align \ Wcast-qual \ + Wdeclaration-after-statement \ + Wextra \ Winline \ Wmissing-declarations \ Wmissing-prototypes \ @@ -12353,36 +13925,36 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wpointer-arith \ Wshadow \ Wstrict-prototypes \ - Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum + Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:12359: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13931: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12362: \$? = $ac_status" >&5 + echo "$as_me:13934: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:12364: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:13936: 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}:12375: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:13947: 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}:12385: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:13957: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -12401,17 +13973,17 @@ INTEL_CPLUSPLUS=no if test "$GCC" = yes ; then case $host_os in - linux*|gnu*) - echo "$as_me:12405: checking if this is really Intel C++ compiler" >&5 + (linux*|gnu*) + echo "$as_me:13977: 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 12410 "configure" +#line 13982 "configure" #include "confdefs.h" int -main () +main (void) { #ifdef __INTEL_COMPILER @@ -12424,19 +13996,19 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12427: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13999: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12430: \$? = $ac_status" >&5 + echo "$as_me:14002: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12433: \"$ac_try\"") >&5 + { (eval echo "$as_me:14005: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12436: \$? = $ac_status" >&5 + echo "$as_me:14008: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_CPLUSPLUS=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +cf_save_CFLAGS="$cf_save_CFLAGS -we147" else echo "$as_me: failed program was:" >&5 @@ -12444,7 +14016,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:12447: result: $INTEL_CPLUSPLUS" >&5 + echo "$as_me:14019: result: $INTEL_CPLUSPLUS" >&5 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 ;; esac @@ -12453,16 +14025,16 @@ fi CLANG_CPLUSPLUS=no if test "$GCC" = yes ; then - echo "$as_me:12456: checking if this is really Clang C++ compiler" >&5 + echo "$as_me:14028: 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 12461 "configure" +#line 14033 "configure" #include "confdefs.h" int -main () +main (void) { #ifdef __clang__ @@ -12475,16 +14047,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12478: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14050: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12481: \$? = $ac_status" >&5 + echo "$as_me:14053: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12484: \"$ac_try\"") >&5 + { (eval echo "$as_me:14056: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12487: \$? = $ac_status" >&5 + echo "$as_me:14059: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CLANG_CPLUSPLUS=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -12495,7 +14067,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:12498: result: $CLANG_CPLUSPLUS" >&5 + echo "$as_me:14070: result: $CLANG_CPLUSPLUS" >&5 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 fi @@ -12507,7 +14079,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat > conftest.$ac_ext <&5 + { echo "$as_me:14100: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-Wall" @@ -12542,12 +14114,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:12545: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:14117: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12548: \$? = $ac_status" >&5 + echo "$as_me:14120: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:12550: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:14122: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" fi @@ -12556,45 +14128,46 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GXX" = yes then - { echo "$as_me:12559: checking for $CXX warning options..." >&5 + { echo "$as_me:14131: 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 for cf_opt in \ Wabi \ fabi-version=0 \ + Wextra \ + Wignored-qualifiers \ + Wlogical-op \ Woverloaded-virtual \ Wsign-promo \ Wsynth \ Wold-style-cast \ Wcast-align \ Wcast-qual \ - Wmissing-prototypes \ Wpointer-arith \ Wshadow \ - Wstrict-prototypes \ Wundef $cf_gxx_extra_warnings Wno-unused do CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" - if { (eval echo "$as_me:12588: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:14161: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12591: \$? = $ac_status" >&5 + echo "$as_me:14164: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:12593: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:14166: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" else - test -n "$verbose" && echo "$as_me:12597: result: ... no -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:14170: result: ... no -$cf_opt" >&5 echo "${ECHO_T}... no -$cf_opt" >&6 fi done @@ -12630,10 +14203,10 @@ cat > conftest.i <&5 + { echo "$as_me:14206: 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:14258: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12688: \$? = $ac_status" >&5 + echo "$as_me:14261: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:12690: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:14263: 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 <<\EOF #define GCC_SCANF 1 EOF - fi + fi + +cat >>confdefs.h <>confdefs.h <>confdefs.h +fi +rm -rf conftest* +fi + +echo "$as_me:14322: checking if you want to work around bogus compiler/loader warnings" >&5 +echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 + +# Check whether --enable-string-hacks or --disable-string-hacks was given. +if test "${enable_string_hacks+set}" = set; then + enableval="$enable_string_hacks" + with_string_hacks=$enableval +else + with_string_hacks=no +fi; +echo "$as_me:14332: 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:14341: 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:14343: 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 14349 "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 (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_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:14380: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14383: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14386: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14389: \$? = $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:14399: 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 <>confdefs.h <<\EOF +#define HAVE_STRLCAT 1 EOF - ;; - unused) #(vi +else -cat >>confdefs.h <&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 14417 "configure" +#include "confdefs.h" - ;; - esac - fi - done +/* 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 (void) +{ +strlcat (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:14436: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14439: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14442: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14445: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_strlcat=yes else - fgrep define conftest.i >>confdefs.h + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_bsd_strlcat=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +echo "$as_me:14456: 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 -echo "$as_me:12749: 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 +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" -# Check whether --enable-string-hacks or --disable-string-hacks was given. -if test "${enable_string_hacks+set}" = set; then - enableval="$enable_string_hacks" - with_string_hacks=$enableval +for ac_header in bsd/string.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:14479: 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 - with_string_hacks=no -fi; -echo "$as_me:12759: result: $with_string_hacks" >&5 -echo "${ECHO_T}$with_string_hacks" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 14485 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:14489: \"$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:14495: \$? = $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:14514: 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:12768: 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:12774: checking for $ac_func" >&5 +echo "$as_me:14535: 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 12780 "configure" +#line 14541 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -12792,7 +14553,7 @@ char $ac_func (); char (*f) (); 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 @@ -12808,16 +14569,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:12811: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14572: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12814: \$? = $ac_status" >&5 + echo "$as_me:14575: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12817: \"$ac_try\"") >&5 + { (eval echo "$as_me:14578: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12820: \$? = $ac_status" >&5 + echo "$as_me:14581: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -12827,7 +14588,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12830: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:14591: 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:14604: 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. @@ -12850,7 +14611,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:12853: result: $with_assertions" >&5 +echo "$as_me:14614: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -12866,7 +14627,7 @@ fi ### use option --disable-leaks to suppress "permanent" leaks, for testing -echo "$as_me:12869: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:14630: 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. @@ -12883,15 +14644,15 @@ EOF else with_dmalloc= fi; -echo "$as_me:12886: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:14647: 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= @@ -12901,32 +14662,38 @@ 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 "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - 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" | \ @@ -12935,21 +14702,29 @@ 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/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -12958,17 +14733,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 ;; @@ -12977,23 +14758,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:12980: checking for dmalloc.h" >&5 + echo "$as_me:14761: 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 12986 "configure" +#line 14767 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:12990: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14771: \"$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:12996: \$? = $ac_status" >&5 + echo "$as_me:14777: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13012,11 +14793,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13015: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:14796: 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:13019: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:14800: 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 @@ -13024,7 +14805,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13027 "configure" +#line 14808 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13035,7 +14816,7 @@ extern "C" builtin and then its argument prototype would still apply. */ char dmalloc_debug (); int -main () +main (void) { dmalloc_debug (); ; @@ -13043,16 +14824,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13046: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14827: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13049: \$? = $ac_status" >&5 + echo "$as_me:14830: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13052: \"$ac_try\"") >&5 + { (eval echo "$as_me:14833: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13055: \$? = $ac_status" >&5 + echo "$as_me:14836: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -13063,7 +14844,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13066: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:14847: 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:14862: 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. @@ -13095,15 +14876,15 @@ EOF else with_dbmalloc= fi; -echo "$as_me:13098: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:14879: 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= @@ -13113,32 +14894,38 @@ 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 "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - 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" | \ @@ -13147,21 +14934,29 @@ 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/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -13170,17 +14965,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 ;; @@ -13189,23 +14990,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:13192: checking for dbmalloc.h" >&5 + echo "$as_me:14993: 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 13198 "configure" +#line 14999 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:13202: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15003: \"$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:13208: \$? = $ac_status" >&5 + echo "$as_me:15009: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13224,11 +15025,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13227: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:15028: 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:13231: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:15032: 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 @@ -13236,7 +15037,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13239 "configure" +#line 15040 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13247,7 +15048,7 @@ extern "C" builtin and then its argument prototype would still apply. */ char debug_malloc (); int -main () +main (void) { debug_malloc (); ; @@ -13255,16 +15056,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13258: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15059: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13261: \$? = $ac_status" >&5 + echo "$as_me:15062: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13264: \"$ac_try\"") >&5 + { (eval echo "$as_me:15065: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13267: \$? = $ac_status" >&5 + echo "$as_me:15068: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -13275,7 +15076,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13278: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:15079: 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:15094: 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. @@ -13307,15 +15108,15 @@ EOF else with_valgrind= fi; -echo "$as_me:13310: result: ${with_valgrind:-no}" >&5 +echo "$as_me:15111: 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= @@ -13325,32 +15126,38 @@ 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 "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - 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" | \ @@ -13359,21 +15166,29 @@ 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/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -13382,17 +15197,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 ;; @@ -13400,7 +15221,7 @@ fi ;; esac -echo "$as_me:13403: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:15224: 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. @@ -13410,7 +15231,7 @@ if test "${enable_leaks+set}" = set; then else : ${with_no_leaks:=no} fi; -echo "$as_me:13413: result: $with_no_leaks" >&5 +echo "$as_me:15234: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then @@ -13457,12 +15278,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:13465: checking whether to add trace feature to all models" >&5 +echo "$as_me:15286: 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. @@ -13472,7 +15293,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:13475: result: $cf_with_trace" >&5 +echo "$as_me:15296: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "x$cf_with_trace" = xyes ; then @@ -13487,32 +15308,38 @@ 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 "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - 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" | \ @@ -13521,21 +15348,29 @@ 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/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -13544,36 +15379,68 @@ 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 +cat >>confdefs.h <<\EOF +#define HAVE__TRACEF 1 +EOF + else LIB_TRACING=DEBUG ADA_TRACE=FALSE fi +echo "$as_me:15410: checking if we want to use GNAT projects" >&5 +echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 + +# Check whether --enable-gnat-projects or --disable-gnat-projects was given. +if test "${enable_gnat_projects+set}" = set; then + enableval="$enable_gnat_projects" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + enable_gnat_projects=no + else + enable_gnat_projects=yes + fi +else + enableval=yes + enable_gnat_projects=yes + +fi; +echo "$as_me:15427: result: $enable_gnat_projects" >&5 +echo "${ECHO_T}$enable_gnat_projects" >&6 + ### Checks for libraries. -case $cf_cv_system_name in #(vi -*mingw32*) #(vi +case $cf_cv_system_name in +(*mingw32*|*mingw64*) + CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN" + LIBS=" -lpsapi $LIBS" ;; -*) -echo "$as_me:13570: checking for gettimeofday" >&5 +(*) +echo "$as_me:15437: 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 13576 "configure" +#line 15443 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gettimeofday (); below. */ @@ -13588,7 +15455,7 @@ char gettimeofday (); char (*f) (); 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 @@ -13604,16 +15471,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:13607: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15474: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13610: \$? = $ac_status" >&5 + echo "$as_me:15477: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13613: \"$ac_try\"") >&5 + { (eval echo "$as_me:15480: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13616: \$? = $ac_status" >&5 + echo "$as_me:15483: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gettimeofday=yes else @@ -13623,7 +15490,7 @@ ac_cv_func_gettimeofday=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13626: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:15493: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test $ac_cv_func_gettimeofday = yes; then @@ -13633,7 +15500,7 @@ EOF else -echo "$as_me:13636: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:15503: 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 @@ -13641,7 +15508,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13644 "configure" +#line 15511 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13652,7 +15519,7 @@ extern "C" builtin and then its argument prototype would still apply. */ char gettimeofday (); int -main () +main (void) { gettimeofday (); ; @@ -13660,16 +15527,16 @@ gettimeofday (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13663: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15530: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13666: \$? = $ac_status" >&5 + echo "$as_me:15533: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13669: \"$ac_try\"") >&5 + { (eval echo "$as_me:15536: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13672: \$? = $ac_status" >&5 + echo "$as_me:15539: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -13680,7 +15547,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13683: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:15550: 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 @@ -13688,28 +15555,44 @@ cat >>confdefs.h <<\EOF #define HAVE_GETTIMEOFDAY 1 EOF - LIBS="-lbsd $LIBS" +cf_add_libs="-lbsd" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + fi fi ;; esac -echo "$as_me:13698: checking if -lm needed for math functions" >&5 +echo "$as_me:15580: 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 13705 "configure" +#line 15587 "configure" #include "confdefs.h" #include + #include #include int -main () +main (void) { double x = rand(); printf("result = %g\n", pow(sin(x),x)) ; @@ -13717,16 +15600,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:13720: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15603: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13723: \$? = $ac_status" >&5 + echo "$as_me:15606: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13726: \"$ac_try\"") >&5 + { (eval echo "$as_me:15609: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13729: \$? = $ac_status" >&5 + echo "$as_me:15612: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_libm=no else @@ -13736,7 +15619,7 @@ cf_cv_need_libm=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13739: result: $cf_cv_need_libm" >&5 +echo "$as_me:15622: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes then @@ -13744,13 +15627,13 @@ MATH_LIB=-lm fi ### Checks for header files. -echo "$as_me:13747: checking for ANSI C header files" >&5 +echo "$as_me:15630: 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 13753 "configure" +#line 15636 "configure" #include "confdefs.h" #include #include @@ -13758,13 +15641,13 @@ else #include _ACEOF -if { (eval echo "$as_me:13761: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15644: \"$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:13767: \$? = $ac_status" >&5 + echo "$as_me:15650: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13786,7 +15669,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 13789 "configure" +#line 15672 "configure" #include "confdefs.h" #include @@ -13804,7 +15687,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 13807 "configure" +#line 15690 "configure" #include "confdefs.h" #include @@ -13825,7 +15708,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 13828 "configure" +#line 15711 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -13840,7 +15723,7 @@ else #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int -main () +main (void) { int i; for (i = 0; i < 256; i++) @@ -13851,15 +15734,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:13854: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15737: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13857: \$? = $ac_status" >&5 + echo "$as_me:15740: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13859: \"$ac_try\"") >&5 + { (eval echo "$as_me:15742: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13862: \$? = $ac_status" >&5 + echo "$as_me:15745: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -13872,7 +15755,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:13875: result: $ac_cv_header_stdc" >&5 +echo "$as_me:15758: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -13885,19 +15768,19 @@ 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:13888: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:15771: 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 13894 "configure" +#line 15777 "configure" #include "confdefs.h" #include #include <$ac_hdr> int -main () +main (void) { if ((DIR *) 0) return 0; @@ -13906,16 +15789,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13909: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15792: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13912: \$? = $ac_status" >&5 + echo "$as_me:15795: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13915: \"$ac_try\"") >&5 + { (eval echo "$as_me:15798: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13918: \$? = $ac_status" >&5 + echo "$as_me:15801: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -13925,7 +15808,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13928: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:15811: 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:15824: 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 @@ -13946,7 +15829,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13949 "configure" +#line 15832 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13957,7 +15840,7 @@ extern "C" builtin and then its argument prototype would still apply. */ char opendir (); int -main () +main (void) { opendir (); ; @@ -13965,16 +15848,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13968: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15851: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13971: \$? = $ac_status" >&5 + echo "$as_me:15854: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13974: \"$ac_try\"") >&5 + { (eval echo "$as_me:15857: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13977: \$? = $ac_status" >&5 + echo "$as_me:15860: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -13985,14 +15868,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13988: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:15871: 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:13995: checking for opendir in -lx" >&5 + echo "$as_me:15878: 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 @@ -14000,7 +15883,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14003 "configure" +#line 15886 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14011,7 +15894,7 @@ extern "C" builtin and then its argument prototype would still apply. */ char opendir (); int -main () +main (void) { opendir (); ; @@ -14019,16 +15902,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14022: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15905: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14025: \$? = $ac_status" >&5 + echo "$as_me:15908: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14028: \"$ac_try\"") >&5 + { (eval echo "$as_me:15911: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14031: \$? = $ac_status" >&5 + echo "$as_me:15914: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -14039,7 +15922,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14042: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:15925: 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" @@ -14047,20 +15930,20 @@ fi fi -echo "$as_me:14050: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:15933: 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 14056 "configure" +#line 15939 "configure" #include "confdefs.h" #include #include #include int -main () +main (void) { if ((struct tm *) 0) return 0; @@ -14069,16 +15952,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14072: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15955: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14075: \$? = $ac_status" >&5 + echo "$as_me:15958: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14078: \"$ac_try\"") >&5 + { (eval echo "$as_me:15961: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14081: \$? = $ac_status" >&5 + echo "$as_me:15964: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -14088,7 +15971,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14091: result: $ac_cv_header_time" >&5 +echo "$as_me:15974: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -14101,19 +15984,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:14110: checking for regcomp" >&5 +echo "$as_me:15993: 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 14116 "configure" +#line 15999 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char regcomp (); below. */ @@ -14128,7 +16011,7 @@ char regcomp (); char (*f) (); 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 @@ -14144,16 +16027,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:14147: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16030: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14150: \$? = $ac_status" >&5 + echo "$as_me:16033: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14153: \"$ac_try\"") >&5 + { (eval echo "$as_me:16036: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14156: \$? = $ac_status" >&5 + echo "$as_me:16039: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_regcomp=yes else @@ -14163,7 +16046,7 @@ ac_cv_func_regcomp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14166: result: $ac_cv_func_regcomp" >&5 +echo "$as_me:16049: 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 @@ -14172,7 +16055,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:14175: checking for regcomp in -l$cf_regex_lib" >&5 +echo "$as_me:16058: 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 @@ -14180,7 +16063,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_regex_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14183 "configure" +#line 16066 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14191,7 +16074,7 @@ extern "C" builtin and then its argument prototype would still apply. */ char regcomp (); int -main () +main (void) { regcomp (); ; @@ -14199,16 +16082,16 @@ regcomp (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14202: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16085: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14205: \$? = $ac_status" >&5 + echo "$as_me:16088: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14208: \"$ac_try\"") >&5 + { (eval echo "$as_me:16091: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14211: \$? = $ac_status" >&5 + echo "$as_me:16094: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -14219,11 +16102,26 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14222: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:16105: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then - LIBS="-l$cf_regex_lib $LIBS" +cf_add_libs="-l$cf_regex_lib" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + cf_regex_func=regcomp break fi @@ -14233,13 +16131,13 @@ fi fi if test "$cf_regex_func" = no ; then - echo "$as_me:14236: checking for compile" >&5 + echo "$as_me:16134: 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 14242 "configure" +#line 16140 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char compile (); below. */ @@ -14254,7 +16152,7 @@ char compile (); char (*f) (); 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 @@ -14270,16 +16168,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:14273: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16171: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14276: \$? = $ac_status" >&5 + echo "$as_me:16174: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14279: \"$ac_try\"") >&5 + { (eval echo "$as_me:16177: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14282: \$? = $ac_status" >&5 + echo "$as_me:16180: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_compile=yes else @@ -14289,13 +16187,13 @@ ac_cv_func_compile=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14292: result: $ac_cv_func_compile" >&5 +echo "$as_me:16190: 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:14298: checking for compile in -lgen" >&5 + echo "$as_me:16196: 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 @@ -14303,7 +16201,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14306 "configure" +#line 16204 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14314,7 +16212,7 @@ extern "C" builtin and then its argument prototype would still apply. */ char compile (); int -main () +main (void) { compile (); ; @@ -14322,16 +16220,16 @@ compile (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14325: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16223: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14328: \$? = $ac_status" >&5 + echo "$as_me:16226: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14331: \"$ac_try\"") >&5 + { (eval echo "$as_me:16229: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14334: \$? = $ac_status" >&5 + echo "$as_me:16232: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gen_compile=yes else @@ -14342,11 +16240,26 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14345: result: $ac_cv_lib_gen_compile" >&5 +echo "$as_me:16243: result: $ac_cv_lib_gen_compile" >&5 echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 if test $ac_cv_lib_gen_compile = yes; then - LIBS="-lgen $LIBS" +cf_add_libs="-lgen" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + cf_regex_func=compile fi @@ -14355,27 +16268,27 @@ fi fi if test "$cf_regex_func" = no ; then - { echo "$as_me:14358: WARNING: cannot find regular expression library" >&5 + { echo "$as_me:16271: WARNING: cannot find regular expression library" >&5 echo "$as_me: WARNING: cannot find regular expression library" >&2;} fi -echo "$as_me:14362: checking for regular-expression headers" >&5 +echo "$as_me:16275: 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 14374 "configure" +#line 16287 "configure" #include "confdefs.h" #include <$cf_regex_hdr> int -main () +main (void) { char *p = compile("", "", "", 0); @@ -14386,16 +16299,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14389: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16302: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14392: \$? = $ac_status" >&5 + echo "$as_me:16305: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14395: \"$ac_try\"") >&5 + { (eval echo "$as_me:16308: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14398: \$? = $ac_status" >&5 + echo "$as_me:16311: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -14408,16 +16321,16 @@ 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 14415 "configure" +#line 16328 "configure" #include "confdefs.h" #include #include <$cf_regex_hdr> int -main () +main (void) { regex_t *p; @@ -14430,16 +16343,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14433: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16346: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14436: \$? = $ac_status" >&5 + echo "$as_me:16349: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14439: \"$ac_try\"") >&5 + { (eval echo "$as_me:16352: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14442: \$? = $ac_status" >&5 + echo "$as_me:16355: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -14455,23 +16368,23 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext esac fi -echo "$as_me:14458: result: $cf_cv_regex_hdrs" >&5 +echo "$as_me:16371: 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:14462: 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:16375: 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 @@ -14498,23 +16411,23 @@ wctype.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:14501: checking for $ac_header" >&5 +echo "$as_me:16414: 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 14507 "configure" +#line 16420 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14511: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16424: \"$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:14517: \$? = $ac_status" >&5 + echo "$as_me:16430: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14533,7 +16446,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14536: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16449: 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:16462: 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 14555 "configure" +#line 16468 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14559: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16472: \"$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:14565: \$? = $ac_status" >&5 + echo "$as_me:16478: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14581,7 +16494,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14584: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16497: 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:16507: 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 @@ -14601,12 +16514,12 @@ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h do cat >conftest.$ac_ext <<_ACEOF -#line 14604 "configure" +#line 16517 "configure" #include "confdefs.h" #include <$cf_header> int -main () +main (void) { int x = optind; char *y = optarg ; @@ -14614,16 +16527,16 @@ int x = optind; char *y = optarg } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14617: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16530: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14620: \$? = $ac_status" >&5 + echo "$as_me:16533: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14623: \"$ac_try\"") >&5 + { (eval echo "$as_me:16536: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14626: \$? = $ac_status" >&5 + echo "$as_me:16539: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_getopt_header=$cf_header break @@ -14635,7 +16548,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:14638: result: $cf_cv_getopt_header" >&5 +echo "$as_me:16551: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test $cf_cv_getopt_header != none ; then @@ -14643,13 +16556,20 @@ cat >>confdefs.h <<\EOF #define HAVE_GETOPT_HEADER 1 EOF +fi +if test $cf_cv_getopt_header = getopt.h ; then + +cat >>confdefs.h <<\EOF +#define NEED_GETOPT_H 1 +EOF + fi # check for ISC (this may also define _POSIX_SOURCE) # Note: even non-Posix ISC needs to declare fd_set if test "x$ISC" = xyes ; then -echo "$as_me:14652: checking for main in -lcposix" >&5 +echo "$as_me:16572: 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 @@ -14657,11 +16577,11 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14660 "configure" +#line 16580 "configure" #include "confdefs.h" int -main () +main (void) { main (); ; @@ -14669,16 +16589,16 @@ main (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14672: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16592: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14675: \$? = $ac_status" >&5 + echo "$as_me:16595: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14678: \"$ac_try\"") >&5 + { (eval echo "$as_me:16598: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14681: \$? = $ac_status" >&5 + echo "$as_me:16601: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cposix_main=yes else @@ -14689,7 +16609,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14692: result: $ac_cv_lib_cposix_main" >&5 +echo "$as_me:16612: 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:16623: 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 @@ -14708,7 +16628,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-linet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14711 "configure" +#line 16631 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14719,7 +16639,7 @@ extern "C" builtin and then its argument prototype would still apply. */ char bzero (); int -main () +main (void) { bzero (); ; @@ -14727,16 +16647,16 @@ bzero (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14730: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16650: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14733: \$? = $ac_status" >&5 + echo "$as_me:16653: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14736: \"$ac_try\"") >&5 + { (eval echo "$as_me:16656: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14739: \$? = $ac_status" >&5 + echo "$as_me:16659: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_inet_bzero=yes else @@ -14747,21 +16667,37 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14750: result: $ac_cv_lib_inet_bzero" >&5 +echo "$as_me:16670: result: $ac_cv_lib_inet_bzero" >&5 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 if test $ac_cv_lib_inet_bzero = yes; then - LIBS="-linet $LIBS" + +cf_add_libs="-linet" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + fi fi -echo "$as_me:14757: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:16693: 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 14764 "configure" +#line 16700 "configure" #include "confdefs.h" #include @@ -14773,7 +16709,7 @@ cat >conftest.$ac_ext <<_ACEOF #endif int -main () +main (void) { ; @@ -14781,16 +16717,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14784: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16720: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14787: \$? = $ac_status" >&5 + echo "$as_me:16723: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14790: \"$ac_try\"") >&5 + { (eval echo "$as_me:16726: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14793: \$? = $ac_status" >&5 + echo "$as_me:16729: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sys_time_select=yes else @@ -14802,7 +16738,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14805: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:16741: 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 @@ -14817,17 +16753,17 @@ 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:14820: checking for an ANSI C-conforming const" >&5 +echo "$as_me:16756: 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 14826 "configure" +#line 16762 "configure" #include "confdefs.h" int -main () +main (void) { /* FIXME: Include the comments suggested by Paul. */ #ifndef __cplusplus @@ -14881,16 +16817,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14884: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16820: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14887: \$? = $ac_status" >&5 + echo "$as_me:16823: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14890: \"$ac_try\"") >&5 + { (eval echo "$as_me:16826: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14893: \$? = $ac_status" >&5 + echo "$as_me:16829: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -14900,7 +16836,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14903: result: $ac_cv_c_const" >&5 +echo "$as_me:16839: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -14910,7 +16846,7 @@ EOF fi -echo "$as_me:14913: checking for inline" >&5 +echo "$as_me:16849: 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 @@ -14918,7 +16854,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 14921 "configure" +#line 16857 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -14927,16 +16863,16 @@ $ac_kw int foo () {return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14930: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16866: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14933: \$? = $ac_status" >&5 + echo "$as_me:16869: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14936: \"$ac_try\"") >&5 + { (eval echo "$as_me:16872: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14939: \$? = $ac_status" >&5 + echo "$as_me:16875: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -14947,7 +16883,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:14950: result: $ac_cv_c_inline" >&5 +echo "$as_me:16886: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -14964,29 +16900,29 @@ 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:14976: 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:16912: 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 14985 "configure" + cf_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS --param max-inline-insns-single=1200" + cat >conftest.$ac_ext <<_ACEOF +#line 16921 "configure" #include "confdefs.h" inline int foo(void) { return 1; } int -main () +main (void) { ${cf_cv_main_return:-return} foo() ; @@ -14994,16 +16930,16 @@ ${cf_cv_main_return:-return} foo() } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14997: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16933: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15000: \$? = $ac_status" >&5 + echo "$as_me:16936: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15003: \"$ac_try\"") >&5 + { (eval echo "$as_me:16939: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15006: \$? = $ac_status" >&5 + echo "$as_me:16942: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gcc_inline=yes else @@ -15012,12 +16948,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:15018: result: $cf_cv_gcc_inline" >&5 +echo "$as_me:16954: 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= @@ -15027,32 +16963,38 @@ 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 "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - 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" | \ @@ -15061,21 +17003,29 @@ 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/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -15084,24 +17034,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:15104: checking for signal global datatype" >&5 +echo "$as_me:17060: 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 @@ -15113,7 +17069,7 @@ else "int" do cat >conftest.$ac_ext <<_ACEOF -#line 15116 "configure" +#line 17072 "configure" #include "confdefs.h" #include @@ -15127,7 +17083,7 @@ static void handler(int sig) x = 5; } int -main () +main (void) { signal(SIGINT, handler); x = 1 @@ -15136,16 +17092,16 @@ signal(SIGINT, handler); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15139: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17095: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15142: \$? = $ac_status" >&5 + echo "$as_me:17098: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15145: \"$ac_try\"") >&5 + { (eval echo "$as_me:17101: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15148: \$? = $ac_status" >&5 + echo "$as_me:17104: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -15159,7 +17115,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15162: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:17118: 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:17127: 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 @@ -15178,12 +17134,12 @@ else cf_cv_typeof_chtype=long else cat >conftest.$ac_ext <<_ACEOF -#line 15181 "configure" +#line 17137 "configure" #include "confdefs.h" #define WANT_BITS 31 #include -int main() +int main(void) { FILE *fp = fopen("cf_test.out", "w"); if (fp != 0) { @@ -15213,15 +17169,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15216: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17172: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15219: \$? = $ac_status" >&5 + echo "$as_me:17175: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15221: \"$ac_try\"") >&5 + { (eval echo "$as_me:17177: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15224: \$? = $ac_status" >&5 + echo "$as_me:17180: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_typeof_chtype=`cat cf_test.out` else @@ -15236,7 +17192,7 @@ fi fi -echo "$as_me:15239: result: $cf_cv_typeof_chtype" >&5 +echo "$as_me:17195: result: $cf_cv_typeof_chtype" >&5 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 cat >>confdefs.h <&5 +echo "$as_me:17207: 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 15258 "configure" +#line 17214 "configure" #include "confdefs.h" int -main () +main (void) { long x = 1L + 1UL + 1U + 1 ; @@ -15267,16 +17223,16 @@ long x = 1L + 1UL + 1U + 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15270: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17226: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15273: \$? = $ac_status" >&5 + echo "$as_me:17229: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15276: \"$ac_try\"") >&5 + { (eval echo "$as_me:17232: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15279: \$? = $ac_status" >&5 + echo "$as_me:17235: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_unsigned_literals=yes else @@ -15288,7 +17244,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15291: result: $cf_cv_unsigned_literals" >&5 +echo "$as_me:17247: result: $cf_cv_unsigned_literals" >&5 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 cf_cv_1UL="1" @@ -15304,14 +17260,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t="" ### Checks for external-data -echo "$as_me:15307: checking if external errno is declared" >&5 +echo "$as_me:17263: 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 15314 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 17270 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -15321,7 +17277,7 @@ else #include #include int -main () +main (void) { int x = (int) errno ; @@ -15329,16 +17285,16 @@ int x = (int) errno } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15332: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17288: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15335: \$? = $ac_status" >&5 + echo "$as_me:17291: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15338: \"$ac_try\"") >&5 + { (eval echo "$as_me:17294: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15341: \$? = $ac_status" >&5 + echo "$as_me:17297: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_errno=yes else @@ -15349,14 +17305,14 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15352: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:17308: 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:17323: 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 15374 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 17330 "configure" #include "confdefs.h" #undef errno extern int errno; int -main () +main (void) { errno = 2 ; @@ -15386,16 +17342,16 @@ errno = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15389: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17345: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15392: \$? = $ac_status" >&5 + echo "$as_me:17348: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15395: \"$ac_try\"") >&5 + { (eval echo "$as_me:17351: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15398: \$? = $ac_status" >&5 + echo "$as_me:17354: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_errno=yes else @@ -15406,20 +17362,20 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15409: result: $cf_cv_have_errno" >&5 +echo "$as_me:17365: 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:17378: 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 @@ -15427,21 +17383,21 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:17389: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15436: \$? = $ac_status" >&5 + echo "$as_me:17392: \$? = $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:17412: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15459: \$? = $ac_status" >&5 + echo "$as_me:17415: \$? = $ac_status" >&5 (exit $ac_status); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -15469,10 +17425,10 @@ EOF cf_cv_link_dataonly=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 15472 "configure" +#line 17428 "configure" #include "confdefs.h" - int main() + int main(void) { extern int testfunc(); ${cf_cv_main_return:-return} (!testfunc()); @@ -15480,15 +17436,15 @@ else _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15483: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17439: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15486: \$? = $ac_status" >&5 + echo "$as_me:17442: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15488: \"$ac_try\"") >&5 + { (eval echo "$as_me:17444: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15491: \$? = $ac_status" >&5 + echo "$as_me:17447: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_dataonly=yes else @@ -15503,7 +17459,7 @@ fi fi -echo "$as_me:15506: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:17462: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -15521,6 +17477,7 @@ for ac_func in \ getcwd \ getegid \ geteuid \ +getopt \ getttynam \ issetugid \ poll \ @@ -15536,18 +17493,20 @@ sigvec \ strdup \ strstr \ tcgetpgrp \ +tdestroy \ times \ +tsearch \ vsnprintf \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:15544: checking for $ac_func" >&5 +echo "$as_me:17503: 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 15550 "configure" +#line 17509 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -15562,7 +17521,7 @@ char $ac_func (); char (*f) (); 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 @@ -15578,16 +17537,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:15581: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17540: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15584: \$? = $ac_status" >&5 + echo "$as_me:17543: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15587: \"$ac_try\"") >&5 + { (eval echo "$as_me:17546: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15590: \$? = $ac_status" >&5 + echo "$as_me:17549: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -15597,7 +17556,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15600: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:17559: 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: error: getopt is required for building programs" >&2;} + { (exit 1); exit 1; }; } +fi + +if test "x$with_safe_sprintf" = xyes +then + if test "x$ac_cv_func_vsnprintf" = xyes + then + { echo "$as_me:17580: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 +echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;} + else + +cat >>confdefs.h <<\EOF +#define USE_SAFE_SPRINTF 1 +EOF + + fi +fi if test "x$with_getcap" = "xyes" ; then -echo "$as_me:15612: checking for terminal-capability database functions" >&5 +echo "$as_me:17593: 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 15619 "configure" +#line 17600 "configure" #include "confdefs.h" #include int -main () +main (void) { char temp[128]; @@ -15636,16 +17617,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15639: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17620: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15642: \$? = $ac_status" >&5 + echo "$as_me:17623: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15645: \"$ac_try\"") >&5 + { (eval echo "$as_me:17626: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15648: \$? = $ac_status" >&5 + echo "$as_me:17629: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent=yes else @@ -15656,7 +17637,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15659: result: $cf_cv_cgetent" >&5 +echo "$as_me:17640: result: $cf_cv_cgetent" >&5 echo "${ECHO_T}$cf_cv_cgetent" >&6 if test "$cf_cv_cgetent" = yes @@ -15666,19 +17647,20 @@ cat >>confdefs.h <<\EOF #define HAVE_BSD_CGETENT 1 EOF -echo "$as_me:15669: checking if cgetent uses const parameter" >&5 +echo "$as_me:17650: 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 15676 "configure" +#line 17657 "configure" #include "confdefs.h" +#pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" #include int -main () +main (void) { char temp[128]; @@ -15695,16 +17677,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15698: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17680: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15701: \$? = $ac_status" >&5 + echo "$as_me:17683: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15704: \"$ac_try\"") >&5 + { (eval echo "$as_me:17686: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15707: \$? = $ac_status" >&5 + echo "$as_me:17689: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent_const=yes else @@ -15715,7 +17697,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15718: result: $cf_cv_cgetent_const" >&5 +echo "$as_me:17700: result: $cf_cv_cgetent_const" >&5 echo "${ECHO_T}$cf_cv_cgetent_const" >&6 if test "$cf_cv_cgetent_const" = yes then @@ -15729,18 +17711,18 @@ fi fi -echo "$as_me:15732: checking for isascii" >&5 +echo "$as_me:17714: 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 15739 "configure" +#line 17721 "configure" #include "confdefs.h" #include int -main () +main (void) { int x = isascii(' ') ; @@ -15748,16 +17730,16 @@ int x = isascii(' ') } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15751: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17733: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15754: \$? = $ac_status" >&5 + echo "$as_me:17736: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15757: \"$ac_try\"") >&5 + { (eval echo "$as_me:17739: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15760: \$? = $ac_status" >&5 + echo "$as_me:17742: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_isascii=yes else @@ -15768,7 +17750,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15771: result: $cf_cv_have_isascii" >&5 +echo "$as_me:17753: result: $cf_cv_have_isascii" >&5 echo "${ECHO_T}$cf_cv_have_isascii" >&6 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF @@ -15776,16 +17758,16 @@ cat >>confdefs.h <<\EOF EOF if test "$ac_cv_func_sigaction" = yes; then -echo "$as_me:15779: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "$as_me:17761: 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 15782 "configure" +#line 17764 "configure" #include "confdefs.h" #include #include int -main () +main (void) { struct sigaction act ; @@ -15793,16 +17775,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15796: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17778: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15799: \$? = $ac_status" >&5 + echo "$as_me:17781: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15802: \"$ac_try\"") >&5 + { (eval echo "$as_me:17784: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15805: \$? = $ac_status" >&5 + echo "$as_me:17787: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=no else @@ -15810,14 +17792,14 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 15813 "configure" +#line 17795 "configure" #include "confdefs.h" #define _POSIX_SOURCE #include #include int -main () +main (void) { struct sigaction act ; @@ -15825,16 +17807,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15828: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17810: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15831: \$? = $ac_status" >&5 + echo "$as_me:17813: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15834: \"$ac_try\"") >&5 + { (eval echo "$as_me:17816: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15837: \$? = $ac_status" >&5 + echo "$as_me:17819: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=yes @@ -15850,11 +17832,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:15853: result: $sigact_bad" >&5 +echo "$as_me:17835: result: $sigact_bad" >&5 echo "${ECHO_T}$sigact_bad" >&6 fi -echo "$as_me:15857: checking if nanosleep really works" >&5 +echo "$as_me:17839: 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 @@ -15864,7 +17846,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_nanosleep=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 15867 "configure" +#line 17849 "configure" #include "confdefs.h" #include @@ -15875,7 +17857,7 @@ else #include #endif -int main() { +int main(void) { struct timespec ts1, ts2; int code; ts1.tv_sec = 0; @@ -15889,15 +17871,15 @@ int main() { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15892: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17874: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15895: \$? = $ac_status" >&5 + echo "$as_me:17877: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15897: \"$ac_try\"") >&5 + { (eval echo "$as_me:17879: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15900: \$? = $ac_status" >&5 + echo "$as_me:17882: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_nanosleep=yes else @@ -15909,7 +17891,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:15912: result: $cf_cv_func_nanosleep" >&5 +echo "$as_me:17894: result: $cf_cv_func_nanosleep" >&5 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 test "$cf_cv_func_nanosleep" = "yes" && @@ -15924,23 +17906,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:15927: checking for $ac_header" >&5 +echo "$as_me:17909: 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 15933 "configure" +#line 17915 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:15937: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:17919: \"$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:15943: \$? = $ac_status" >&5 + echo "$as_me:17925: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15959,7 +17941,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:15962: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:17944: 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:17959: 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 15983 "configure" +#line 17965 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:15987: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:17969: \"$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:15993: \$? = $ac_status" >&5 + echo "$as_me:17975: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16009,7 +17991,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:16012: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:17994: 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:18012: 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 16033 "configure" +#line 18015 "configure" #include "confdefs.h" #include int -main () +main (void) { struct termios foo; int x = foo.c_iflag ; @@ -16042,16 +18024,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16045: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18027: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16048: \$? = $ac_status" >&5 + echo "$as_me:18030: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16051: \"$ac_try\"") >&5 + { (eval echo "$as_me:18033: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16054: \$? = $ac_status" >&5 + echo "$as_me:18036: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=no else @@ -16059,13 +18041,13 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 16062 "configure" +#line 18044 "configure" #include "confdefs.h" #define _POSIX_SOURCE #include int -main () +main (void) { struct termios foo; int x = foo.c_iflag ; @@ -16073,16 +18055,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16076: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18058: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16079: \$? = $ac_status" >&5 + echo "$as_me:18061: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16082: \"$ac_try\"") >&5 + { (eval echo "$as_me:18064: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16085: \$? = $ac_status" >&5 + echo "$as_me:18067: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=unknown else @@ -16098,19 +18080,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:16101: result: $termios_bad" >&5 + echo "$as_me:18083: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:16106: checking for tcgetattr" >&5 +echo "$as_me:18088: 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 16113 "configure" +#line 18095 "configure" #include "confdefs.h" #include @@ -16128,7 +18110,7 @@ cat >conftest.$ac_ext <<_ACEOF #endif int -main () +main (void) { TTY foo; @@ -16138,16 +18120,16 @@ tcgetattr(1, &foo); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16141: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18123: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16144: \$? = $ac_status" >&5 + echo "$as_me:18126: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16147: \"$ac_try\"") >&5 + { (eval echo "$as_me:18129: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16150: \$? = $ac_status" >&5 + echo "$as_me:18132: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_tcgetattr=yes else @@ -16157,27 +18139,27 @@ cf_cv_have_tcgetattr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16160: result: $cf_cv_have_tcgetattr" >&5 +echo "$as_me:18142: 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:16167: checking for vsscanf function or workaround" >&5 +echo "$as_me:18149: 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 16174 "configure" +#line 18156 "configure" #include "confdefs.h" #include #include int -main () +main (void) { va_list ap; @@ -16187,16 +18169,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16190: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18172: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16193: \$? = $ac_status" >&5 + echo "$as_me:18175: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16196: \"$ac_try\"") >&5 + { (eval echo "$as_me:18178: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16199: \$? = $ac_status" >&5 + echo "$as_me:18181: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vsscanf else @@ -16204,38 +18186,38 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 16207 "configure" +#line 18189 "configure" #include "confdefs.h" #include #include int -main () +main (void) { - 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:16229: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18211: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16232: \$? = $ac_status" >&5 + echo "$as_me:18214: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16235: \"$ac_try\"") >&5 + { (eval echo "$as_me:18217: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16238: \$? = $ac_status" >&5 + echo "$as_me:18220: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vfscanf else @@ -16243,38 +18225,38 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 16246 "configure" +#line 18228 "configure" #include "confdefs.h" #include #include int -main () +main (void) { - 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:16268: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18250: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16271: \$? = $ac_status" >&5 + echo "$as_me:18253: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16274: \"$ac_try\"") >&5 + { (eval echo "$as_me:18256: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16277: \$? = $ac_status" >&5 + echo "$as_me:18259: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=_doscan else @@ -16289,28 +18271,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:16292: result: $cf_cv_func_vsscanf" >&5 +echo "$as_me:18274: 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:16313: 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:18300: 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 18306 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:18310: \"$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:18316: \$? = $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:18335: 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 @@ -16321,15 +18353,18 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 16324 "configure" +#line 18356 "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]; @@ -16359,15 +18394,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16362: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18397: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16365: \$? = $ac_status" >&5 + echo "$as_me:18400: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16367: \"$ac_try\"") >&5 + { (eval echo "$as_me:18402: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16370: \$? = $ac_status" >&5 + echo "$as_me:18405: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -16382,16 +18417,16 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:16385: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:18420: 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:16388: checking for mkstemp" >&5 + echo "$as_me:18423: 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 16394 "configure" +#line 18429 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mkstemp (); below. */ @@ -16406,7 +18441,7 @@ char mkstemp (); char (*f) (); 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 @@ -16422,16 +18457,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:16425: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18460: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16428: \$? = $ac_status" >&5 + echo "$as_me:18463: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16431: \"$ac_try\"") >&5 + { (eval echo "$as_me:18466: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16434: \$? = $ac_status" >&5 + echo "$as_me:18469: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -16441,7 +18476,7 @@ ac_cv_func_mkstemp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16444: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:18479: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -16462,26 +18497,26 @@ else fi if test "x$cross_compiling" = xyes ; then - { echo "$as_me:16465: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + { echo "$as_me:18500: 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:16468: checking whether setvbuf arguments are reversed" >&5 + echo "$as_me:18503: 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:16474: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:18509: 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 16479 "configure" +#line 18514 "configure" #include "confdefs.h" #include /* If setvbuf has the reversed format, exit 0. */ int -main () +main (void) { /* This call has the arguments reversed. A reversed system may check and see that the address of main @@ -16493,15 +18528,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16496: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18531: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16499: \$? = $ac_status" >&5 + echo "$as_me:18534: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16501: \"$ac_try\"") >&5 + { (eval echo "$as_me:18536: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16504: \$? = $ac_status" >&5 + echo "$as_me:18539: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_setvbuf_reversed=yes else @@ -16514,7 +18549,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:16517: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "$as_me:18552: 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 @@ -16525,17 +18560,17 @@ EOF fi fi -echo "$as_me:16528: checking for intptr_t" >&5 +echo "$as_me:18563: 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 16534 "configure" +#line 18569 "configure" #include "confdefs.h" $ac_includes_default int -main () +main (void) { if ((intptr_t *) 0) return 0; @@ -16546,16 +18581,16 @@ if (sizeof (intptr_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16549: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18584: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16552: \$? = $ac_status" >&5 + echo "$as_me:18587: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16555: \"$ac_try\"") >&5 + { (eval echo "$as_me:18590: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16558: \$? = $ac_status" >&5 + echo "$as_me:18593: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_intptr_t=yes else @@ -16565,7 +18600,7 @@ ac_cv_type_intptr_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16568: result: $ac_cv_type_intptr_t" >&5 +echo "$as_me:18603: 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 : @@ -16577,19 +18612,71 @@ EOF fi -echo "$as_me:16580: checking for type sigaction_t" >&5 +echo "$as_me:18615: 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 18621 "configure" +#include "confdefs.h" +$ac_includes_default +int +main (void) +{ +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:18636: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:18639: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:18642: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18645: \$? = $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:18655: 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 16587 "configure" +#line 18674 "configure" #include "confdefs.h" #include int -main () +main (void) { sigaction_t x ; @@ -16597,16 +18684,16 @@ sigaction_t x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16600: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18687: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16603: \$? = $ac_status" >&5 + echo "$as_me:18690: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16606: \"$ac_try\"") >&5 + { (eval echo "$as_me:18693: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16609: \$? = $ac_status" >&5 + echo "$as_me:18696: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_sigaction=yes else @@ -16617,29 +18704,29 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16620: result: $cf_cv_type_sigaction" >&5 +echo "$as_me:18707: 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:16627: checking declaration of size-change" >&5 +echo "$as_me:18714: 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 16642 "configure" + CPPFLAGS="$cf_save_CPPFLAGS" + test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" + cat >conftest.$ac_ext <<_ACEOF +#line 18729 "configure" #include "confdefs.h" #include #ifdef HAVE_TERMIOS_H @@ -16661,7 +18748,7 @@ do #endif int -main () +main (void) { #ifdef TIOCGSIZE @@ -16683,16 +18770,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16686: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18773: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16689: \$? = $ac_status" >&5 + echo "$as_me:18776: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16692: \"$ac_try\"") >&5 + { (eval echo "$as_me:18779: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16695: \$? = $ac_status" >&5 + echo "$as_me:18782: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sizechange=yes else @@ -16711,7 +18798,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:16714: result: $cf_cv_sizechange" >&5 +echo "$as_me:18801: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then @@ -16719,8 +18806,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:18819: 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 16738 "configure" +#line 18825 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char memmove (); below. */ @@ -16750,7 +18837,7 @@ char memmove (); char (*f) (); 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 @@ -16766,16 +18853,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:16769: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18856: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16772: \$? = $ac_status" >&5 + echo "$as_me:18859: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16775: \"$ac_try\"") >&5 + { (eval echo "$as_me:18862: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16778: \$? = $ac_status" >&5 + echo "$as_me:18865: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_memmove=yes else @@ -16785,19 +18872,19 @@ ac_cv_func_memmove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16788: result: $ac_cv_func_memmove" >&5 +echo "$as_me:18875: 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:16794: checking for bcopy" >&5 +echo "$as_me:18881: 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 16800 "configure" +#line 18887 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char bcopy (); below. */ @@ -16812,7 +18899,7 @@ char bcopy (); char (*f) (); 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 @@ -16828,16 +18915,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:16831: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18918: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16834: \$? = $ac_status" >&5 + echo "$as_me:18921: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16837: \"$ac_try\"") >&5 + { (eval echo "$as_me:18924: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16840: \$? = $ac_status" >&5 + echo "$as_me:18927: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_bcopy=yes else @@ -16847,11 +18934,11 @@ ac_cv_func_bcopy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16850: result: $ac_cv_func_bcopy" >&5 +echo "$as_me:18937: 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:16854: checking if bcopy does overlapping moves" >&5 + echo "$as_me:18941: 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 @@ -16861,10 +18948,10 @@ else cf_cv_good_bcopy=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 16864 "configure" +#line 18951 "configure" #include "confdefs.h" -int main() { +int main(void) { static char data[] = "abcdefghijklmnopqrstuwwxyz"; char temp[40]; bcopy(data, temp, sizeof(data)); @@ -16875,15 +18962,15 @@ int main() { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16878: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18965: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16881: \$? = $ac_status" >&5 + echo "$as_me:18968: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16883: \"$ac_try\"") >&5 + { (eval echo "$as_me:18970: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16886: \$? = $ac_status" >&5 + echo "$as_me:18973: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_good_bcopy=yes else @@ -16896,7 +18983,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:16899: result: $cf_cv_good_bcopy" >&5 +echo "$as_me:18986: result: $cf_cv_good_bcopy" >&5 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 else @@ -16919,7 +19006,77 @@ EOF fi -echo "$as_me:16922: checking if poll really works" >&5 +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:19013: 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 19019 "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 (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 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:19050: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:19053: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:19056: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19059: \$? = $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:19069: 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 $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 @@ -16929,7 +19086,7 @@ if test "$cross_compiling" = yes; then cf_cv_working_poll=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 16932 "configure" +#line 19089 "configure" #include "confdefs.h" #include @@ -16941,7 +19098,7 @@ else #else #include #endif -int main() { +int main(void) { struct pollfd myfds; int ret; @@ -16961,6 +19118,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 */ @@ -16976,15 +19138,15 @@ int main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16979: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19141: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16982: \$? = $ac_status" >&5 + echo "$as_me:19144: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16984: \"$ac_try\"") >&5 + { (eval echo "$as_me:19146: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16987: \$? = $ac_status" >&5 + echo "$as_me:19149: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_working_poll=yes else @@ -16996,27 +19158,27 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:16999: result: $cf_cv_working_poll" >&5 +echo "$as_me:19161: 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:17006: checking for va_copy" >&5 +echo "$as_me:19168: 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 17013 "configure" +#line 19175 "configure" #include "confdefs.h" #include int -main () +main (void) { static va_list dst; @@ -17027,16 +19189,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17030: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19192: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17033: \$? = $ac_status" >&5 + echo "$as_me:19195: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17036: \"$ac_try\"") >&5 + { (eval echo "$as_me:19198: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17039: \$? = $ac_status" >&5 + echo "$as_me:19201: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_va_copy=yes else @@ -17046,7 +19208,7 @@ cf_cv_have_va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17049: result: $cf_cv_have_va_copy" >&5 +echo "$as_me:19211: result: $cf_cv_have_va_copy" >&5 echo "${ECHO_T}$cf_cv_have_va_copy" >&6 test "$cf_cv_have_va_copy" = yes && @@ -17054,20 +19216,20 @@ cat >>confdefs.h <<\EOF #define HAVE_VA_COPY 1 EOF -echo "$as_me:17057: checking for __va_copy" >&5 +echo "$as_me:19219: 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 17064 "configure" +#line 19226 "configure" #include "confdefs.h" #include int -main () +main (void) { static va_list dst; @@ -17078,16 +19240,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17081: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19243: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17084: \$? = $ac_status" >&5 + echo "$as_me:19246: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17087: \"$ac_try\"") >&5 + { (eval echo "$as_me:19249: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17090: \$? = $ac_status" >&5 + echo "$as_me:19252: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have___va_copy=yes else @@ -17097,7 +19259,7 @@ cf_cv_have___va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17100: result: $cf_cv_have___va_copy" >&5 +echo "$as_me:19262: result: $cf_cv_have___va_copy" >&5 echo "${ECHO_T}$cf_cv_have___va_copy" >&6 test "$cf_cv_have___va_copy" = yes && @@ -17105,17 +19267,17 @@ cat >>confdefs.h <<\EOF #define HAVE___VA_COPY 1 EOF -echo "$as_me:17108: checking for pid_t" >&5 +echo "$as_me:19270: 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 17114 "configure" +#line 19276 "configure" #include "confdefs.h" $ac_includes_default int -main () +main (void) { if ((pid_t *) 0) return 0; @@ -17126,16 +19288,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17129: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19291: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17132: \$? = $ac_status" >&5 + echo "$as_me:19294: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17135: \"$ac_try\"") >&5 + { (eval echo "$as_me:19297: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17138: \$? = $ac_status" >&5 + echo "$as_me:19300: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -17145,7 +19307,7 @@ ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:17148: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:19310: 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 : @@ -17160,23 +19322,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:17163: checking for $ac_header" >&5 +echo "$as_me:19325: 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 17169 "configure" +#line 19331 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17173: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:19335: \"$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:17179: \$? = $ac_status" >&5 + echo "$as_me:19341: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17195,7 +19357,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17198: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:19360: 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:19373: 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 17217 "configure" +#line 19379 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -17229,7 +19391,7 @@ char $ac_func (); char (*f) (); 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 @@ -17245,16 +19407,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:17248: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19410: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17251: \$? = $ac_status" >&5 + echo "$as_me:19413: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17254: \"$ac_try\"") >&5 + { (eval echo "$as_me:19416: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17257: \$? = $ac_status" >&5 + echo "$as_me:19419: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -17264,7 +19426,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17267: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:19429: 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:19441: 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 @@ -17291,7 +19453,7 @@ else # include #endif /* Some systems only have a dummy stub for fork() */ - int main () + int main (void) { if (fork() < 0) $ac_main_return (1); @@ -17299,15 +19461,15 @@ else } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17302: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19464: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17305: \$? = $ac_status" >&5 + echo "$as_me:19467: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17307: \"$ac_try\"") >&5 + { (eval echo "$as_me:19469: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17310: \$? = $ac_status" >&5 + echo "$as_me:19472: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fork_works=yes else @@ -17319,7 +19481,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:17322: result: $ac_cv_func_fork_works" >&5 +echo "$as_me:19484: result: $ac_cv_func_fork_works" >&5 echo "${ECHO_T}$ac_cv_func_fork_works" >&6 fi @@ -17333,12 +19495,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:17336: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + { echo "$as_me:19498: 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:17341: checking for working vfork" >&5 + echo "$as_me:19503: 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 @@ -17347,7 +19509,7 @@ else ac_cv_func_vfork_works=cross else cat >conftest.$ac_ext <<_ACEOF -#line 17350 "configure" +#line 19512 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include @@ -17388,7 +19550,7 @@ sparc_address_test (arg) int arg; } int -main () +main (void) { pid_t parent = getpid (); pid_t child; @@ -17444,15 +19606,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17447: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19609: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17450: \$? = $ac_status" >&5 + echo "$as_me:19612: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17452: \"$ac_try\"") >&5 + { (eval echo "$as_me:19614: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17455: \$? = $ac_status" >&5 + echo "$as_me:19617: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_vfork_works=yes else @@ -17464,13 +19626,13 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:17467: result: $ac_cv_func_vfork_works" >&5 +echo "$as_me:19629: 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:17473: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + { echo "$as_me:19635: 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 @@ -17497,7 +19659,7 @@ fi # special check for test/ditto.c -echo "$as_me:17500: checking for openpty in -lutil" >&5 +echo "$as_me:19662: 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 @@ -17505,7 +19667,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 17508 "configure" +#line 19670 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17516,7 +19678,7 @@ extern "C" builtin and then its argument prototype would still apply. */ char openpty (); int -main () +main (void) { openpty (); ; @@ -17524,16 +19686,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17527: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19689: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17530: \$? = $ac_status" >&5 + echo "$as_me:19692: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17533: \"$ac_try\"") >&5 + { (eval echo "$as_me:19695: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17536: \$? = $ac_status" >&5 + echo "$as_me:19698: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -17544,7 +19706,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17547: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:19709: 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 @@ -17552,93 +19714,279 @@ else cf_cv_lib_util=no fi -echo "$as_me:17555: checking for openpty header" >&5 +echo "$as_me:19717: checking for openpty header" >&5 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 if test "${cf_cv_func_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cf_save_LIBS="$LIBS" - test $cf_cv_lib_util = yes && LIBS="-lutil $LIBS" - for cf_header in pty.h libutil.h util.h - do - cat >conftest.$ac_ext <<_ACEOF -#line 17566 "configure" + 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 +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + } + for cf_header in pty.h libutil.h util.h + do + cat >conftest.$ac_ext <<_ACEOF +#line 19744 "configure" #include "confdefs.h" #include <$cf_header> int -main () +main (void) +{ + + 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:19761: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:19764: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:19767: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:19770: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_func_openpty=$cf_header + break + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + + cf_cv_func_openpty=no + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done + LIBS="$cf_save_LIBS" + +fi +echo "$as_me:19788: result: $cf_cv_func_openpty" >&5 +echo "${ECHO_T}$cf_cv_func_openpty" >&6 + +if test "$cf_cv_func_openpty" != no ; then + +cat >>confdefs.h < +EOF + +cat >>confdefs.h <<\EOF +#define USE_XTERM_PTY 1 +EOF + + if test "x$cf_cv_lib_util" = xyes ; then + +cf_add_libs="-lutil" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $TEST_LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +TEST_LIBS="$cf_add_libs" + + fi +fi + +if test "$with_hashed_db" != no ; then + +cat >>confdefs.h <<\EOF +#define USE_HASHED_DB 1 +EOF + +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 + do + while test $cf_add_incdir != /usr/include + do + if test -d $cf_add_incdir + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi + + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +#line 19858 "configure" +#include "confdefs.h" +#include +int +main (void) { - - int x = openpty((int *)0, (int *)0, (char *)0, - (struct termios *)0, (struct winsize *)0); - +printf("Hello") ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17583: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:19870: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17586: \$? = $ac_status" >&5 + echo "$as_me:19873: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17589: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:19876: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17592: \$? = $ac_status" >&5 + echo "$as_me:19879: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cf_cv_func_openpty=$cf_header - break - + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +cf_have_incdir=yes +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi + + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +echo "${as_me:-configure}:19896: testing adding $cf_add_incdir to include-path ..." 1>&5 - cf_cv_func_openpty=no + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - done - LIBS="$cf_save_LIBS" +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 + +echo "${as_me:-configure}:19932: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi -echo "$as_me:17610: result: $cf_cv_func_openpty" >&5 -echo "${ECHO_T}$cf_cv_func_openpty" >&6 -if test "$cf_cv_func_openpty" != no ; then + else + case "$with_hashed_db" in + (./*|../*|/*) + { echo "$as_me:19943: WARNING: no such directory $with_hashed_db" >&5 +echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} + ;; + (*) -cat >>confdefs.h < -EOF +cf_search= -cat >>confdefs.h <<\EOF -#define USE_XTERM_PTY 1 -EOF +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $prefix" + test -d $prefix/include && cf_search="$cf_search $prefix/include" + test -d $prefix/include/$with_hashed_db && cf_search="$cf_search $prefix/include/$with_hashed_db" + test -d $prefix/include/$with_hashed_db/include && cf_search="$cf_search $prefix/include/$with_hashed_db/include" + test -d $prefix/$with_hashed_db/include && cf_search="$cf_search $prefix/$with_hashed_db/include" + test -d $prefix/$with_hashed_db/include/$with_hashed_db && cf_search="$cf_search $prefix/$with_hashed_db/include/$with_hashed_db" +} - if test "x$cf_cv_lib_util" = xyes ; then - TEST_LIBS="-lutil $TEST_LIBS" - fi -fi +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do -if test "$with_hashed_db" != no ; then +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include" + test -d $cf_subdir_prefix/include/$with_hashed_db && cf_search="$cf_search $cf_subdir_prefix/include/$with_hashed_db" + test -d $cf_subdir_prefix/include/$with_hashed_db/include && cf_search="$cf_search $cf_subdir_prefix/include/$with_hashed_db/include" + test -d $cf_subdir_prefix/$with_hashed_db/include && cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/include" + test -d $cf_subdir_prefix/$with_hashed_db/include/$with_hashed_db && cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/include/$with_hashed_db" +} -cat >>confdefs.h <<\EOF -#define USE_HASHED_DB 1 -EOF +done -case $with_hashed_db in #(vi -yes|*able*) #(vi - ;; -*) - if test -d "$with_hashed_db" ; then + for cf_item in $cf_search + do + case $cf_item in + (*/$with_hashed_db) -if test -n "$with_hashed_db/include" ; then - for cf_add_incdir in $with_hashed_db/include +if test -n "$cf_item" ; then + for cf_add_incdir in $cf_item do while test $cf_add_incdir != /usr/include do @@ -17661,11 +20009,11 @@ if test -n "$with_hashed_db/include" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 17664 "configure" +#line 20012 "configure" #include "confdefs.h" #include int -main () +main (void) { printf("Hello") ; @@ -17673,16 +20021,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17676: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20024: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17679: \$? = $ac_status" >&5 + echo "$as_me:20027: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17682: \"$ac_try\"") >&5 + { (eval echo "$as_me:20030: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17685: \$? = $ac_status" >&5 + echo "$as_me:20033: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -17699,7 +20047,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}:17702: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:20050: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -17709,58 +20057,110 @@ echo "${as_me:-configure}:17702: 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 + ;; + esac + done + +cf_search= -echo "${as_me:-configure}:17736: testing adding $cf_add_libdir to library-path ..." 1>&5 +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $prefix" + test -d $prefix/lib && cf_search="$cf_search $prefix/lib" + test -d $prefix/lib/$with_hashed_db && cf_search="$cf_search $prefix/lib/$with_hashed_db" + test -d $prefix/lib/$with_hashed_db/lib && cf_search="$cf_search $prefix/lib/$with_hashed_db/lib" + test -d $prefix/$with_hashed_db/lib && cf_search="$cf_search $prefix/$with_hashed_db/lib" + test -d $prefix/$with_hashed_db/lib/$with_hashed_db && cf_search="$cf_search $prefix/$with_hashed_db/lib/$with_hashed_db" +} - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d $cf_subdir_prefix/lib/$with_hashed_db && cf_search="$cf_search $cf_subdir_prefix/lib/$with_hashed_db" + test -d $cf_subdir_prefix/lib/$with_hashed_db/lib && cf_search="$cf_search $cf_subdir_prefix/lib/$with_hashed_db/lib" + test -d $cf_subdir_prefix/$with_hashed_db/lib && cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/lib" + test -d $cf_subdir_prefix/$with_hashed_db/lib/$with_hashed_db && cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/lib/$with_hashed_db" +} + +done + + for cf_item in $cf_search + do + 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 + +echo "${as_me:-configure}:20130: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi - fi + ;; + esac + done + + ;; + esac + fi esac -echo "$as_me:17747: checking for db.h" >&5 +echo "$as_me:20147: 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 17753 "configure" +#line 20153 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:17757: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20157: \"$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:17763: \$? = $ac_status" >&5 + echo "$as_me:20163: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17779,11 +20179,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17782: result: $ac_cv_header_db_h" >&5 +echo "$as_me:20182: 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:17786: checking for version of db" >&5 +echo "$as_me:20186: 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 @@ -17791,13 +20191,13 @@ else cf_cv_hashed_db_version=unknown -for cf_db_version in 1 2 3 4 5 +for cf_db_version in 1 2 3 4 5 6 do -echo "${as_me:-configure}:17797: testing checking for db version $cf_db_version ..." 1>&5 +echo "${as_me:-configure}:20197: testing checking for db version $cf_db_version ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 17800 "configure" +#line 20200 "configure" #include "confdefs.h" $ac_includes_default @@ -17819,7 +20219,7 @@ $ac_includes_default #endif int -main () +main (void) { DBT *foo = 0 ; @@ -17827,16 +20227,16 @@ DBT *foo = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17830: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20230: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17833: \$? = $ac_status" >&5 + echo "$as_me:20233: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17836: \"$ac_try\"") >&5 + { (eval echo "$as_me:20236: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17839: \$? = $ac_status" >&5 + echo "$as_me:20239: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_hashed_db_version=$cf_db_version @@ -17850,16 +20250,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:17853: result: $cf_cv_hashed_db_version" >&5 +echo "$as_me:20253: 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:17857: error: Cannot determine version of db" >&5 + { { echo "$as_me:20257: 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:17862: checking for db libraries" >&5 +echo "$as_me:20262: 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 @@ -17870,20 +20270,36 @@ for cf_db_libs in "" db$cf_cv_hashed_db_version db-$cf_cv_hashed_db_version db ' do cf_save_libs="$LIBS" if test -n "$cf_db_libs"; then - LIBS="-l$cf_db_libs $LIBS" + +cf_add_libs="-l$cf_db_libs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + fi -echo "${as_me:-configure}:17876: testing checking for library "$cf_db_libs" ..." 1>&5 +echo "${as_me:-configure}:20292: testing checking for library "$cf_db_libs" ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 17879 "configure" +#line 20295 "configure" #include "confdefs.h" $ac_includes_default #include int -main () +main (void) { char *path = "/tmp/foo"; @@ -17931,16 +20347,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17934: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20350: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17937: \$? = $ac_status" >&5 + echo "$as_me:20353: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17940: \"$ac_try\"") >&5 + { (eval echo "$as_me:20356: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17943: \$? = $ac_status" >&5 + echo "$as_me:20359: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test -n "$cf_db_libs" ; then @@ -17960,21 +20376,37 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:17963: result: $cf_cv_hashed_db_libs" >&5 +echo "$as_me:20379: 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:17967: error: Cannot determine library for db" >&5 + { { echo "$as_me:20383: error: Cannot determine library for db" >&5 echo "$as_me: error: Cannot determine library for db" >&2;} { (exit 1); exit 1; }; } elif test "$cf_cv_hashed_db_libs" != default ; then - LIBS="-l$cf_cv_hashed_db_libs $LIBS" + +cf_add_libs="-l$cf_cv_hashed_db_libs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + fi fi else - { { echo "$as_me:17977: error: Cannot find db.h" >&5 + { { echo "$as_me:20409: error: Cannot find db.h" >&5 echo "$as_me: error: Cannot find db.h" >&2;} { (exit 1); exit 1; }; } @@ -17989,7 +20421,7 @@ fi # Just in case, check if the C compiler has a bool type. -echo "$as_me:17992: checking if we should include stdbool.h" >&5 +echo "$as_me:20424: 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 @@ -17997,11 +20429,11 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 18000 "configure" +#line 20432 "configure" #include "confdefs.h" int -main () +main (void) { bool foo = false ; @@ -18009,23 +20441,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18012: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20444: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18015: \$? = $ac_status" >&5 + echo "$as_me:20447: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18018: \"$ac_try\"") >&5 + { (eval echo "$as_me:20450: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18021: \$? = $ac_status" >&5 + echo "$as_me:20453: \$? = $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 18028 "configure" +#line 20460 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -18033,7 +20465,7 @@ cat >conftest.$ac_ext <<_ACEOF #endif int -main () +main (void) { bool foo = false ; @@ -18041,16 +20473,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18044: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20476: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18047: \$? = $ac_status" >&5 + echo "$as_me:20479: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18050: \"$ac_try\"") >&5 + { (eval echo "$as_me:20482: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18053: \$? = $ac_status" >&5 + echo "$as_me:20485: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -18064,13 +20496,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:18067: result: yes" >&5 +then echo "$as_me:20499: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:18069: result: no" >&5 +else echo "$as_me:20501: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:18073: checking for builtin bool type" >&5 +echo "$as_me:20505: 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 @@ -18078,14 +20510,14 @@ if test "${cf_cv_cc_bool_type+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 18081 "configure" +#line 20513 "configure" #include "confdefs.h" #include #include int -main () +main (void) { bool x = false ; @@ -18093,16 +20525,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18096: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20528: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18099: \$? = $ac_status" >&5 + echo "$as_me:20531: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18102: \"$ac_try\"") >&5 + { (eval echo "$as_me:20534: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18105: \$? = $ac_status" >&5 + echo "$as_me:20537: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cc_bool_type=1 else @@ -18115,9 +20547,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_cc_bool_type" = 1 -then echo "$as_me:18118: result: yes" >&5 +then echo "$as_me:20550: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:18120: result: no" >&5 +else echo "$as_me:20552: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -18131,49 +20563,113 @@ 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:18142: checking for library $cf_stdcpp_libname" >&5 + + cf_save="$LIBS" + LIBS="$LIBS $CXXLIBS" + echo "$as_me:20569: 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 20572 "configure" +#include "confdefs.h" + + #include +int +main (void) +{ + + std::cout << "Hello World!" << std::endl; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:20586: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:20589: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:20592: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:20595: \$? = $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:20604: 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:20623: checking for library $cf_stdcpp_libname" >&5 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 if test "${cf_cv_libstdcpp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cf_save="$LIBS" - LIBS="-l$cf_stdcpp_libname $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 18151 "configure" + cf_save="$LIBS" + LIBS="$LIBS $CXXLIBS" + +cf_add_libs="-l$cf_stdcpp_libname" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +#line 20649 "configure" #include "confdefs.h" -#include + #include int -main () +main (void) { -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:18167: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20663: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18170: \$? = $ac_status" >&5 + echo "$as_me:20666: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18173: \"$ac_try\"") >&5 + { (eval echo "$as_me:20669: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18176: \$? = $ac_status" >&5 + echo "$as_me:20672: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_libstdcpp=yes else @@ -18182,39 +20678,55 @@ 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:18188: result: $cf_cv_libstdcpp" >&5 +echo "$as_me:20684: result: $cf_cv_libstdcpp" >&5 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 -test "$cf_cv_libstdcpp" = yes && CXXLIBS="-l$cf_stdcpp_libname $CXXLIBS" + test "$cf_cv_libstdcpp" = yes && { +cf_add_libs="-l$cf_stdcpp_libname" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $CXXLIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +CXXLIBS="$cf_add_libs" + } + fi fi - echo "$as_me:18193: checking whether $CXX understands -c and -o together" >&5 + echo "$as_me:20706: 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:18209: \"$ac_try\"") >&5 +ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +if { (eval echo "$as_me:20721: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18212: \$? = $ac_status" >&5 + echo "$as_me:20724: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:18214: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:20726: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18217: \$? = $ac_status" >&5 + echo "$as_me:20729: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CXX_c_o=yes @@ -18225,41 +20737,57 @@ rm -rf conftest* fi if test $cf_cv_prog_CXX_c_o = yes; then - echo "$as_me:18228: result: yes" >&5 + echo "$as_me:20740: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:18231: result: no" >&5 + echo "$as_me:20743: 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:18251: checking for lib$cf_gpp_libname" >&5 + echo "$as_me:20763: checking for lib$cf_gpp_libname" >&5 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 cf_save="$LIBS" - LIBS="-l$cf_gpp_libname $LIBS" + +cf_add_libs="-l$cf_gpp_libname" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + cat >conftest.$ac_ext <<_ACEOF -#line 18256 "configure" +#line 20784 "configure" #include "confdefs.h" #include <$cf_gpp_libname/builtin.h> int -main () +main (void) { two_arg_error_handler_t foo2 = lib_error_handler ; @@ -18267,19 +20795,35 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18270: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20798: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18273: \$? = $ac_status" >&5 + echo "$as_me:20801: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18276: \"$ac_try\"") >&5 + { (eval echo "$as_me:20804: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18279: \$? = $ac_status" >&5 + echo "$as_me:20807: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes - CXXLIBS="-l$cf_gpp_libname $CXXLIBS" + +cf_add_libs="-l$cf_gpp_libname" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $CXXLIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +CXXLIBS="$cf_add_libs" + if test "$cf_gpp_libname" = cpp ; then cat >>confdefs.h <<\EOF @@ -18297,13 +20841,13 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 18300 "configure" +#line 20844 "configure" #include "confdefs.h" #include int -main () +main (void) { two_arg_error_handler_t foo2 = lib_error_handler ; @@ -18311,19 +20855,34 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18314: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20858: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18317: \$? = $ac_status" >&5 + echo "$as_me:20861: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18320: \"$ac_try\"") >&5 + { (eval echo "$as_me:20864: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18323: \$? = $ac_status" >&5 + echo "$as_me:20867: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes - CXXLIBS="-l$cf_gpp_libname $CXXLIBS" + +cf_add_libs="-l$cf_gpp_libname" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $CXXLIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +CXXLIBS="$cf_add_libs" cat >>confdefs.h <<\EOF #define HAVE_BUILTIN_H 1 @@ -18338,12 +20897,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:18341: result: $cf_cxx_library" >&5 + echo "$as_me:20900: result: $cf_cxx_library" >&5 echo "${ECHO_T}$cf_cxx_library" >&6 fi ;; - *) + (*) cf_cxx_library=no ;; esac @@ -18354,7 +20913,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:18357: checking how to run the C++ preprocessor" >&5 +echo "$as_me:20916: 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 @@ -18371,18 +20930,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 18374 "configure" +#line 20933 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:18379: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20938: \"$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:18385: \$? = $ac_status" >&5 + echo "$as_me:20944: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18405,17 +20964,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 18408 "configure" +#line 20967 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18412: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20971: \"$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:18418: \$? = $ac_status" >&5 + echo "$as_me:20977: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18452,7 +21011,7 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:18455: result: $CXXCPP" >&5 +echo "$as_me:21014: result: $CXXCPP" >&5 echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -18462,18 +21021,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 18465 "configure" +#line 21024 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:18470: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:21029: \"$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:18476: \$? = $ac_status" >&5 + echo "$as_me:21035: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18496,17 +21055,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 18499 "configure" +#line 21058 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18503: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:21062: \"$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:18509: \$? = $ac_status" >&5 + echo "$as_me:21068: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18534,7 +21093,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:18537: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + { { echo "$as_me:21096: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -18549,23 +21108,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:18552: checking for $ac_header" >&5 +echo "$as_me:21111: 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 18558 "configure" +#line 21117 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18562: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:21121: \"$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:18568: \$? = $ac_status" >&5 + echo "$as_me:21127: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18584,7 +21143,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18587: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:21146: 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:21159: 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 18606 "configure" +#line 21165 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18610: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:21169: \"$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:18616: \$? = $ac_status" >&5 + echo "$as_me:21175: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18632,7 +21191,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18635: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:21194: 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:21205: 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 18649 "configure" +#line 21208 "configure" #include "confdefs.h" #include using std::endl; using std::cerr; int -main () +main (void) { cerr << "testing" << endl; @@ -18663,16 +21222,16 @@ cerr << "testing" << endl; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18666: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21225: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18669: \$? = $ac_status" >&5 + echo "$as_me:21228: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18672: \"$ac_try\"") >&5 + { (eval echo "$as_me:21231: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18675: \$? = $ac_status" >&5 + echo "$as_me:21234: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_iostream_namespace=yes else @@ -18681,7 +21240,7 @@ cat conftest.$ac_ext >&5 cf_iostream_namespace=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:18684: result: $cf_iostream_namespace" >&5 + echo "$as_me:21243: result: $cf_iostream_namespace" >&5 echo "${ECHO_T}$cf_iostream_namespace" >&6 if test "$cf_iostream_namespace" = yes ; then @@ -18692,7 +21251,7 @@ EOF fi fi -echo "$as_me:18695: checking if we should include stdbool.h" >&5 +echo "$as_me:21254: 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 @@ -18700,11 +21259,11 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 18703 "configure" +#line 21262 "configure" #include "confdefs.h" int -main () +main (void) { bool foo = false ; @@ -18712,23 +21271,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18715: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21274: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18718: \$? = $ac_status" >&5 + echo "$as_me:21277: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18721: \"$ac_try\"") >&5 + { (eval echo "$as_me:21280: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18724: \$? = $ac_status" >&5 + echo "$as_me:21283: \$? = $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 18731 "configure" +#line 21290 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -18736,7 +21295,7 @@ cat >conftest.$ac_ext <<_ACEOF #endif int -main () +main (void) { bool foo = false ; @@ -18744,16 +21303,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18747: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21306: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18750: \$? = $ac_status" >&5 + echo "$as_me:21309: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18753: \"$ac_try\"") >&5 + { (eval echo "$as_me:21312: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18756: \$? = $ac_status" >&5 + echo "$as_me:21315: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -18767,13 +21326,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:18770: result: yes" >&5 +then echo "$as_me:21329: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:18772: result: no" >&5 +else echo "$as_me:21331: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:18776: checking for builtin bool type" >&5 +echo "$as_me:21335: 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 @@ -18781,14 +21340,14 @@ if test "${cf_cv_builtin_bool+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 18784 "configure" +#line 21343 "configure" #include "confdefs.h" #include #include int -main () +main (void) { bool x = false ; @@ -18796,16 +21355,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18799: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21358: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18802: \$? = $ac_status" >&5 + echo "$as_me:21361: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18805: \"$ac_try\"") >&5 + { (eval echo "$as_me:21364: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18808: \$? = $ac_status" >&5 + echo "$as_me:21367: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_builtin_bool=1 else @@ -18818,13 +21377,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_builtin_bool" = 1 -then echo "$as_me:18821: result: yes" >&5 +then echo "$as_me:21380: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:18823: result: no" >&5 +else echo "$as_me:21382: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:18827: checking for size of bool" >&5 +echo "$as_me:21386: 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 @@ -18835,7 +21394,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 18838 "configure" +#line 21397 "configure" #include "confdefs.h" #include @@ -18859,7 +21418,7 @@ else #endif -int main() +int main(void) { FILE *fp = fopen("cf_test.out", "w"); if (fp != 0) { @@ -18877,15 +21436,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18880: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21439: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18883: \$? = $ac_status" >&5 + echo "$as_me:21442: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18885: \"$ac_try\"") >&5 + { (eval echo "$as_me:21444: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18888: \$? = $ac_status" >&5 + echo "$as_me:21447: \$? = $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 @@ -18903,18 +21462,18 @@ fi fi rm -f cf_test.out -echo "$as_me:18906: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:21465: 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:18912: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:21471: 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:18917: checking for special defines needed for etip.h" >&5 +echo "$as_me:21476: 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" @@ -18932,13 +21491,13 @@ 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 18935 "configure" +#line 21494 "configure" #include "confdefs.h" #include int -main () +main (void) { ; @@ -18946,16 +21505,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18949: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21508: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18952: \$? = $ac_status" >&5 + echo "$as_me:21511: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18955: \"$ac_try\"") >&5 + { (eval echo "$as_me:21514: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18958: \$? = $ac_status" >&5 + echo "$as_me:21517: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$cf_math" && cat >>confdefs.h <&5 +echo "$as_me:21538: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 CXXFLAGS="$cf_save_CXXFLAGS" if test -n "$CXX"; then -echo "$as_me:18984: checking if $CXX accepts parameter initialization" >&5 +echo "$as_me:21543: 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 @@ -18998,7 +21557,7 @@ ac_main_return=return cf_cv_cpp_param_init=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 19001 "configure" +#line 21560 "configure" #include "confdefs.h" class TEST { @@ -19013,19 +21572,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:19020: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21579: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19023: \$? = $ac_status" >&5 + echo "$as_me:21582: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19025: \"$ac_try\"") >&5 + { (eval echo "$as_me:21584: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19028: \$? = $ac_status" >&5 + echo "$as_me:21587: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_param_init=yes else @@ -19044,7 +21603,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:19047: result: $cf_cv_cpp_param_init" >&5 +echo "$as_me:21606: result: $cf_cv_cpp_param_init" >&5 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 fi test "$cf_cv_cpp_param_init" = yes && @@ -19054,7 +21613,7 @@ EOF if test -n "$CXX"; then -echo "$as_me:19057: checking if $CXX accepts static_cast" >&5 +echo "$as_me:21616: 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 @@ -19068,7 +21627,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat >conftest.$ac_ext <<_ACEOF -#line 19071 "configure" +#line 21630 "configure" #include "confdefs.h" class NCursesPanel @@ -19103,7 +21662,7 @@ public: }; int -main () +main (void) { const char* p_UserData = static_cast(0) @@ -19112,16 +21671,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19115: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21674: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19118: \$? = $ac_status" >&5 + echo "$as_me:21677: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19121: \"$ac_try\"") >&5 + { (eval echo "$as_me:21680: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19124: \$? = $ac_status" >&5 + echo "$as_me:21683: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_static_cast=yes else @@ -19139,7 +21698,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:19142: result: $cf_cv_cpp_static_cast" >&5 +echo "$as_me:21701: result: $cf_cv_cpp_static_cast" >&5 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 fi @@ -19151,17 +21710,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' @@ -19188,7 +21747,7 @@ else else if test "$cf_cv_header_stdbool_h" = 1 ; then -echo "$as_me:19191: checking for size of bool" >&5 +echo "$as_me:21750: 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 @@ -19199,7 +21758,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 19202 "configure" +#line 21761 "configure" #include "confdefs.h" #include @@ -19223,7 +21782,7 @@ else #endif -int main() +int main(void) { FILE *fp = fopen("cf_test.out", "w"); if (fp != 0) { @@ -19241,15 +21800,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:19244: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21803: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19247: \$? = $ac_status" >&5 + echo "$as_me:21806: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19249: \"$ac_try\"") >&5 + { (eval echo "$as_me:21808: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19252: \$? = $ac_status" >&5 + echo "$as_me:21811: \$? = $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 @@ -19267,25 +21826,25 @@ fi fi rm -f cf_test.out -echo "$as_me:19270: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:21829: 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:19276: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:21835: 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:19282: checking for fallback type of bool" >&5 + echo "$as_me:21841: 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:19288: result: $cf_cv_type_of_bool" >&5 + echo "$as_me:21847: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 fi fi @@ -19314,24 +21873,62 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then if test "$cf_with_ada" != "no" ; then if test "$with_libtool" != "no"; then - { echo "$as_me:19317: WARNING: libtool does not support Ada - disabling feature" >&5 + { echo "$as_me:21876: 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 fi - if test "$cf_with_ada" != "no" ; then + if test "$cf_with_ada" != "no" ; then + +cf_ada_make=gnatmake +cf_ada_config="#" +# 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:21888: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_gnatmake_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$gnatmake_exists"; then + ac_cv_prog_gnatmake_exists="$gnatmake_exists" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_gnatmake_exists="yes" +echo "$as_me:21903: found $ac_dir/$ac_word" >&5 +break +done + + test -z "$ac_cv_prog_gnatmake_exists" && ac_cv_prog_gnatmake_exists="no" +fi +fi +gnatmake_exists=$ac_cv_prog_gnatmake_exists +if test -n "$gnatmake_exists"; then + echo "$as_me:21912: result: $gnatmake_exists" >&5 +echo "${ECHO_T}$gnatmake_exists" >&6 +else + echo "$as_me:21915: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi -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:19328: checking for $ac_word" >&5 +if test "$ac_cv_prog_gnatmake_exists" = no; then + cf_ada_make= + cf_cv_prog_gnat_correct=no +else + # Extract the first word of "gprconfig", so it can be a program name with args. +set dummy gprconfig; ac_word=$2 +echo "$as_me:21925: 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 +if test "${ac_cv_prog_gprconfig_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$gnat_exists"; then - ac_cv_prog_gnat_exists="$gnat_exists" # Let the user override the test. + if test -n "$gprconfig_exists"; then + ac_cv_prog_gprconfig_exists="$gprconfig_exists" # Let the user override the test. else ac_save_IFS=$IFS; IFS=$ac_path_separator ac_dummy="$PATH" @@ -19339,50 +21936,79 @@ for ac_dir in $ac_dummy; do IFS=$ac_save_IFS test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_gnat_exists="yes" -echo "$as_me:19343: found $ac_dir/$ac_word" >&5 +ac_cv_prog_gprconfig_exists="yes" +echo "$as_me:21940: found $ac_dir/$ac_word" >&5 break done - test -z "$ac_cv_prog_gnat_exists" && ac_cv_prog_gnat_exists="no" + test -z "$ac_cv_prog_gprconfig_exists" && ac_cv_prog_gprconfig_exists="no" fi fi -gnat_exists=$ac_cv_prog_gnat_exists -if test -n "$gnat_exists"; then - echo "$as_me:19352: result: $gnat_exists" >&5 -echo "${ECHO_T}$gnat_exists" >&6 +gprconfig_exists=$ac_cv_prog_gprconfig_exists +if test -n "$gprconfig_exists"; then + echo "$as_me:21949: result: $gprconfig_exists" >&5 +echo "${ECHO_T}$gprconfig_exists" >&6 else - echo "$as_me:19355: result: no" >&5 + echo "$as_me:21952: 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 -else + if test "$ac_cv_prog_gprconfig_exists" = yes + then + rm -rf conftest* *~conftest* + if mkdir conftest.src + then + cf_ada_config="" + cd conftest.src + for cf_gprconfig in Ada C + do + echo "$as_me:21965: checking for gprconfig name for $cf_gprconfig" >&5 +echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 + cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` + if test -n "$cf_gprconfig_value" + then + eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value + echo "$as_me:21971: result: $cf_gprconfig_value" >&5 +echo "${ECHO_T}$cf_gprconfig_value" >&6 + else + echo "$as_me:21974: result: missing" >&5 +echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break + fi + done + cd .. + rm -rf conftest* *~conftest* + fi + else + # gprconfig is newer than gnatmake; we can continue... + cf_ada_config="##" + fi + if test "x$cf_ada_config" != "x#" + then -echo "$as_me:19364: checking for gnat version" >&5 +echo "$as_me:21990: 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:19369: result: $cf_gnat_version" >&5 + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` +echo "$as_me:21995: 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:19377: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 +(*) + { echo "$as_me:22003: 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:19385: checking for $ac_word" >&5 +echo "$as_me:22011: 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 @@ -19397,7 +22023,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:19400: found $ac_dir/$ac_word" >&5 +echo "$as_me:22026: found $ac_dir/$ac_word" >&5 break done @@ -19406,19 +22032,19 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:19409: result: $M4_exists" >&5 + echo "$as_me:22035: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:19412: result: no" >&5 + echo "$as_me:22038: 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:19421: 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:22047: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf conftest* *~conftest* @@ -19446,46 +22072,63 @@ else fi rm -rf conftest* *~conftest* - echo "$as_me:19449: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:22075: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 - fi + fi + else + cf_cv_prog_gnat_correct=no + fi fi if test "x$cf_cv_prog_gnat_correct" = xyes; then ADAFLAGS="$ADAFLAGS -gnatpn" - echo "$as_me:19458: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:22087: 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:19475: result: $ADAFLAGS" >&5 + echo "$as_me:22104: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:19478: checking if GNAT supports generics" >&5 +echo "$as_me:22107: 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 +else + +cf_cv_gnatprep_opt_t=no +gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + +fi +echo "$as_me:22117: 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:22121: 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:19488: result: $cf_gnat_generics" >&5 +echo "$as_me:22131: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -19497,7 +22140,7 @@ else cf_generic_objects= fi -echo "$as_me:19500: checking if GNAT supports SIGINT" >&5 +echo "$as_me:22143: 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 @@ -19545,7 +22188,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:19548: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:22191: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test $cf_cv_gnat_sigint = yes ; then @@ -19554,64 +22197,26 @@ else USE_GNAT_SIGINT="#" fi -echo "$as_me:19557: checking if GNAT pragma Unreferenced works" >&5 -echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 -if test "${cf_cv_pragma_unreferenced+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -rm -rf conftest* *~conftest* -cat >>conftest.ads <>conftest.adb <&5 2>&1 ) ; then - cf_cv_pragma_unreferenced=yes -else - cf_cv_pragma_unreferenced=no -fi -rm -rf conftest* *~conftest* - -fi -echo "$as_me:19588: result: $cf_cv_pragma_unreferenced" >&5 -echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6 - -# if the pragma is supported, use it (needed in the Trace code). -if test $cf_cv_pragma_unreferenced = yes ; then - PRAGMA_UNREF=TRUE -else - PRAGMA_UNREF=FALSE -fi - cf_gnat_libraries=no cf_gnat_projects=no -echo "$as_me:19601: checking if GNAT supports project files" >&5 +if test "$enable_gnat_projects" != no ; then +echo "$as_me:22204: 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*) #(vi +(*) + case $cf_cv_system_name in + (cygwin*|msys*) ;; - *) - mkdir conftest.src conftest.bin conftest.lib - cd conftest.src + (*) rm -rf conftest* *~conftest* - cat >>library.gpr <>library.gpr <>confpackage.ads <>confpackage.ads <>confpackage.adb <>confpackage.adb <&5 2>&1 ) ; then - cf_gnat_projects=yes + if ( $cf_ada_make $ADAFLAGS \ + -Plibrary.gpr \ + -XBUILD_DIR=`cd ../conftest.bin;pwd` \ + -XLIBRARY_DIR=`cd ../conftest.lib;pwd` \ + -XSOURCE_DIR=`pwd` \ + -XSONAME=libConfTest.so.1 \ + -XLIB_KIND=static 1>&5 2>&1 ) ; then + cf_gnat_projects=yes + fi + cd .. fi - cd .. if test -f conftest.lib/confpackage.ali then cf_gnat_libraries=yes @@ -19666,14 +22264,15 @@ CF_EOF esac ;; esac -echo "$as_me:19669: result: $cf_gnat_projects" >&5 +echo "$as_me:22267: 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:19674: checking if GNAT supports libraries" >&5 + echo "$as_me:22273: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:19676: result: $cf_gnat_libraries" >&5 + echo "$as_me:22275: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -19693,7 +22292,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:19696: checking for ada-compiler" >&5 +echo "$as_me:22295: 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. @@ -19704,12 +22303,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:19707: result: $cf_ada_compiler" >&5 +echo "$as_me:22306: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:19712: checking for ada-include" >&5 +echo "$as_me:22311: 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. @@ -19721,43 +22320,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:19748: 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:22347: 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:19757: result: $ADA_INCLUDE" >&5 +echo "$as_me:22356: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:19760: checking for ada-objects" >&5 +echo "$as_me:22359: 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. @@ -19769,43 +22368,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:19796: 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:22395: 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:19805: result: $ADA_OBJECTS" >&5 +echo "$as_me:22404: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:19808: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:22407: 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. @@ -19815,7 +22414,7 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:19818: result: $with_ada_sharedlib" >&5 +echo "$as_me:22417: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 ADA_SHAREDLIB='lib$(LIB_NAME).so.1' @@ -19838,17 +22437,17 @@ fi # do this "late" to avoid conflict with header-checks if test "x$with_widec" = xyes ; then - echo "$as_me:19841: checking for wchar_t" >&5 + echo "$as_me:22440: 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 19847 "configure" +#line 22446 "configure" #include "confdefs.h" $ac_includes_default int -main () +main (void) { if ((wchar_t *) 0) return 0; @@ -19859,16 +22458,16 @@ if (sizeof (wchar_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19862: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22461: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19865: \$? = $ac_status" >&5 + echo "$as_me:22464: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19868: \"$ac_try\"") >&5 + { (eval echo "$as_me:22467: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19871: \$? = $ac_status" >&5 + echo "$as_me:22470: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_wchar_t=yes else @@ -19878,10 +22477,10 @@ ac_cv_type_wchar_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:19881: result: $ac_cv_type_wchar_t" >&5 +echo "$as_me:22480: result: $ac_cv_type_wchar_t" >&5 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 -echo "$as_me:19884: checking size of wchar_t" >&5 +echo "$as_me:22483: 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 @@ -19890,11 +22489,11 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 19893 "configure" +#line 22492 "configure" #include "confdefs.h" $ac_includes_default int -main () +main (void) { int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)] ; @@ -19902,25 +22501,25 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19905: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22504: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19908: \$? = $ac_status" >&5 + echo "$as_me:22507: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19911: \"$ac_try\"") >&5 + { (eval echo "$as_me:22510: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19914: \$? = $ac_status" >&5 + echo "$as_me:22513: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 19919 "configure" +#line 22518 "configure" #include "confdefs.h" $ac_includes_default int -main () +main (void) { int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] ; @@ -19928,16 +22527,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19931: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22530: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19934: \$? = $ac_status" >&5 + echo "$as_me:22533: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19937: \"$ac_try\"") >&5 + { (eval echo "$as_me:22536: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19940: \$? = $ac_status" >&5 + echo "$as_me:22539: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -19953,11 +22552,11 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 19956 "configure" +#line 22555 "configure" #include "confdefs.h" $ac_includes_default int -main () +main (void) { int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)] ; @@ -19965,16 +22564,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19968: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22567: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19971: \$? = $ac_status" >&5 + echo "$as_me:22570: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19974: \"$ac_try\"") >&5 + { (eval echo "$as_me:22573: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19977: \$? = $ac_status" >&5 + echo "$as_me:22576: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -19990,11 +22589,11 @@ 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 19993 "configure" +#line 22592 "configure" #include "confdefs.h" $ac_includes_default int -main () +main (void) { int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] ; @@ -20002,16 +22601,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20005: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22604: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20008: \$? = $ac_status" >&5 + echo "$as_me:22607: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20011: \"$ac_try\"") >&5 + { (eval echo "$as_me:22610: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20014: \$? = $ac_status" >&5 + echo "$as_me:22613: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -20024,16 +22623,16 @@ done ac_cv_sizeof_wchar_t=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:20027: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:22626: 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 20032 "configure" +#line 22631 "configure" #include "confdefs.h" $ac_includes_default int -main () +main (void) { FILE *f = fopen ("conftest.val", "w"); if (!f) @@ -20045,15 +22644,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:20048: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22647: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20051: \$? = $ac_status" >&5 + echo "$as_me:22650: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:20053: \"$ac_try\"") >&5 + { (eval echo "$as_me:22652: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20056: \$? = $ac_status" >&5 + echo "$as_me:22655: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_wchar_t=`cat conftest.val` else @@ -20069,7 +22668,7 @@ else ac_cv_sizeof_wchar_t=0 fi fi -echo "$as_me:20072: result: $ac_cv_sizeof_wchar_t" >&5 +echo "$as_me:22671: result: $ac_cv_sizeof_wchar_t" >&5 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 cat >>confdefs.h <&5 +echo "$as_me:22689: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -20115,11 +22714,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*) #(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 @@ -20128,26 +22728,19 @@ 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:20131: result: $LIB_SUBSETS" >&5 +echo "$as_me:22731: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated -if test "$GCC" != yes; then - CPPFLAGS="-I\${includedir} $CPPFLAGS" -elif test "$includedir" != "/usr/include"; then - if test "$includedir" = '${prefix}/include' ; then - if test $prefix != /usr ; then - CPPFLAGS="-I\${includedir} $CPPFLAGS" - fi - else - CPPFLAGS="-I\${includedir} $CPPFLAGS" - fi -fi if test "$srcdir" != "."; then CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS" fi -CPPFLAGS="-I. -I../include $CPPFLAGS" +CPPFLAGS="-I../include $CPPFLAGS" +if test "$srcdir" != "."; then + CPPFLAGS="-I\${srcdir} $CPPFLAGS" +fi +CPPFLAGS="-I. $CPPFLAGS" ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS" if test "$srcdir" != "."; then @@ -20157,7 +22750,7 @@ if test "$GCC" != yes; then ACPPFLAGS="$ACPPFLAGS -I\${includedir}" elif test "$includedir" != "/usr/include"; then if test "$includedir" = '${prefix}/include' ; then - if test $prefix != /usr ; then + if test x$prefix != x/usr ; then ACPPFLAGS="$ACPPFLAGS -I\${includedir}" fi else @@ -20166,99 +22759,102 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:20169: checking default library suffix" >&5 +echo "$as_me:22762: 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:20180: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:22773: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:20183: checking default library-dependency suffix" >&5 +echo "$as_me:22776: 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 - DFT_LIB_SUFFIX='.a' + (aix[5-7]*) + DFT_LIB_SUFFIX='.so' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; - cygwin*|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:20238: 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:22834: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:20241: checking default object directory" >&5 +echo "$as_me:22837: 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) #(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:20257: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:22853: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 if test "x$cf_with_cxx" = xyes ; then -echo "$as_me:20261: checking c++ library-dependency suffix" >&5 +echo "$as_me:22857: 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++) @@ -20269,61 +22865,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 - CXX_LIB_SUFFIX='.a' + (aix[5-7]*) + CXX_LIB_SUFFIX='.so' CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; - cygwin*|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:20326: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:22925: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -20350,38 +22949,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}" @@ -20397,9 +23007,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" @@ -20411,21 +23021,21 @@ 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*) - # "lib" files have ".dll.a" suffix, "cyg" files have ".dll" + case $cf_cv_system_name in + (cygwin*|msys*) + # "lib" files have ".dll.a" suffix, "cyg"or "msys-" files have ".dll" TINFO_SUFFIX=.dll ;; esac @@ -20439,47 +23049,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 ;; @@ -20488,19 +23098,19 @@ fi if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" then - echo "$as_me:20491: checking if linker supports switching between static/dynamic" >&5 + echo "$as_me:23101: 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:20500: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:23110: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20503: \$? = $ac_status" >&5 + echo "$as_me:23113: \$? = $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 @@ -20511,15 +23121,15 @@ EOF LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 20514 "configure" +#line 23124 "configure" #include "confdefs.h" -#line 20517 "configure" +#line 23127 "configure" #include int cf_ldflags_static(FILE *fp); int -main () +main (void) { return cf_ldflags_static(stdin); @@ -20529,24 +23139,24 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20532: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23142: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20535: \$? = $ac_status" >&5 + echo "$as_me:23145: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20538: \"$ac_try\"") >&5 + { (eval echo "$as_me:23148: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20541: \$? = $ac_status" >&5 + echo "$as_me:23151: \$? = $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 @@ -20561,7 +23171,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f libconftest.* LIBS="$cf_save_LIBS" - echo "$as_me:20564: result: $cf_ldflags_static" >&5 + echo "$as_me:23174: result: $cf_ldflags_static" >&5 echo "${ECHO_T}$cf_ldflags_static" >&6 if test $cf_ldflags_static != yes @@ -20577,20 +23187,25 @@ fi ;; esac -echo "$as_me:20580: checking where we will install curses.h" >&5 +echo "$as_me:23190: checking where we will install curses.h" >&5 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 -test "$with_overwrite" = no && \ -test "x$includedir" = 'x${prefix}/include' && \ - includedir='${prefix}/include/ncurses'${LIB_SUFFIX} -echo "$as_me:20585: result: $includedir" >&5 -echo "${ECHO_T}$includedir" >&6 + +includesubdir= +if test "$with_overwrite" = no && \ + ( test "x$includedir" = 'x${prefix}/include' || \ + test "x$includedir" = "x${prefix}/include" ) +then + includesubdir="/ncurses${USE_LIB_SUFFIX}" +fi +echo "$as_me:23200: result: ${includedir}${includesubdir}" >&5 +echo "${ECHO_T}${includedir}${includesubdir}" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications ### that will need libutf8 to add it to their configure script. if test "$with_overwrite" != no ; then if test "$NCURSES_LIBUTF8" = 1 ; then NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' - { echo "$as_me:20593: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:23208: 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 @@ -20608,7 +23223,7 @@ EOF ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:20611: checking for src modules" >&5 +echo "$as_me:23226: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -20618,11 +23233,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 @@ -20631,7 +23246,7 @@ do # We may/may not have tack in the distribution, though the # makefile is. if test $cf_dir = tack ; then - if test ! -f $srcdir/${cf_dir}/${cf_dir}.h; then + if test "x$cf_with_tack" != "xyes"; then continue fi fi @@ -20666,14 +23281,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:20676: result: $cf_cv_src_modules" >&5 +echo "$as_me:23291: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -20691,9 +23306,10 @@ done if test "x$cf_with_tests" != "xno" ; then SRC_SUBDIRS="$SRC_SUBDIRS test" fi -test -z "$MAKE_TERMINFO" && SRC_SUBDIRS="$SRC_SUBDIRS misc" +# 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 @@ -20724,8 +23340,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" @@ -20733,15 +23349,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) #(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 @@ -20758,7 +23374,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 @@ -20780,32 +23396,38 @@ 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 "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then - 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" | \ @@ -20814,21 +23436,29 @@ 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/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -20837,17 +23467,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 @@ -20858,6 +23494,12 @@ else HAVE_TCGETATTR=0 fi +if test "x$ac_cv_header_stdint_h" = xyes ; then + HAVE_STDINT_H=1 +else + HAVE_STDINT_H=0 +fi + if test "x$ac_cv_header_termio_h" = xyes ; then HAVE_TERMIO_H=1 else @@ -20875,18 +23517,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:20889: checking for $ac_word" >&5 +echo "$as_me:23528: 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 @@ -20903,7 +23542,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:20906: found $ac_dir/$ac_word" >&5 + echo "$as_me:23545: found $ac_dir/$ac_word" >&5 break fi done @@ -20915,10 +23554,10 @@ fi TIC_PATH=$ac_cv_path_TIC_PATH if test -n "$TIC_PATH"; then - echo "$as_me:20918: result: $TIC_PATH" >&5 + echo "$as_me:23557: result: $TIC_PATH" >&5 echo "${ECHO_T}$TIC_PATH" >&6 else - echo "$as_me:20921: result: no" >&5 + echo "$as_me:23560: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20926,7 +23565,7 @@ if test -n "$FALLBACK_LIST" then if test "$TIC_PATH" = unknown then - { echo "$as_me:20929: WARNING: no tic program found for fallbacks" >&5 + { echo "$as_me:23568: WARNING: no tic program found for fallbacks" >&5 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} fi fi @@ -20945,8 +23584,136 @@ 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 +(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}:23604: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 + + CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" + CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` + ;; + esac + ;; +esac + +# Help to automatically enable the extended curses features when using either +# the *-config or the ".pc" files by adding defines. +echo "$as_me:23615: 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:23631: 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 +(*short*) + cf_compatible=1 + ;; +(*) + cf_compatible=0 + ;; +esac + +cat >>confdefs.h <&6 + +echo "${as_me:-configure}:23688: 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)' + CHECK_BUILD="#" +else + ADAGEN_LDFLAGS='$(NATIVE_LDFLAGS)' + CHECK_BUILD= +fi + +cat >>confdefs.h <<\EOF +#define HAVE_CURSES_DATA_BOOLNAMES 1 +EOF + 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 @@ -21028,7 +23795,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:21031: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:23798: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -21160,7 +23927,7 @@ EOF cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:21207: error: ambiguous option: $1 + { { echo "$as_me:23974: 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;} @@ -21223,7 +23990,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:21226: error: unrecognized option: $1 + -*) { { echo "$as_me:23993: 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;} @@ -21242,7 +24009,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20121002, executed with +This file was extended by $as_me 2.52.20170501, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -21262,9 +24029,11 @@ cat >>$CONFIG_STATUS <&5 + *) { { echo "$as_me:24112: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -21426,6 +24202,11 @@ s,@cf_cv_abi_version@,$cf_cv_abi_version,;t t s,@cf_cv_builtin_bool@,$cf_cv_builtin_bool,;t t s,@cf_cv_header_stdbool_h@,$cf_cv_header_stdbool_h,;t t s,@cf_cv_type_of_bool@,$cf_cv_type_of_bool,;t t +s,@VERSION@,$VERSION,;t t +s,@VERSION_MAJOR@,$VERSION_MAJOR,;t t +s,@VERSION_MINOR@,$VERSION_MINOR,;t t +s,@VERSION_PATCH@,$VERSION_PATCH,;t t +s,@PACKAGE@,$PACKAGE,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t s,@build_vendor@,$build_vendor,;t t @@ -21458,9 +24239,12 @@ s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@LINT@,$LINT,;t t s,@LINT_OPTS@,$LINT_OPTS,;t t s,@LN_S@,$LN_S,;t t +s,@cf_config_suffix@,$cf_config_suffix,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t s,@PKG_CONFIG_LIBDIR@,$PKG_CONFIG_LIBDIR,;t t +s,@MAKE_PC_FILES@,$MAKE_PC_FILES,;t t +s,@PC_MODULE_SUFFIX@,$PC_MODULE_SUFFIX,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@CTAGS@,$CTAGS,;t t s,@ETAGS@,$ETAGS,;t t @@ -21486,6 +24270,7 @@ s,@BUILD_LIBS@,$BUILD_LIBS,;t t s,@BUILD_EXEEXT@,$BUILD_EXEEXT,;t t s,@BUILD_OBJEXT@,$BUILD_OBJEXT,;t t s,@cf_list_models@,$cf_list_models,;t t +s,@ABI_VERSION@,$ABI_VERSION,;t t s,@LIBTOOL_VERSION@,$LIBTOOL_VERSION,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@ac_ct_LIBTOOL@,$ac_ct_LIBTOOL,;t t @@ -21510,10 +24295,13 @@ s,@LIB_PREFIX@,$LIB_PREFIX,;t t s,@CC_G_OPT@,$CC_G_OPT,;t t s,@CXX_G_OPT@,$CXX_G_OPT,;t t s,@LD_MODEL@,$LD_MODEL,;t t +s,@shlibdir@,$shlibdir,;t t +s,@MAKE_DLLS@,$MAKE_DLLS,;t t s,@CC_SHARED_OPTS@,$CC_SHARED_OPTS,;t t s,@LD_RPATH_OPT@,$LD_RPATH_OPT,;t t s,@LD_SHARED_OPTS@,$LD_SHARED_OPTS,;t t s,@MK_SHARED_LIB@,$MK_SHARED_LIB,;t t +s,@RM_SHARED_OPTS@,$RM_SHARED_OPTS,;t t s,@LINK_PROGS@,$LINK_PROGS,;t t s,@LINK_TESTS@,$LINK_TESTS,;t t s,@EXTRA_LDFLAGS@,$EXTRA_LDFLAGS,;t t @@ -21521,7 +24309,12 @@ s,@LOCAL_LDFLAGS@,$LOCAL_LDFLAGS,;t t 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 @@ -21534,6 +24327,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 @@ -21544,10 +24338,14 @@ 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,@RGB_PATH@,$RGB_PATH,;t t +s,@no_x11_rgb@,$no_x11_rgb,;t t s,@NCURSES_BOOL@,$NCURSES_BOOL,;t t s,@TERMINFO_CAPS@,$TERMINFO_CAPS,;t t s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t s,@NCURSES_CCHARW_MAX@,$NCURSES_CCHARW_MAX,;t t +s,@NCURSES_SBOOL@,$NCURSES_SBOOL,;t t s,@NCURSES_TPARM_ARG@,$NCURSES_TPARM_ARG,;t t s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t @@ -21557,21 +24355,25 @@ s,@GENERATED_SP_FUNCS@,$GENERATED_SP_FUNCS,;t t s,@NCURSES_CONST@,$NCURSES_CONST,;t t 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 s,@SHOW_CC@,$SHOW_CC,;t t s,@ECHO_CC@,$ECHO_CC,;t t s,@ECHO_LINK@,$ECHO_LINK,;t t +s,@INSTALL_OPT_S@,$INSTALL_OPT_S,;t t +s,@INSTALL_OPT_O@,$INSTALL_OPT_O,;t t s,@ADAFLAGS@,$ADAFLAGS,;t t s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t s,@EXTRA_CXXFLAGS@,$EXTRA_CXXFLAGS,;t t @@ -21590,13 +24392,17 @@ s,@CXX_AR@,$CXX_AR,;t t s,@CXX_ARFLAGS@,$CXX_ARFLAGS,;t t s,@CXXLIBS@,$CXXLIBS,;t t s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t -s,@gnat_exists@,$gnat_exists,;t t +s,@gnatmake_exists@,$gnatmake_exists,;t t +s,@gprconfig_exists@,$gprconfig_exists,;t t s,@M4_exists@,$M4_exists,;t t s,@cf_ada_make@,$cf_ada_make,;t t +s,@cf_ada_config@,$cf_ada_config,;t t +s,@cf_ada_config_Ada@,$cf_ada_config_Ada,;t t +s,@cf_ada_config_C@,$cf_ada_config_C,;t t +s,@GNATPREP_OPTS@,$GNATPREP_OPTS,;t t s,@cf_compile_generics@,$cf_compile_generics,;t t s,@cf_generic_objects@,$cf_generic_objects,;t t s,@USE_GNAT_SIGINT@,$USE_GNAT_SIGINT,;t t -s,@PRAGMA_UNREF@,$PRAGMA_UNREF,;t t s,@USE_OLD_MAKERULES@,$USE_OLD_MAKERULES,;t t s,@USE_GNAT_PROJECTS@,$USE_GNAT_PROJECTS,;t t s,@USE_GNAT_LIBRARIES@,$USE_GNAT_LIBRARIES,;t t @@ -21611,6 +24417,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 @@ -21624,6 +24433,7 @@ s,@TINFO_LIBS@,$TINFO_LIBS,;t t s,@TINFO_LDFLAGS2@,$TINFO_LDFLAGS2,;t t s,@LDFLAGS_STATIC@,$LDFLAGS_STATIC,;t t s,@LDFLAGS_SHARED@,$LDFLAGS_SHARED,;t t +s,@includesubdir@,$includesubdir,;t t s,@WITH_OVERWRITE@,$WITH_OVERWRITE,;t t s,@TICS_LIST@,$TICS_LIST,;t t s,@TINFO_LIST@,$TINFO_LIST,;t t @@ -21638,9 +24448,9 @@ s,@ADA_SUBDIRS@,$ADA_SUBDIRS,;t t s,@DIRS_TO_MAKE@,$DIRS_TO_MAKE,;t t s,@NCURSES_SHLIB2@,$NCURSES_SHLIB2,;t t s,@HAVE_TCGETATTR@,$HAVE_TCGETATTR,;t t +s,@HAVE_STDINT_H@,$HAVE_STDINT_H,;t t s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t s,@HAVE_TERMIOS_H@,$HAVE_TERMIOS_H,;t t -s,@MAKE_PC_FILES@,$MAKE_PC_FILES,;t t s,@cross_compiling@,$cross_compiling,;t t s,@TIC_PATH@,$TIC_PATH,;t t s,@MAKE_TESTS@,$MAKE_TESTS,;t t @@ -21649,6 +24459,13 @@ 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 +s,@CHECK_BUILD@,$CHECK_BUILD,;t t CEOF EOF @@ -21677,10 +24494,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 @@ -21763,7 +24598,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:21766: creating $ac_file" >&5 + { echo "$as_me:24601: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -21781,7 +24616,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:21784: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24619: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -21794,7 +24629,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:21797: error: cannot find input file: $f" >&5 + { { echo "$as_me:24632: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -21810,7 +24645,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:21813: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:24648: 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;} @@ -21819,7 +24654,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:21822: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:24657: 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;} @@ -21856,7 +24691,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:21859: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:24694: 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;} @@ -21867,7 +24702,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:21870: WARNING: Some variables may not be substituted: + { echo "$as_me:24705: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -21916,7 +24751,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:21919: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:24754: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -21927,7 +24762,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:21930: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24765: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -21940,7 +24775,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:21943: error: cannot find input file: $f" >&5 + { { echo "$as_me:24778: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -21998,7 +24833,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:22001: $ac_file is unchanged" >&5 + { echo "$as_me:24836: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -22064,8 +24899,8 @@ fi cf_prefix=$LIB_PREFIX -case $cf_cv_shlib_version in #(vi -cygdll|mingw) +case $cf_cv_shlib_version in +(cygdll|msysdll|mingw) TINFO_NAME=$TINFO_ARG_SUFFIX TINFO_SUFFIX=.dll ;; @@ -22073,17 +24908,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 @@ -22096,98 +24931,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 - cf_suffix='.a' + (aix[5-7]*) + cf_suffix='.so' cf_depsuf=$cf_suffix ;; - cygwin*|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 @@ -22195,20 +25066,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}" ;; - mingw) + (msysdll) 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/msys-${cf_libname}${cf_cygsuf}" + ;; + (mingw) + cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` + 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 @@ -22221,20 +25103,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 @@ -22250,9 +25132,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 @@ -22292,83 +25174,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|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}:22299: testing overriding CXX_MODEL to SHARED ..." 1>&5 +echo "${as_me:-configure}:25181: 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 - cf_suffix='.a' + (aix[5-7]*) + cf_suffix='.so' cf_depsuf=$cf_suffix ;; - cygwin*|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) #(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 @@ -22377,24 +25262,24 @@ echo "${as_me:-configure}:22299: 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 @@ -22415,22 +25300,27 @@ echo "${as_me:-configure}:22299: 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 @@ -22495,7 +25385,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 @@ -22537,12 +25427,20 @@ CF_EOF fi done +if test "x$cf_with_db_install" = xyes; then cat >> Makefile <> Makefile <> Makefile <> Makefile <headers.sh <>headers.sh </<\$END\/\$NAME>/" >> \$TMPSED done ;; -*) +(*) echo "" >> \$TMPSED ;; esac @@ -22618,7 +25514,7 @@ CF_EOF else cat >>headers.sh </<\$END\/\$NAME>/" >> \$TMPSED done ;; -*) +(*) echo "s///" >> \$TMPSED ;; esac