X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fconfigure;h=5266abbc2d4a64b9b9963db9b5724d9680b3922e;hp=52a6cb6e79dba68919c45d7d2faeaab420d6b6ff;hb=119b5a6788c26bf7dcc99fcfd54e072946352a93;hpb=bca50d0d8592defee6c584fdedd25f4b1a31345b diff --git a/test/configure b/test/configure index 52a6cb6e..5266abbc 100755 --- a/test/configure +++ b/test/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20170501. +# Generated by Autoconf 2.52.20190901. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -139,6 +139,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' @@ -281,6 +282,15 @@ do | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) localstatedir=$ac_optarg ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst \ + | --runs | --run | --ru) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* \ + | --runs=* | --run=* | --ru=*) + runstatedir=$ac_optarg ;; + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) ac_prev=mandir ;; -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) @@ -618,6 +628,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR extra definition of runtime data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -654,8 +665,9 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --enable-string-hacks work around bogus compiler/loader warnings General Options: + --disable-stripping do not strip (debug info) installed executables + --enable-string-hacks work around bogus compiler/loader warnings --with-pkg-config{=path} enable/disable use of pkg-config --disable-echo do not display "compiling" commands Curses Version-dependent Options: @@ -753,7 +765,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.20170501. Invocation command line was +generated by GNU Autoconf 2.52.20190901. Invocation command line was $ $0 $@ @@ -877,7 +889,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:880: loading site script $ac_site_file" >&5 + { echo "$as_me:892: 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" @@ -888,7 +900,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:891: loading cache $cache_file" >&5 + { echo "$as_me:903: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -896,7 +908,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:899: creating cache $cache_file" >&5 + { echo "$as_me:911: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -912,21 +924,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:915: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:927: 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:919: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:931: 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:925: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:937: 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:927: former value: $ac_old_val" >&5 + { echo "$as_me:939: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:929: current value: $ac_new_val" >&5 + { echo "$as_me:941: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -945,9 +957,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if $ac_cache_corrupted; then - { echo "$as_me:948: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:960: 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:950: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:962: 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 @@ -968,10 +980,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:971: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:983: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:974: \$? = $ac_status" >&5 + echo "$as_me:986: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -1003,7 +1015,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1006: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1018: 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 @@ -1013,11 +1025,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:1016: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1028: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1020: checking build system type" >&5 +echo "$as_me:1032: 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 @@ -1026,16 +1038,16 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1029: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1041: 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:1033: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1045: 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:1038: result: $ac_cv_build" >&5 +echo "$as_me:1050: 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/'` @@ -1043,7 +1055,7 @@ build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then - echo "$as_me:1046: checking host system type" >&5 + echo "$as_me:1058: 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 @@ -1052,12 +1064,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:1055: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1067: 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:1060: result: $ac_cv_host" >&5 +echo "$as_me:1072: 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/'` @@ -1083,13 +1095,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1086: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1098: 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:1090: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1102: 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:1092: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1104: 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 @@ -1107,7 +1119,7 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed -echo "$as_me:1110: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:1122: 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 @@ -1127,11 +1139,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1130: result: yes" >&5 + echo "$as_me:1142: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1134: result: no" >&5 + echo "$as_me:1146: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -1145,7 +1157,7 @@ ac_main_return=return if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1148: checking for $ac_word" >&5 +echo "$as_me:1160: 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 @@ -1160,7 +1172,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}gcc" -echo "$as_me:1163: found $ac_dir/$ac_word" >&5 +echo "$as_me:1175: found $ac_dir/$ac_word" >&5 break done @@ -1168,10 +1180,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1171: result: $CC" >&5 + echo "$as_me:1183: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1174: result: no" >&5 + echo "$as_me:1186: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1180,7 +1192,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1183: checking for $ac_word" >&5 +echo "$as_me:1195: 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 @@ -1195,7 +1207,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="gcc" -echo "$as_me:1198: found $ac_dir/$ac_word" >&5 +echo "$as_me:1210: found $ac_dir/$ac_word" >&5 break done @@ -1203,10 +1215,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1206: result: $ac_ct_CC" >&5 + echo "$as_me:1218: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1209: result: no" >&5 + echo "$as_me:1221: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1219,7 +1231,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1222: checking for $ac_word" >&5 +echo "$as_me:1234: 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 @@ -1234,7 +1246,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}cc" -echo "$as_me:1237: found $ac_dir/$ac_word" >&5 +echo "$as_me:1249: found $ac_dir/$ac_word" >&5 break done @@ -1242,10 +1254,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1245: result: $CC" >&5 + echo "$as_me:1257: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1248: result: no" >&5 + echo "$as_me:1260: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1254,7 +1266,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1257: checking for $ac_word" >&5 +echo "$as_me:1269: 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 @@ -1269,7 +1281,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="cc" -echo "$as_me:1272: found $ac_dir/$ac_word" >&5 +echo "$as_me:1284: found $ac_dir/$ac_word" >&5 break done @@ -1277,10 +1289,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1280: result: $ac_ct_CC" >&5 + echo "$as_me:1292: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1283: result: no" >&5 + echo "$as_me:1295: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1293,7 +1305,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1296: checking for $ac_word" >&5 +echo "$as_me:1308: 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 @@ -1313,7 +1325,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then continue fi ac_cv_prog_CC="cc" -echo "$as_me:1316: found $ac_dir/$ac_word" >&5 +echo "$as_me:1328: found $ac_dir/$ac_word" >&5 break done @@ -1335,10 +1347,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1338: result: $CC" >&5 + echo "$as_me:1350: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1341: result: no" >&5 + echo "$as_me:1353: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1349,7 +1361,7 @@ if test -z "$CC"; 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:1352: checking for $ac_word" >&5 +echo "$as_me:1364: 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 @@ -1364,7 +1376,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:1367: found $ac_dir/$ac_word" >&5 +echo "$as_me:1379: found $ac_dir/$ac_word" >&5 break done @@ -1372,10 +1384,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1375: result: $CC" >&5 + echo "$as_me:1387: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1378: result: no" >&5 + echo "$as_me:1390: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1388,7 +1400,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:1391: checking for $ac_word" >&5 +echo "$as_me:1403: 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 @@ -1403,7 +1415,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:1406: found $ac_dir/$ac_word" >&5 +echo "$as_me:1418: found $ac_dir/$ac_word" >&5 break done @@ -1411,10 +1423,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1414: result: $ac_ct_CC" >&5 + echo "$as_me:1426: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1417: result: no" >&5 + echo "$as_me:1429: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1426,32 +1438,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1429: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1441: 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:1434:" \ +echo "$as_me:1446:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1437: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1449: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1440: \$? = $ac_status" >&5 + echo "$as_me:1452: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1442: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1454: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1445: \$? = $ac_status" >&5 + echo "$as_me:1457: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1447: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1459: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1450: \$? = $ac_status" >&5 + echo "$as_me:1462: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1454 "configure" +#line 1466 "configure" #include "confdefs.h" int @@ -1467,13 +1479,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:1470: checking for C compiler default output" >&5 +echo "$as_me:1482: 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:1473: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1485: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1476: \$? = $ac_status" >&5 + echo "$as_me:1488: \$? = $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 @@ -1496,34 +1508,34 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1499: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1511: 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:1505: result: $ac_file" >&5 +echo "$as_me:1517: 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:1510: checking whether the C compiler works" >&5 +echo "$as_me:1522: 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:1516: \"$ac_try\"") >&5 + { (eval echo "$as_me:1528: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1519: \$? = $ac_status" >&5 + echo "$as_me:1531: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1526: error: cannot run C compiled programs. + { { echo "$as_me:1538: 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;} @@ -1531,24 +1543,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1534: result: yes" >&5 +echo "$as_me:1546: 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:1541: checking whether we are cross compiling" >&5 +echo "$as_me:1553: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1543: result: $cross_compiling" >&5 +echo "$as_me:1555: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1546: checking for executable suffix" >&5 +echo "$as_me:1558: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1548: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1560: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1551: \$? = $ac_status" >&5 + echo "$as_me:1563: \$? = $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 @@ -1564,25 +1576,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1567: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1579: 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:1573: result: $ac_cv_exeext" >&5 +echo "$as_me:1585: 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:1579: checking for object suffix" >&5 +echo "$as_me:1591: 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 1585 "configure" +#line 1597 "configure" #include "confdefs.h" int @@ -1594,10 +1606,10 @@ main (void) } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1597: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1609: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1600: \$? = $ac_status" >&5 + echo "$as_me:1612: \$? = $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 @@ -1609,24 +1621,24 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1612: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1624: 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:1619: result: $ac_cv_objext" >&5 +echo "$as_me:1631: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1623: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1635: 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 1629 "configure" +#line 1641 "configure" #include "confdefs.h" int @@ -1641,16 +1653,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1644: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1656: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1647: \$? = $ac_status" >&5 + echo "$as_me:1659: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1650: \"$ac_try\"") >&5 + { (eval echo "$as_me:1662: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1653: \$? = $ac_status" >&5 + echo "$as_me:1665: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1662,19 +1674,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1665: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1677: 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:1671: checking whether $CC accepts -g" >&5 +echo "$as_me:1683: 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 1677 "configure" +#line 1689 "configure" #include "confdefs.h" int @@ -1686,16 +1698,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1689: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1701: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1692: \$? = $ac_status" >&5 + echo "$as_me:1704: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1695: \"$ac_try\"") >&5 + { (eval echo "$as_me:1707: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1698: \$? = $ac_status" >&5 + echo "$as_me:1710: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1705,7 +1717,7 @@ ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1708: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1720: 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 @@ -1732,16 +1744,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1735: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1747: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1738: \$? = $ac_status" >&5 + echo "$as_me:1750: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1741: \"$ac_try\"") >&5 + { (eval echo "$as_me:1753: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1744: \$? = $ac_status" >&5 + echo "$as_me:1756: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1753,7 +1765,7 @@ if { (eval echo "$as_me:1735: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1756 "configure" +#line 1768 "configure" #include "confdefs.h" #include $ac_declaration @@ -1766,16 +1778,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1769: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1781: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1772: \$? = $ac_status" >&5 + echo "$as_me:1784: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1775: \"$ac_try\"") >&5 + { (eval echo "$as_me:1787: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1778: \$? = $ac_status" >&5 + echo "$as_me:1790: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1785,7 +1797,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1788 "configure" +#line 1800 "configure" #include "confdefs.h" $ac_declaration int @@ -1797,16 +1809,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1800: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1812: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1803: \$? = $ac_status" >&5 + echo "$as_me:1815: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1806: \"$ac_try\"") >&5 + { (eval echo "$as_me:1818: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1809: \$? = $ac_status" >&5 + echo "$as_me:1821: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -1836,15 +1848,117 @@ ac_main_return=return GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:1839: checking version of $CC" >&5 + echo "$as_me:1851: 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:1843: result: $GCC_VERSION" >&5 + echo "$as_me:1855: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi -echo "$as_me:1847: checking for $CC option to accept ANSI C" >&5 +INTEL_COMPILER=no + +if test "$GCC" = yes ; then + case $host_os in + (linux*|gnu*) + echo "$as_me:1864: 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 1869 "configure" +#include "confdefs.h" + +int +main (void) +{ + +#ifdef __INTEL_COMPILER +#else +make an error +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:1886: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:1889: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:1892: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:1895: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + INTEL_COMPILER=yes +cf_save_CFLAGS="$cf_save_CFLAGS -we147" + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$cf_save_CFLAGS" + echo "$as_me:1906: result: $INTEL_COMPILER" >&5 +echo "${ECHO_T}$INTEL_COMPILER" >&6 + ;; + esac +fi + +CLANG_COMPILER=no + +if test "$GCC" = yes ; then + echo "$as_me:1915: 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 1920 "configure" +#include "confdefs.h" + +int +main (void) +{ + +#ifdef __clang__ +#else +make an error +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:1937: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:1940: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:1943: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:1946: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + CLANG_COMPILER=yes +cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$cf_save_CFLAGS" + echo "$as_me:1957: result: $CLANG_COMPILER" >&5 +echo "${ECHO_T}$CLANG_COMPILER" >&6 +fi + +echo "$as_me:1961: 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 @@ -1852,7 +1966,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 1855 "configure" +#line 1969 "configure" #include "confdefs.h" #include #include @@ -1901,16 +2015,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:1904: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2018: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1907: \$? = $ac_status" >&5 + echo "$as_me:2021: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1910: \"$ac_try\"") >&5 + { (eval echo "$as_me:2024: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1913: \$? = $ac_status" >&5 + echo "$as_me:2027: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -1927,10 +2041,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:1930: result: none needed" >&5 + echo "$as_me:2044: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:1933: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2047: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -1938,14 +2052,133 @@ esac # This should have been defined by AC_PROG_CC : ${CC:=cc} -echo "$as_me:1941: checking \$CC variable" >&5 +echo "$as_me:2055: checking \$CFLAGS variable" >&5 +echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 +case "x$CFLAGS" in +(*-[IUD]*) + echo "$as_me:2059: result: broken" >&5 +echo "${ECHO_T}broken" >&6 + { echo "$as_me:2061: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 +echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} + cf_flags="$CFLAGS" + CFLAGS= + for cf_arg in $cf_flags + do + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_arg +do +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case $cf_add_cflags in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + + done + ;; +(*) + echo "$as_me:2169: result: ok" >&5 +echo "${ECHO_T}ok" >&6 + ;; +esac + +echo "$as_me:2174: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in (*[\ \ ]-*) - echo "$as_me:1945: result: broken" >&5 + echo "$as_me:2178: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:1947: 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;} + { echo "$as_me:2180: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 +echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'` @@ -2061,24 +2294,24 @@ fi done test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 -echo "${as_me:-configure}:2064: testing resulting CC: '$CC' ..." 1>&5 +echo "${as_me:-configure}:2297: testing resulting CC: '$CC' ..." 1>&5 test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 -echo "${as_me:-configure}:2068: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2301: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 -echo "${as_me:-configure}:2072: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2305: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; (*) - echo "$as_me:2076: result: ok" >&5 + echo "$as_me:2309: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2081: checking for inline" >&5 +echo "$as_me:2314: 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 @@ -2086,7 +2319,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 2089 "configure" +#line 2322 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -2095,16 +2328,16 @@ $ac_kw int foo () {return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2098: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2331: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2101: \$? = $ac_status" >&5 + echo "$as_me:2334: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2104: \"$ac_try\"") >&5 + { (eval echo "$as_me:2337: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2107: \$? = $ac_status" >&5 + echo "$as_me:2340: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -2115,7 +2348,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:2118: result: $ac_cv_c_inline" >&5 +echo "$as_me:2351: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -2136,7 +2369,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:2139: checking how to run the C preprocessor" >&5 +echo "$as_me:2372: 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 @@ -2157,18 +2390,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 2160 "configure" +#line 2393 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2165: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2398: \"$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:2171: \$? = $ac_status" >&5 + echo "$as_me:2404: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2191,17 +2424,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 2194 "configure" +#line 2427 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2198: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2431: \"$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:2204: \$? = $ac_status" >&5 + echo "$as_me:2437: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2238,7 +2471,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2241: result: $CPP" >&5 +echo "$as_me:2474: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2248,18 +2481,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 2251 "configure" +#line 2484 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2256: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2489: \"$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:2262: \$? = $ac_status" >&5 + echo "$as_me:2495: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2282,17 +2515,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 2285 "configure" +#line 2518 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2289: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2522: \"$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:2295: \$? = $ac_status" >&5 + echo "$as_me:2528: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2320,7 +2553,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:2323: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2556: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2336,7 +2569,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:2339: checking for $ac_word" >&5 +echo "$as_me:2572: 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 @@ -2351,7 +2584,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:2354: found $ac_dir/$ac_word" >&5 +echo "$as_me:2587: found $ac_dir/$ac_word" >&5 break done @@ -2359,10 +2592,10 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:2362: result: $AWK" >&5 + echo "$as_me:2595: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:2365: result: no" >&5 + echo "$as_me:2598: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2381,7 +2614,7 @@ done # 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:2384: checking for a BSD compatible install" >&5 +echo "$as_me:2617: 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 @@ -2430,7 +2663,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2433: result: $INSTALL" >&5 +echo "$as_me:2666: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2451,11 +2684,93 @@ case $INSTALL in ;; esac +echo "$as_me:2687: 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:2704: 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 + +: ${INSTALL:=install} +echo "$as_me:2715: checking if install accepts -p option" >&5 +echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6 +if test "${cf_cv_install_p+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + rm -rf conftest* + date >conftest.in + mkdir conftest.out + sleep 3 + if $INSTALL -p conftest.in conftest.out 2>/dev/null + then + if test -f conftest.out/conftest.in + then + test conftest.in -nt conftest.out/conftest.in 2>conftest.err && \ + test conftest.out/conftest.in -nt conftest.in 2>conftest.err + if test -s conftest.err + then + cf_cv_install_p=no + else + cf_cv_install_p=yes + fi + else + cf_cv_install_p=no + fi + else + cf_cv_install_p=no + fi + rm -rf conftest* + +fi +echo "$as_me:2746: result: $cf_cv_install_p" >&5 +echo "${ECHO_T}$cf_cv_install_p" >&6 + +echo "$as_me:2749: 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:2760: 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 + 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:2458: checking for $ac_word" >&5 +echo "$as_me:2773: 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 @@ -2470,7 +2785,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:2473: found $ac_dir/$ac_word" >&5 +echo "$as_me:2788: found $ac_dir/$ac_word" >&5 break done @@ -2478,17 +2793,17 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:2481: result: $LINT" >&5 + echo "$as_me:2796: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:2484: result: no" >&5 + echo "$as_me:2799: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$LINT" && break done -echo "$as_me:2491: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:2806: 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 @@ -2515,7 +2830,7 @@ else fi fi -echo "$as_me:2518: result: $cf_cv_mixedcase" >&5 +echo "$as_me:2833: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -2526,7 +2841,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:2529: checking for $ac_word" >&5 +echo "$as_me:2844: 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 @@ -2541,7 +2856,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:2544: found $ac_dir/$ac_word" >&5 +echo "$as_me:2859: found $ac_dir/$ac_word" >&5 break done @@ -2549,10 +2864,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:2552: result: $CTAGS" >&5 + echo "$as_me:2867: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:2555: result: no" >&5 + echo "$as_me:2870: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2563,7 +2878,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:2566: checking for $ac_word" >&5 +echo "$as_me:2881: 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 @@ -2578,7 +2893,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:2581: found $ac_dir/$ac_word" >&5 +echo "$as_me:2896: found $ac_dir/$ac_word" >&5 break done @@ -2586,10 +2901,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:2589: result: $ETAGS" >&5 + echo "$as_me:2904: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:2592: result: no" >&5 + echo "$as_me:2907: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2598,7 +2913,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:2601: checking for $ac_word" >&5 +echo "$as_me:2916: 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 @@ -2613,7 +2928,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:2616: found $ac_dir/$ac_word" >&5 +echo "$as_me:2931: found $ac_dir/$ac_word" >&5 break done @@ -2622,17 +2937,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:2625: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:2940: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:2628: result: no" >&5 + echo "$as_me:2943: 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:2635: checking for $ac_word" >&5 +echo "$as_me:2950: 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 @@ -2647,7 +2962,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:2650: found $ac_dir/$ac_word" >&5 +echo "$as_me:2965: found $ac_dir/$ac_word" >&5 break done @@ -2656,10 +2971,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:2659: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:2974: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:2662: result: no" >&5 + echo "$as_me:2977: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2679,14 +2994,14 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:2682: checking if -lm needed for math functions" >&5 +echo "$as_me:2997: 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 2689 "configure" +#line 3004 "configure" #include "confdefs.h" #include @@ -2702,16 +3017,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:2705: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3020: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2708: \$? = $ac_status" >&5 + echo "$as_me:3023: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2711: \"$ac_try\"") >&5 + { (eval echo "$as_me:3026: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2714: \$? = $ac_status" >&5 + echo "$as_me:3029: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_libm=no else @@ -2721,7 +3036,7 @@ cf_cv_need_libm=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:2724: result: $cf_cv_need_libm" >&5 +echo "$as_me:3039: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes then @@ -2780,10 +3095,10 @@ cat > conftest.i <&5 + { echo "$as_me:3098: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:3150: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2838: \$? = $ac_status" >&5 + echo "$as_me:3153: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:2840: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:3155: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in @@ -2896,7 +3211,7 @@ fi rm -rf conftest* fi -echo "$as_me:2899: checking if you want to work around bogus compiler/loader warnings" >&5 +echo "$as_me:3214: 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. @@ -2906,7 +3221,7 @@ if test "${enable_string_hacks+set}" = set; then else with_string_hacks=no fi; -echo "$as_me:2909: result: $with_string_hacks" >&5 +echo "$as_me:3224: result: $with_string_hacks" >&5 echo "${ECHO_T}$with_string_hacks" >&6 if test "x$with_string_hacks" = "xyes"; then @@ -2915,55 +3230,55 @@ cat >>confdefs.h <<\EOF #define USE_STRING_HACKS 1 EOF - { echo "$as_me:2918: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + { echo "$as_me:3233: 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:2920: checking for strlcat" >&5 + echo "$as_me:3235: 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 2926 "configure" +#line 3241 "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. */ +#define strlcat autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef strlcat + #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) (); +char strlcat (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_strlcat) || defined (__stub___strlcat) -choke me -#else -f = strlcat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for strlcat #endif + return strlcat (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2957: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3272: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2960: \$? = $ac_status" >&5 + echo "$as_me:3275: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2963: \"$ac_try\"") >&5 + { (eval echo "$as_me:3278: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2966: \$? = $ac_status" >&5 + echo "$as_me:3281: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_strlcat=yes else @@ -2973,7 +3288,7 @@ ac_cv_func_strlcat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:2976: result: $ac_cv_func_strlcat" >&5 +echo "$as_me:3291: result: $ac_cv_func_strlcat" >&5 echo "${ECHO_T}$ac_cv_func_strlcat" >&6 if test $ac_cv_func_strlcat = yes; then @@ -2983,7 +3298,7 @@ EOF else - echo "$as_me:2986: checking for strlcat in -lbsd" >&5 + echo "$as_me:3301: checking for strlcat in -lbsd" >&5 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2991,7 +3306,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2994 "configure" +#line 3309 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3010,16 +3325,16 @@ strlcat (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3013: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3328: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3016: \$? = $ac_status" >&5 + echo "$as_me:3331: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3019: \"$ac_try\"") >&5 + { (eval echo "$as_me:3334: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3022: \$? = $ac_status" >&5 + echo "$as_me:3337: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_strlcat=yes else @@ -3030,46 +3345,46 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3033: result: $ac_cv_lib_bsd_strlcat" >&5 +echo "$as_me:3348: result: $ac_cv_lib_bsd_strlcat" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 if test $ac_cv_lib_bsd_strlcat = yes; then -cf_add_libs="-lbsd" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lbsd; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" for ac_header in bsd/string.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3056: checking for $ac_header" >&5 +echo "$as_me:3371: 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 3062 "configure" +#line 3377 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3066: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3381: \"$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:3072: \$? = $ac_status" >&5 + echo "$as_me:3387: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3088,7 +3403,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:3091: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:3406: 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:3427: 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 3118 "configure" +#line 3433 "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. */ +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + #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) (); +char $ac_func (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for $ac_func #endif + return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3149: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3464: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3152: \$? = $ac_status" >&5 + echo "$as_me:3467: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3155: \"$ac_try\"") >&5 + { (eval echo "$as_me:3470: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3158: \$? = $ac_status" >&5 + echo "$as_me:3473: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -3165,7 +3480,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:3168: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:3483: 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 the POSIX test-macros are already defined... $ECHO_C" >&6 +if test "${cf_cv_posix_visible+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat >conftest.$ac_ext <<_ACEOF +#line 3502 "configure" +#include "confdefs.h" +#include +int +main (void) +{ + +#if defined(__POSIX_VISIBLE) && ((__POSIX_VISIBLE - 0L) > 0) \ + && defined(__XSI_VISIBLE) && ((__XSI_VISIBLE - 0L) > 0) \ + && defined(__BSD_VISIBLE) && ((__BSD_VISIBLE - 0L) > 0) \ + && defined(__ISO_C_VISIBLE) && ((__ISO_C_VISIBLE - 0L) > 0) +#error conflicting symbols found +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3521: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3524: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3527: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3530: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_visible=no +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_posix_visible=yes +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:3541: result: $cf_cv_posix_visible" >&5 +echo "${ECHO_T}$cf_cv_posix_visible" >&6 + +if test "$cf_cv_posix_visible" = no; then + +cf_XOPEN_SOURCE=600 +cf_POSIX_C_SOURCE=199506L +cf_xopen_source= case $host_os in (aix[4-7]*) @@ -3195,7 +3561,7 @@ case $host_os in cf_xopen_source="-D_DARWIN_C_SOURCE" cf_XOPEN_SOURCE= ;; -(freebsd*|dragonfly*) +(freebsd*|dragonfly*|midnightbsd*) # 5.x headers associate # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L @@ -3215,71 +3581,436 @@ case $host_os in ;; (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) -echo "$as_me:3218: checking if we must define _GNU_SOURCE" >&5 +cf_gnu_xopen_source=$cf_XOPEN_SOURCE + +echo "$as_me:3586: checking if this is the GNU C library" >&5 +echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 +if test "${cf_cv_gnu_library+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat >conftest.$ac_ext <<_ACEOF +#line 3593 "configure" +#include "confdefs.h" +#include +int +main (void) +{ + + #if __GLIBC__ > 0 && __GLIBC_MINOR__ >= 0 + return 0; + #elif __NEWLIB__ > 0 && __NEWLIB_MINOR__ >= 0 + return 0; + #else + # error not GNU C library + #endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3612: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3615: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3618: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3621: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_library=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_gnu_library=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:3632: result: $cf_cv_gnu_library" >&5 +echo "${ECHO_T}$cf_cv_gnu_library" >&6 + +if test x$cf_cv_gnu_library = xyes; then + + # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE + # was changed to help a little. newlib incorporated the change about 4 + # years later. + echo "$as_me:3640: checking if _DEFAULT_SOURCE can be used as a basis" >&5 +echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 +if test "${cf_cv_gnu_library_219+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cf_save="$CPPFLAGS" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + + cat >conftest.$ac_ext <<_ACEOF +#line 3652 "configure" +#include "confdefs.h" +#include +int +main (void) +{ + + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19) || (__GLIBC__ > 2) + return 0; + #elif (__NEWLIB__ == 2 && __NEWLIB_MINOR__ >= 4) || (__GLIBC__ > 3) + return 0; + #else + # error GNU C library __GLIBC__.__GLIBC_MINOR__ is too old + #endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3671: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3674: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3677: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3680: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_library_219=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_gnu_library_219=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="$cf_save" + +fi +echo "$as_me:3692: result: $cf_cv_gnu_library_219" >&5 +echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 + + if test "x$cf_cv_gnu_library_219" = xyes; then + cf_save="$CPPFLAGS" + echo "$as_me:3697: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 +echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 +if test "${cf_cv_gnu_dftsrc_219+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source +do +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case $cf_add_cflags in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + + cat >conftest.$ac_ext <<_ACEOF +#line 3802 "configure" +#include "confdefs.h" + + #include + #include + +int +main (void) +{ + + #if (_XOPEN_SOURCE >= $cf_gnu_xopen_source) && (MB_LEN_MAX > 1) + return 0; + #else + # error GNU C library is too old + #endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3822: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3825: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3828: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3831: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_dftsrc_219=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_gnu_dftsrc_219=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:3842: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 + test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" + else + cf_cv_gnu_dftsrc_219=maybe + fi + + if test "x$cf_cv_gnu_dftsrc_219" != xyes; then + + echo "$as_me:3851: 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 3225 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 3858 "configure" #include "confdefs.h" #include int main (void) { -#ifndef _XOPEN_SOURCE -make an error -#endif + #ifndef _XOPEN_SOURCE + #error expected _XOPEN_SOURCE to be defined + #endif ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3240: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3873: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3243: \$? = $ac_status" >&5 + echo "$as_me:3876: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3246: \"$ac_try\"") >&5 + { (eval echo "$as_me:3879: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3249: \$? = $ac_status" >&5 + echo "$as_me:3882: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - cat >conftest.$ac_ext <<_ACEOF -#line 3258 "configure" + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in -D_GNU_SOURCE +do +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case $cf_add_cflags in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + + cat >conftest.$ac_ext <<_ACEOF +#line 3989 "configure" #include "confdefs.h" #include int main (void) { -#ifdef _XOPEN_SOURCE -make an error -#endif + #ifdef _XOPEN_SOURCE + #error expected _XOPEN_SOURCE to be undefined + #endif ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3273: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4004: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3276: \$? = $ac_status" >&5 + echo "$as_me:4007: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3279: \"$ac_try\"") >&5 + { (eval echo "$as_me:4010: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3282: \$? = $ac_status" >&5 + echo "$as_me:4013: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -3288,50 +4019,52 @@ cat conftest.$ac_ext >&5 cf_cv_gnu_source=yes fi rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$cf_save" + CPPFLAGS="$cf_save" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3297: result: $cf_cv_gnu_source" >&5 +echo "$as_me:4028: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 -if test "$cf_cv_gnu_source" = yes -then -echo "$as_me:3302: checking if we should also define _DEFAULT_SOURCE" >&5 + if test "$cf_cv_gnu_source" = yes + then + echo "$as_me:4033: 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 3310 "configure" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" + + cat >conftest.$ac_ext <<_ACEOF +#line 4043 "configure" #include "confdefs.h" #include int main (void) { -#ifdef _DEFAULT_SOURCE -make an error -#endif + #ifdef _DEFAULT_SOURCE + #error expected _DEFAULT_SOURCE to be undefined + #endif ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3325: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4058: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3328: \$? = $ac_status" >&5 + echo "$as_me:4061: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3331: \"$ac_try\"") >&5 + { (eval echo "$as_me:4064: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3334: \$? = $ac_status" >&5 + echo "$as_me:4067: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_default_source=no else @@ -3342,9 +4075,18 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3345: result: $cf_cv_default_source" >&5 +echo "$as_me:4078: 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" + if test "$cf_cv_default_source" = yes + then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + + fi + fi + fi + fi ;; @@ -3355,6 +4097,8 @@ fi # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks and other headers which use u_int / u_short types cf_XOPEN_SOURCE= +if test "$cf_cv_posix_visible" = no; then + cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE cf_save_CFLAGS="$CFLAGS" @@ -3368,16 +4112,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:3371: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:4115: 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}:3377: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:4121: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3380 "configure" +#line 4124 "configure" #include "confdefs.h" #include int @@ -3392,16 +4136,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3395: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4139: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3398: \$? = $ac_status" >&5 + echo "$as_me:4142: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3401: \"$ac_try\"") >&5 + { (eval echo "$as_me:4145: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3404: \$? = $ac_status" >&5 + echo "$as_me:4148: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -3422,7 +4166,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 3425 "configure" +#line 4169 "configure" #include "confdefs.h" #include int @@ -3437,16 +4181,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3440: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4184: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3443: \$? = $ac_status" >&5 + echo "$as_me:4187: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3446: \"$ac_try\"") >&5 + { (eval echo "$as_me:4190: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3449: \$? = $ac_status" >&5 + echo "$as_me:4193: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3457,15 +4201,18 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:3460: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:4204: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" - CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" + CPPFLAGS="$cf_trim_CPPFLAGS" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:3465: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:4212: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3468 "configure" +#line 4215 "configure" #include "confdefs.h" #include int @@ -3480,16 +4227,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3483: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4230: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3486: \$? = $ac_status" >&5 + echo "$as_me:4233: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3489: \"$ac_try\"") >&5 + { (eval echo "$as_me:4236: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3492: \$? = $ac_status" >&5 + echo "$as_me:4239: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3505,7 +4252,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3508: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:4255: 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 @@ -3612,6 +4359,8 @@ fi fi +fi # cf_cv_posix_visible + ;; (netbsd*) cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw @@ -3643,14 +4392,14 @@ fi ;; (*) -echo "$as_me:3646: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:4395: 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 3653 "configure" +#line 4402 "configure" #include "confdefs.h" #include @@ -3669,25 +4418,28 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3672: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4421: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3675: \$? = $ac_status" >&5 + echo "$as_me:4424: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3678: \"$ac_try\"") >&5 + { (eval echo "$as_me:4427: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3681: \$? = $ac_status" >&5 + echo "$as_me:4430: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + cat >conftest.$ac_ext <<_ACEOF -#line 3690 "configure" +#line 4442 "configure" #include "confdefs.h" #include @@ -3706,16 +4458,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3709: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4461: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3712: \$? = $ac_status" >&5 + echo "$as_me:4464: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3715: \"$ac_try\"") >&5 + { (eval echo "$as_me:4467: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3718: \$? = $ac_status" >&5 + echo "$as_me:4470: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3730,7 +4482,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3733: result: $cf_cv_xopen_source" >&5 +echo "$as_me:4485: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -3845,6 +4597,8 @@ fi fi +if test "$cf_cv_posix_visible" = no; then + cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE cf_save_CFLAGS="$CFLAGS" @@ -3858,16 +4612,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:3861: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:4615: 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}:3867: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:4621: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3870 "configure" +#line 4624 "configure" #include "confdefs.h" #include int @@ -3882,16 +4636,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3885: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4639: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3888: \$? = $ac_status" >&5 + echo "$as_me:4642: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3891: \"$ac_try\"") >&5 + { (eval echo "$as_me:4645: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3894: \$? = $ac_status" >&5 + echo "$as_me:4648: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -3912,7 +4666,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 3915 "configure" +#line 4669 "configure" #include "confdefs.h" #include int @@ -3927,16 +4681,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3930: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4684: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3933: \$? = $ac_status" >&5 + echo "$as_me:4687: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3936: \"$ac_try\"") >&5 + { (eval echo "$as_me:4690: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3939: \$? = $ac_status" >&5 + echo "$as_me:4693: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3947,15 +4701,18 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:3950: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:4704: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" - CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" + CPPFLAGS="$cf_trim_CPPFLAGS" -echo "${as_me:-configure}:3955: testing if the second compile does not leave our definition intact error ..." 1>&5 + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +echo "${as_me:-configure}:4712: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3958 "configure" +#line 4715 "configure" #include "confdefs.h" #include int @@ -3970,16 +4727,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3973: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4730: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3976: \$? = $ac_status" >&5 + echo "$as_me:4733: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3979: \"$ac_try\"") >&5 + { (eval echo "$as_me:4736: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3982: \$? = $ac_status" >&5 + echo "$as_me:4739: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3995,7 +4752,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3998: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:4755: 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 @@ -4102,6 +4859,8 @@ fi fi +fi # cf_cv_posix_visible + ;; esac @@ -4187,7 +4946,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:4190: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:4949: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -4197,7 +4956,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:4200: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:4959: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -4207,7 +4966,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:4210: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:4969: 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" @@ -4217,10 +4976,10 @@ fi fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:4220: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:4979: 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 4223 "configure" +#line 4982 "configure" #include "confdefs.h" #include int @@ -4235,16 +4994,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4238: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4997: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4241: \$? = $ac_status" >&5 + echo "$as_me:5000: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4244: \"$ac_try\"") >&5 + { (eval echo "$as_me:5003: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4247: \$? = $ac_status" >&5 + echo "$as_me:5006: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -4253,12 +5012,12 @@ cat conftest.$ac_ext >&5 cf_XOPEN_SOURCE_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:4256: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:5015: 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 4261 "configure" +#line 5020 "configure" #include "confdefs.h" #include int @@ -4273,16 +5032,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4276: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5035: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4279: \$? = $ac_status" >&5 + echo "$as_me:5038: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4282: \"$ac_try\"") >&5 + { (eval echo "$as_me:5041: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4285: \$? = $ac_status" >&5 + echo "$as_me:5044: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -4293,19 +5052,19 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext if test $cf_XOPEN_SOURCE_set_ok = no then - { echo "$as_me:4296: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:5055: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:4301: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:5060: 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 4308 "configure" +#line 5067 "configure" #include "confdefs.h" #include @@ -4324,25 +5083,28 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4327: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5086: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4330: \$? = $ac_status" >&5 + echo "$as_me:5089: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4333: \"$ac_try\"") >&5 + { (eval echo "$as_me:5092: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4336: \$? = $ac_status" >&5 + echo "$as_me:5095: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + cat >conftest.$ac_ext <<_ACEOF -#line 4345 "configure" +#line 5107 "configure" #include "confdefs.h" #include @@ -4361,16 +5123,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4364: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5126: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4367: \$? = $ac_status" >&5 + echo "$as_me:5129: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4370: \"$ac_try\"") >&5 + { (eval echo "$as_me:5132: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4373: \$? = $ac_status" >&5 + echo "$as_me:5135: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -4385,7 +5147,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4388: result: $cf_cv_xopen_source" >&5 +echo "$as_me:5150: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -4502,8 +5264,9 @@ fi fi fi +fi # cf_cv_posix_visible -echo "$as_me:4506: checking for signal global datatype" >&5 +echo "$as_me:5269: 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 @@ -4515,7 +5278,7 @@ else "int" do cat >conftest.$ac_ext <<_ACEOF -#line 4518 "configure" +#line 5281 "configure" #include "confdefs.h" #include @@ -4538,16 +5301,16 @@ signal(SIGINT, handler); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4541: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5304: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4544: \$? = $ac_status" >&5 + echo "$as_me:5307: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4547: \"$ac_try\"") >&5 + { (eval echo "$as_me:5310: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4550: \$? = $ac_status" >&5 + echo "$as_me:5313: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -4561,7 +5324,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4564: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:5327: 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:5336: 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 4580 "configure" +#line 5343 "configure" #include "confdefs.h" #include @@ -4592,23 +5355,23 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4595: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5358: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4598: \$? = $ac_status" >&5 + echo "$as_me:5361: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4601: \"$ac_try\"") >&5 + { (eval echo "$as_me:5364: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4604: \$? = $ac_status" >&5 + echo "$as_me:5367: \$? = $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 4611 "configure" +#line 5374 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -4626,16 +5389,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4629: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5392: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4632: \$? = $ac_status" >&5 + echo "$as_me:5395: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4635: \"$ac_try\"") >&5 + { (eval echo "$as_me:5398: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4638: \$? = $ac_status" >&5 + echo "$as_me:5401: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=maybe else @@ -4649,11 +5412,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4652: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:5415: 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:4656: checking for actual SIGWINCH definition" >&5 +echo "$as_me:5419: 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 @@ -4664,7 +5427,7 @@ cf_sigwinch=32 while test $cf_sigwinch != 1 do cat >conftest.$ac_ext <<_ACEOF -#line 4667 "configure" +#line 5430 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -4686,16 +5449,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4689: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5452: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4692: \$? = $ac_status" >&5 + echo "$as_me:5455: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4695: \"$ac_try\"") >&5 + { (eval echo "$as_me:5458: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4698: \$? = $ac_status" >&5 + echo "$as_me:5461: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -4709,7 +5472,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1` done fi -echo "$as_me:4712: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:5475: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -4719,13 +5482,13 @@ fi # Checks for CODESET support. -echo "$as_me:4722: checking for nl_langinfo and CODESET" >&5 +echo "$as_me:5485: 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 4728 "configure" +#line 5491 "configure" #include "confdefs.h" #include int @@ -4737,16 +5500,16 @@ char* cs = nl_langinfo(CODESET); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4740: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5503: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4743: \$? = $ac_status" >&5 + echo "$as_me:5506: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4746: \"$ac_try\"") >&5 + { (eval echo "$as_me:5509: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4749: \$? = $ac_status" >&5 + echo "$as_me:5512: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else @@ -4757,7 +5520,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4760: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:5523: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test $am_cv_langinfo_codeset = yes; then @@ -4767,7 +5530,7 @@ EOF fi -echo "$as_me:4770: checking if you want to use pkg-config" >&5 +echo "$as_me:5533: 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. @@ -4777,7 +5540,7 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:4780: result: $cf_pkg_config" >&5 +echo "$as_me:5543: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 case $cf_pkg_config in @@ -4789,7 +5552,7 @@ case $cf_pkg_config in if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:4792: checking for $ac_word" >&5 +echo "$as_me:5555: 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 @@ -4806,7 +5569,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:4809: found $ac_dir/$ac_word" >&5 + echo "$as_me:5572: found $ac_dir/$ac_word" >&5 break fi done @@ -4817,10 +5580,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:4820: result: $PKG_CONFIG" >&5 + echo "$as_me:5583: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:4823: result: no" >&5 + echo "$as_me:5586: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4829,7 +5592,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:4832: checking for $ac_word" >&5 +echo "$as_me:5595: 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 @@ -4846,7 +5609,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:4849: found $ac_dir/$ac_word" >&5 + echo "$as_me:5612: found $ac_dir/$ac_word" >&5 break fi done @@ -4858,10 +5621,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:4861: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:5624: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:4864: result: no" >&5 + echo "$as_me:5627: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4904,18 +5667,18 @@ case ".$PKG_CONFIG" in PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:4907: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:5670: 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:4914: WARNING: pkg-config is not installed" >&5 + { echo "$as_me:5677: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi -echo "$as_me:4918: checking if you want to see long compiling messages" >&5 +echo "$as_me:5681: 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. @@ -4949,10 +5712,10 @@ else ECHO_CC='' fi; -echo "$as_me:4952: result: $enableval" >&5 +echo "$as_me:5715: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:4955: checking for ncurses wrap-prefix" >&5 +echo "$as_me:5718: checking for ncurses wrap-prefix" >&5 echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6 # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given. @@ -4962,10 +5725,10 @@ if test "${with_ncurses_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; -echo "$as_me:4965: result: $NCURSES_WRAP_PREFIX" >&5 +echo "$as_me:5728: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 -echo "$as_me:4968: checking if you want to check for wide-character functions" >&5 +echo "$as_me:5731: checking if you want to check for wide-character functions" >&5 echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -4982,10 +5745,10 @@ else cf_enable_widec=yes fi; -echo "$as_me:4985: result: $cf_enable_widec" >&5 +echo "$as_me:5748: result: $cf_enable_widec" >&5 echo "${ECHO_T}$cf_enable_widec" >&6 -echo "$as_me:4988: checking for specific curses-directory" >&5 +echo "$as_me:5751: checking for specific curses-directory" >&5 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 # Check whether --with-curses-dir or --without-curses-dir was given. @@ -4995,7 +5758,7 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:4998: result: $cf_cv_curses_dir" >&5 +echo "$as_me:5761: result: $cf_cv_curses_dir" >&5 echo "${ECHO_T}$cf_cv_curses_dir" >&6 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) @@ -5026,7 +5789,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:5029: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:5792: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -5057,9 +5820,12 @@ if test -n "$cf_cv_curses_dir/include" ; then if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF -#line 5062 "configure" +#line 5828 "configure" #include "confdefs.h" #include int @@ -5071,16 +5837,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5074: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5840: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5077: \$? = $ac_status" >&5 + echo "$as_me:5843: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5080: \"$ac_try\"") >&5 + { (eval echo "$as_me:5846: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5083: \$? = $ac_status" >&5 + echo "$as_me:5849: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -5097,7 +5863,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}:5100: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5866: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5133,7 +5899,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:5136: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:5902: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5146,7 +5912,7 @@ fi cf_cv_screen=curses -echo "$as_me:5149: checking for specified curses library type" >&5 +echo "$as_me:5915: checking for specified curses library type" >&5 echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6 # Check whether --with-screen or --without-screen was given. @@ -5190,13 +5956,13 @@ fi; fi; fi; -echo "$as_me:5193: result: $cf_cv_screen" >&5 +echo "$as_me:5959: result: $cf_cv_screen" >&5 echo "${ECHO_T}$cf_cv_screen" >&6 case $cf_cv_screen in (curses|curses_*) -echo "$as_me:5199: checking for extra include directories" >&5 +echo "$as_me:5965: checking for extra include directories" >&5 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6 if test "${cf_cv_curses_incdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5222,11 +5988,17 @@ case $host_os in esac fi -echo "$as_me:5225: result: $cf_cv_curses_incdir" >&5 +echo "$as_me:5991: result: $cf_cv_curses_incdir" >&5 echo "${ECHO_T}$cf_cv_curses_incdir" >&6 -test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir" +if test "$cf_cv_curses_incdir" != no +then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_curses_incdir" -echo "$as_me:5229: checking if we have identified curses headers" >&5 +fi + +echo "$as_me:6001: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5238,7 +6010,7 @@ for cf_header in \ curses.h ncurses/ncurses.h ncurses/curses.h do cat >conftest.$ac_ext <<_ACEOF -#line 5241 "configure" +#line 6013 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -5250,16 +6022,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5253: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6025: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5256: \$? = $ac_status" >&5 + echo "$as_me:6028: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5259: \"$ac_try\"") >&5 + { (eval echo "$as_me:6031: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5262: \$? = $ac_status" >&5 + echo "$as_me:6034: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -5270,11 +6042,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:5273: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:6045: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:5277: error: No curses header-files found" >&5 + { { echo "$as_me:6049: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -5284,23 +6056,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5287: checking for $ac_header" >&5 +echo "$as_me:6059: 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 5293 "configure" +#line 6065 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5297: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:6069: \"$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:5303: \$? = $ac_status" >&5 + echo "$as_me:6075: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5319,7 +6091,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5322: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:6094: 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:6104: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5347,7 +6119,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 5350 "configure" +#line 6122 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -5362,16 +6134,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5365: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6137: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5368: \$? = $ac_status" >&5 + echo "$as_me:6140: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5371: \"$ac_try\"") >&5 + { (eval echo "$as_me:6143: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5374: \$? = $ac_status" >&5 + echo "$as_me:6146: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -5387,7 +6159,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:5390: result: $cf_cv_term_header" >&5 +echo "$as_me:6162: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -5419,7 +6191,7 @@ EOF ;; esac -echo "$as_me:5422: checking for ncurses version" >&5 +echo "$as_me:6194: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5445,10 +6217,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:5448: \"$cf_try\"") >&5 + { (eval echo "$as_me:6220: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:5451: \$? = $ac_status" >&5 + echo "$as_me:6223: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -5458,7 +6230,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 5461 "configure" +#line 6233 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -5483,15 +6255,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5486: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6258: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5489: \$? = $ac_status" >&5 + echo "$as_me:6261: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5491: \"$ac_try\"") >&5 + { (eval echo "$as_me:6263: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5494: \$? = $ac_status" >&5 + echo "$as_me:6266: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -5505,17 +6277,17 @@ fi rm -f $cf_tempfile fi -echo "$as_me:5508: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:6280: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:5515: checking if we have identified curses libraries" >&5 +echo "$as_me:6287: checking if we have identified curses libraries" >&5 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 5518 "configure" +#line 6290 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -5527,16 +6299,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5530: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6302: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5533: \$? = $ac_status" >&5 + echo "$as_me:6305: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5536: \"$ac_try\"") >&5 + { (eval echo "$as_me:6308: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5539: \$? = $ac_status" >&5 + echo "$as_me:6311: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -5545,13 +6317,13 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:5548: result: $cf_result" >&5 +echo "$as_me:6320: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then case $host_os in (freebsd*) - echo "$as_me:5554: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:6326: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5559,7 +6331,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5562 "configure" +#line 6334 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5578,16 +6350,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5581: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6353: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5584: \$? = $ac_status" >&5 + echo "$as_me:6356: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5587: \"$ac_try\"") >&5 + { (eval echo "$as_me:6359: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5590: \$? = $ac_status" >&5 + echo "$as_me:6362: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -5598,23 +6370,23 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5601: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:6373: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then -cf_add_libs="-lmytinfo" -# 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lmytinfo; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -5628,7 +6400,7 @@ fi # term.h) for cur_colr if test "x$cf_cv_screen" = "xcurses_colr" then - echo "$as_me:5631: checking for initscr in -lcur_colr" >&5 + echo "$as_me:6403: checking for initscr in -lcur_colr" >&5 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5636,7 +6408,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcur_colr $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5639 "configure" +#line 6411 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5655,16 +6427,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5658: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6430: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5661: \$? = $ac_status" >&5 + echo "$as_me:6433: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5664: \"$ac_try\"") >&5 + { (eval echo "$as_me:6436: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5667: \$? = $ac_status" >&5 + echo "$as_me:6439: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cur_colr_initscr=yes else @@ -5675,23 +6447,23 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5678: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "$as_me:6450: result: $ac_cv_lib_cur_colr_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 if test $ac_cv_lib_cur_colr_initscr = yes; then -cf_add_libs="-lcur_colr" -# 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lcur_colr; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -5699,7 +6471,7 @@ LIBS="$cf_add_libs" else - echo "$as_me:5702: checking for initscr in -lHcurses" >&5 + echo "$as_me:6474: checking for initscr in -lHcurses" >&5 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5707,7 +6479,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lHcurses $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5710 "configure" +#line 6482 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5726,16 +6498,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5729: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6501: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5732: \$? = $ac_status" >&5 + echo "$as_me:6504: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5735: \"$ac_try\"") >&5 + { (eval echo "$as_me:6507: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5738: \$? = $ac_status" >&5 + echo "$as_me:6510: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Hcurses_initscr=yes else @@ -5746,29 +6518,31 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5749: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "$as_me:6521: result: $ac_cv_lib_Hcurses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6 if test $ac_cv_lib_Hcurses_initscr = yes; then # HP's header uses __HP_CURSES, but user claims _HP_CURSES. -cf_add_libs="-lHcurses" -# 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lHcurses; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" - CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D__HP_CURSES -D_HP_CURSES" + ac_cv_func_initscr=yes fi @@ -5802,7 +6576,7 @@ if test -n "/lib64" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:5805: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6579: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5831,7 +6605,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:5834: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6608: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5862,7 +6636,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:5865: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6639: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5897,7 +6671,7 @@ if test -n "/usr/5lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:5900: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6674: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5905,19 +6679,19 @@ echo "${as_me:-configure}:5900: testing adding $cf_add_libdir to library-path .. done fi -cf_add_libs="-lcurses -ltermcap" -# 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lcurses -ltermcap; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -5941,53 +6715,53 @@ if test ".$ac_cv_func_initscr" != .yes ; then # because it may be needed to link the test-case for initscr. if test "x$cf_term_lib" = x then - echo "$as_me:5944: checking for tgoto" >&5 + echo "$as_me:6718: checking for tgoto" >&5 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6 if test "${ac_cv_func_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5950 "configure" +#line 6724 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char tgoto (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define tgoto autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef tgoto + #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 tgoto (); -char (*f) (); +char tgoto (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_tgoto) || defined (__stub___tgoto) -choke me -#else -f = tgoto; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for tgoto #endif + return tgoto (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5981: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6755: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5984: \$? = $ac_status" >&5 + echo "$as_me:6758: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5987: \"$ac_try\"") >&5 + { (eval echo "$as_me:6761: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5990: \$? = $ac_status" >&5 + echo "$as_me:6764: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_tgoto=yes else @@ -5997,7 +6771,7 @@ ac_cv_func_tgoto=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6000: result: $ac_cv_func_tgoto" >&5 +echo "$as_me:6774: result: $ac_cv_func_tgoto" >&5 echo "${ECHO_T}$ac_cv_func_tgoto" >&6 if test $ac_cv_func_tgoto = yes; then cf_term_lib=predefined @@ -6006,7 +6780,7 @@ else for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` -echo "$as_me:6009: checking for tgoto in -l$cf_term_lib" >&5 +echo "$as_me:6783: checking for tgoto in -l$cf_term_lib" >&5 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6014,7 +6788,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_term_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6017 "configure" +#line 6791 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6033,16 +6807,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6036: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6810: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6039: \$? = $ac_status" >&5 + echo "$as_me:6813: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6042: \"$ac_try\"") >&5 + { (eval echo "$as_me:6816: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6045: \$? = $ac_status" >&5 + echo "$as_me:6819: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -6053,7 +6827,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6056: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:6830: 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 @@ -6076,10 +6850,10 @@ fi do LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then - echo "$as_me:6079: checking if we can link with $cf_curs_lib library" >&5 + echo "$as_me:6853: checking if we can link with $cf_curs_lib library" >&5 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 6082 "configure" +#line 6856 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6091,16 +6865,16 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6094: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6868: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6097: \$? = $ac_status" >&5 + echo "$as_me:6871: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6100: \"$ac_try\"") >&5 + { (eval echo "$as_me:6874: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6103: \$? = $ac_status" >&5 + echo "$as_me:6877: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -6109,16 +6883,16 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:6112: result: $cf_result" >&5 + echo "$as_me:6886: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test $cf_result = yes && break elif test "$cf_curs_lib" = "$cf_term_lib" ; then cf_result=no elif test "$cf_term_lib" != predefined ; then - echo "$as_me:6118: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + echo "$as_me:6892: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 6121 "configure" +#line 6895 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6130,16 +6904,16 @@ initscr(); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6133: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6907: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6136: \$? = $ac_status" >&5 + echo "$as_me:6910: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6139: \"$ac_try\"") >&5 + { (eval echo "$as_me:6913: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6142: \$? = $ac_status" >&5 + echo "$as_me:6916: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=no else @@ -6148,7 +6922,7 @@ cat conftest.$ac_ext >&5 LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6151 "configure" +#line 6925 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6160,16 +6934,16 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6163: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6937: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6166: \$? = $ac_status" >&5 + echo "$as_me:6940: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6169: \"$ac_try\"") >&5 + { (eval echo "$as_me:6943: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6172: \$? = $ac_status" >&5 + echo "$as_me:6946: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -6181,13 +6955,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:6184: result: $cf_result" >&5 + echo "$as_me:6958: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test $cf_result != error && break fi done fi - test $cf_curs_lib = unknown && { { echo "$as_me:6190: error: no curses library found" >&5 + test $cf_curs_lib = unknown && { { echo "$as_me:6964: error: no curses library found" >&5 echo "$as_me: error: no curses library found" >&2;} { (exit 1); exit 1; }; } fi @@ -6196,7 +6970,7 @@ fi ;; (ncursesw*) -echo "$as_me:6199: checking for multibyte character support" >&5 +echo "$as_me:6973: 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 @@ -6204,7 +6978,7 @@ else cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6207 "configure" +#line 6981 "configure" #include "confdefs.h" #include @@ -6217,16 +6991,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6220: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6994: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6223: \$? = $ac_status" >&5 + echo "$as_me:6997: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6226: \"$ac_try\"") >&5 + { (eval echo "$as_me:7000: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6229: \$? = $ac_status" >&5 + echo "$as_me:7003: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_utf8_lib=yes else @@ -6238,12 +7012,12 @@ cat conftest.$ac_ext >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:6241: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:7015: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6246 "configure" +#line 7020 "configure" #include "confdefs.h" #include @@ -6256,16 +7030,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6259: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7033: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6262: \$? = $ac_status" >&5 + echo "$as_me:7036: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6265: \"$ac_try\"") >&5 + { (eval echo "$as_me:7039: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6268: \$? = $ac_status" >&5 + echo "$as_me:7042: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -6279,7 +7053,7 @@ cat conftest.$ac_ext >&5 LIBS="-lutf8 $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6282 "configure" +#line 7056 "configure" #include "confdefs.h" #include @@ -6292,16 +7066,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6295: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7069: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6298: \$? = $ac_status" >&5 + echo "$as_me:7072: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6301: \"$ac_try\"") >&5 + { (eval echo "$as_me:7075: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6304: \$? = $ac_status" >&5 + echo "$as_me:7078: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -6318,9 +7092,9 @@ cat conftest.$ac_ext >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:6321: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:7095: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:6323: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:7097: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -6411,11 +7185,15 @@ cf_search="$cf_search $cf_header_path_list" if test -d $cf_cv_header_path_utf8 ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:6414: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7188: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" - CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" cat >conftest.$ac_ext <<_ACEOF -#line 6418 "configure" +#line 7196 "configure" #include "confdefs.h" #include @@ -6428,21 +7206,21 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6431: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7209: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6434: \$? = $ac_status" >&5 + echo "$as_me:7212: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6437: \"$ac_try\"") >&5 + { (eval echo "$as_me:7215: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6440: \$? = $ac_status" >&5 + echo "$as_me:7218: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:6445: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7223: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -6460,7 +7238,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:6463: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:7241: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -6535,13 +7313,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d $cf_cv_library_path_utf8 ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:6538: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7316: 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 6544 "configure" +#line 7322 "configure" #include "confdefs.h" #include @@ -6554,21 +7332,21 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6557: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7335: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6560: \$? = $ac_status" >&5 + echo "$as_me:7338: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6563: \"$ac_try\"") >&5 + { (eval echo "$as_me:7341: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6566: \$? = $ac_status" >&5 + echo "$as_me:7344: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:6571: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7349: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -6610,7 +7388,7 @@ fi fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6613: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:7391: 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 @@ -6643,9 +7421,12 @@ if test -n "$cf_cv_header_path_utf8" ; then if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF -#line 6648 "configure" +#line 7429 "configure" #include "confdefs.h" #include int @@ -6657,16 +7438,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6660: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7441: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6663: \$? = $ac_status" >&5 + echo "$as_me:7444: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6666: \"$ac_try\"") >&5 + { (eval echo "$as_me:7447: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6669: \$? = $ac_status" >&5 + echo "$as_me:7450: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6683,7 +7464,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}:6686: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7467: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6719,7 +7500,7 @@ if test -n "$cf_cv_library_path_utf8" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6722: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7503: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6727,19 +7508,19 @@ echo "${as_me:-configure}:6722: testing adding $cf_add_libdir to library-path .. done fi -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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_cv_library_file_utf8; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -6749,39 +7530,135 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:6752: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:7533: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:6755: result: yes" >&5 + echo "$as_me:7536: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:6758: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:7539: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`" +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= -cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS +for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root` do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case $cf_add_cflags in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$PKG_CONFIG --libs $cf_ncuconfig_root`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 6784 "configure" +#line 7661 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6793,37 +7670,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6796: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7673: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6799: \$? = $ac_status" >&5 + echo "$as_me:7676: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6802: \"$ac_try\"") >&5 + { (eval echo "$as_me:7679: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6805: \$? = $ac_status" >&5 + echo "$as_me:7682: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 6811 "configure" +#line 7688 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6818: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7695: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6821: \$? = $ac_status" >&5 + echo "$as_me:7698: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6823: \"$ac_try\"") >&5 + { (eval echo "$as_me:7700: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6826: \$? = $ac_status" >&5 + echo "$as_me:7703: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_have_ncuconfig=yes else @@ -6840,7 +7717,7 @@ cat conftest.$ac_ext >&5 cf_have_ncuconfig=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:6843: result: $cf_have_ncuconfig" >&5 + echo "$as_me:7720: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -6856,7 +7733,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:6859: checking for terminfo header" >&5 +echo "$as_me:7736: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6874,7 +7751,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 6877 "configure" +#line 7754 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -6889,16 +7766,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6892: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7769: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6895: \$? = $ac_status" >&5 + echo "$as_me:7772: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6898: \"$ac_try\"") >&5 + { (eval echo "$as_me:7775: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6901: \$? = $ac_status" >&5 + echo "$as_me:7778: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -6914,7 +7791,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:6917: result: $cf_cv_term_header" >&5 +echo "$as_me:7794: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -6949,7 +7826,7 @@ esac fi else - echo "$as_me:6952: result: no" >&5 + echo "$as_me:7829: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -6965,7 +7842,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:6968: checking for $ac_word" >&5 +echo "$as_me:7845: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6980,7 +7857,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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:6983: found $ac_dir/$ac_word" >&5 +echo "$as_me:7860: found $ac_dir/$ac_word" >&5 break done @@ -6988,10 +7865,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:6991: result: $NCURSES_CONFIG" >&5 + echo "$as_me:7868: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:6994: result: no" >&5 + echo "$as_me:7871: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7004,7 +7881,7 @@ if test -z "$NCURSES_CONFIG"; 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:7007: checking for $ac_word" >&5 +echo "$as_me:7884: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7019,7 +7896,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_NCURSES_CONFIG="$ac_prog" -echo "$as_me:7022: found $ac_dir/$ac_word" >&5 +echo "$as_me:7899: found $ac_dir/$ac_word" >&5 break done @@ -7027,10 +7904,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:7030: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:7907: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:7033: result: no" >&5 + echo "$as_me:7910: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7038,32 +7915,128 @@ fi done test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" - NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG + NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG +fi + + if test "$NCURSES_CONFIG" != none ; then + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in `$NCURSES_CONFIG --cflags` +do +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case $cf_add_cflags in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + fi - if test "$NCURSES_CONFIG" != none ; then +if test -n "$cf_new_extra_cppflags" ; then - CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" -cf_add_libs="`$NCURSES_CONFIG --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 +fi + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:7066: checking if we have identified curses headers" >&5 +echo "$as_me:8039: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7075,7 +8048,7 @@ for cf_header in \ curses.h $cf_cv_screen/curses.h do cat >conftest.$ac_ext <<_ACEOF -#line 7078 "configure" +#line 8051 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -7087,16 +8060,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7090: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8063: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7093: \$? = $ac_status" >&5 + echo "$as_me:8066: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7096: \"$ac_try\"") >&5 + { (eval echo "$as_me:8069: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7099: \$? = $ac_status" >&5 + echo "$as_me:8072: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -7107,11 +8080,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:7110: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:8083: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:7114: error: No curses header-files found" >&5 + { { echo "$as_me:8087: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -7121,23 +8094,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:7124: checking for $ac_header" >&5 +echo "$as_me:8097: 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 7130 "configure" +#line 8103 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:7134: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:8107: \"$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:7140: \$? = $ac_status" >&5 + echo "$as_me:8113: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7156,7 +8129,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:7159: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:8132: 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 <conftest.$ac_ext <<_ACEOF -#line 7212 "configure" +#line 8188 "configure" #include "confdefs.h" #include int @@ -7221,16 +8197,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7224: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8200: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7227: \$? = $ac_status" >&5 + echo "$as_me:8203: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7230: \"$ac_try\"") >&5 + { (eval echo "$as_me:8206: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7233: \$? = $ac_status" >&5 + echo "$as_me:8209: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7247,7 +8223,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}:7250: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8226: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7266,7 +8242,7 @@ fi } -echo "$as_me:7269: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:8245: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7278,7 +8254,7 @@ else do cat >conftest.$ac_ext <<_ACEOF -#line 7281 "configure" +#line 8257 "configure" #include "confdefs.h" #include <$cf_header> @@ -7302,16 +8278,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7305: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8281: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7308: \$? = $ac_status" >&5 + echo "$as_me:8284: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7311: \"$ac_try\"") >&5 + { (eval echo "$as_me:8287: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7314: \$? = $ac_status" >&5 + echo "$as_me:8290: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -7326,14 +8302,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:7329: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:8305: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:7336: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:8312: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7449,9 +8425,12 @@ if test -n "$cf_incdir" ; then if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF -#line 7454 "configure" +#line 8433 "configure" #include "confdefs.h" #include int @@ -7463,16 +8442,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7466: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8445: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7469: \$? = $ac_status" >&5 + echo "$as_me:8448: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7472: \"$ac_try\"") >&5 + { (eval echo "$as_me:8451: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7475: \$? = $ac_status" >&5 + echo "$as_me:8454: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7489,7 +8468,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}:7492: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8471: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7512,7 +8491,7 @@ fi do cat >conftest.$ac_ext <<_ACEOF -#line 7515 "configure" +#line 8494 "configure" #include "confdefs.h" #include <$cf_header> @@ -7536,16 +8515,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7539: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8518: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7542: \$? = $ac_status" >&5 + echo "$as_me:8521: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7545: \"$ac_try\"") >&5 + { (eval echo "$as_me:8524: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7548: \$? = $ac_status" >&5 + echo "$as_me:8527: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -7566,12 +8545,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7569: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8548: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:7574: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:8553: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` @@ -7602,9 +8581,12 @@ if test -n "$cf_1st_incdir" ; then if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF -#line 7607 "configure" +#line 8589 "configure" #include "confdefs.h" #include int @@ -7616,16 +8598,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7619: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8601: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7622: \$? = $ac_status" >&5 + echo "$as_me:8604: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7625: \"$ac_try\"") >&5 + { (eval echo "$as_me:8607: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7628: \$? = $ac_status" >&5 + echo "$as_me:8610: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7642,7 +8624,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}:7645: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8627: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7690,7 +8672,7 @@ EOF ;; esac -echo "$as_me:7693: checking for terminfo header" >&5 +echo "$as_me:8675: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7708,7 +8690,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 7711 "configure" +#line 8693 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -7723,16 +8705,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7726: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8708: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7729: \$? = $ac_status" >&5 + echo "$as_me:8711: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7732: \"$ac_try\"") >&5 + { (eval echo "$as_me:8714: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7735: \$? = $ac_status" >&5 + echo "$as_me:8717: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -7748,7 +8730,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:7751: result: $cf_cv_term_header" >&5 +echo "$as_me:8733: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -7786,7 +8768,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:7789: checking for ncurses version" >&5 +echo "$as_me:8771: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7812,10 +8794,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:7815: \"$cf_try\"") >&5 + { (eval echo "$as_me:8797: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:7818: \$? = $ac_status" >&5 + echo "$as_me:8800: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -7825,7 +8807,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 7828 "configure" +#line 8810 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -7850,15 +8832,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:7853: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8835: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7856: \$? = $ac_status" >&5 + echo "$as_me:8838: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7858: \"$ac_try\"") >&5 + { (eval echo "$as_me:8840: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7861: \$? = $ac_status" >&5 + echo "$as_me:8843: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -7872,7 +8854,7 @@ fi rm -f $cf_tempfile fi -echo "$as_me:7875: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:8857: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -7885,7 +8867,7 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:7888: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:8870: 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 @@ -7893,7 +8875,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7896 "configure" +#line 8878 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7912,16 +8894,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7915: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8897: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7918: \$? = $ac_status" >&5 + echo "$as_me:8900: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7921: \"$ac_try\"") >&5 + { (eval echo "$as_me:8903: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7924: \$? = $ac_status" >&5 + echo "$as_me:8906: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -7932,10 +8914,10 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7935: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:8917: 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 - echo "$as_me:7938: checking for initscr in -lgpm" >&5 + echo "$as_me:8920: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7943,7 +8925,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7946 "configure" +#line 8928 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7962,16 +8944,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7965: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8947: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7968: \$? = $ac_status" >&5 + echo "$as_me:8950: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7971: \"$ac_try\"") >&5 + { (eval echo "$as_me:8953: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7974: \$? = $ac_status" >&5 + echo "$as_me:8956: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -7982,7 +8964,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7985: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:8967: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test $ac_cv_lib_gpm_initscr = yes; then LIBS="$cf_ncurses_SAVE" @@ -7997,7 +8979,7 @@ case $host_os in # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:8000: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:8982: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8005,7 +8987,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8008 "configure" +#line 8990 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8024,16 +9006,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8027: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9009: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8030: \$? = $ac_status" >&5 + echo "$as_me:9012: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8033: \"$ac_try\"") >&5 + { (eval echo "$as_me:9015: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8036: \$? = $ac_status" >&5 + echo "$as_me:9018: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -8044,7 +9026,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8047: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:9029: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -8054,38 +9036,38 @@ fi ;; esac -cf_add_libs="$cf_ncurses_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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) then -cf_add_libs="-l$cf_nculib_root" -# 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -8093,53 +9075,53 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:8096: checking for initscr" >&5 + echo "$as_me:9078: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8102 "configure" +#line 9084 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char initscr (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define initscr autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef initscr + #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 initscr (); -char (*f) (); +char initscr (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_initscr) || defined (__stub___initscr) -choke me -#else -f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for initscr #endif + return initscr (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8133: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9115: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8136: \$? = $ac_status" >&5 + echo "$as_me:9118: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8139: \"$ac_try\"") >&5 + { (eval echo "$as_me:9121: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8142: \$? = $ac_status" >&5 + echo "$as_me:9124: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -8149,18 +9131,18 @@ ac_cv_func_initscr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8152: result: $ac_cv_func_initscr" >&5 +echo "$as_me:9134: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test $ac_cv_func_initscr = yes; then eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:8159: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:9141: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8163 "configure" +#line 9145 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8172,25 +9154,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8175: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9157: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8178: \$? = $ac_status" >&5 + echo "$as_me:9160: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8181: \"$ac_try\"") >&5 + { (eval echo "$as_me:9163: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8184: \$? = $ac_status" >&5 + echo "$as_me:9166: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:8186: result: yes" >&5 + echo "$as_me:9168: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:8193: result: no" >&5 +echo "$as_me:9175: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -8258,11 +9240,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:8261: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:9243: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8265 "configure" +#line 9247 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8274,25 +9256,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8277: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9259: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8280: \$? = $ac_status" >&5 + echo "$as_me:9262: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8283: \"$ac_try\"") >&5 + { (eval echo "$as_me:9265: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8286: \$? = $ac_status" >&5 + echo "$as_me:9268: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:8288: result: yes" >&5 + echo "$as_me:9270: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:8295: result: no" >&5 +echo "$as_me:9277: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -8307,7 +9289,7 @@ fi eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:8310: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:9292: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -8315,7 +9297,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:8318: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:9300: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -8325,7 +9307,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >conftest.$ac_ext <<_ACEOF -#line 8328 "configure" +#line 9310 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8337,23 +9319,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8340: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9322: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8343: \$? = $ac_status" >&5 + echo "$as_me:9325: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8346: \"$ac_try\"") >&5 + { (eval echo "$as_me:9328: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8349: \$? = $ac_status" >&5 + echo "$as_me:9331: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:8351: result: yes" >&5 + echo "$as_me:9333: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:8356: result: no" >&5 +echo "$as_me:9338: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -8378,39 +9360,135 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:8381: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:9363: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:8384: result: yes" >&5 + echo "$as_me:9366: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:8387: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:9369: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`" +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= -cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS +for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root` do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case $cf_add_cflags in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$PKG_CONFIG --libs $cf_ncuconfig_root`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 8413 "configure" +#line 9491 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8422,37 +9500,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8425: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9503: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8428: \$? = $ac_status" >&5 + echo "$as_me:9506: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8431: \"$ac_try\"") >&5 + { (eval echo "$as_me:9509: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8434: \$? = $ac_status" >&5 + echo "$as_me:9512: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 8440 "configure" +#line 9518 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:8447: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9525: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8450: \$? = $ac_status" >&5 + echo "$as_me:9528: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:8452: \"$ac_try\"") >&5 + { (eval echo "$as_me:9530: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8455: \$? = $ac_status" >&5 + echo "$as_me:9533: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_have_ncuconfig=yes else @@ -8469,7 +9547,7 @@ cat conftest.$ac_ext >&5 cf_have_ncuconfig=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:8472: result: $cf_have_ncuconfig" >&5 + echo "$as_me:9550: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -8485,7 +9563,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:8488: checking for terminfo header" >&5 +echo "$as_me:9566: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8503,7 +9581,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 8506 "configure" +#line 9584 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -8518,16 +9596,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8521: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9599: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8524: \$? = $ac_status" >&5 + echo "$as_me:9602: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8527: \"$ac_try\"") >&5 + { (eval echo "$as_me:9605: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8530: \$? = $ac_status" >&5 + echo "$as_me:9608: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -8543,7 +9621,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:8546: result: $cf_cv_term_header" >&5 +echo "$as_me:9624: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -8578,7 +9656,7 @@ esac fi else - echo "$as_me:8581: result: no" >&5 + echo "$as_me:9659: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -8594,7 +9672,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:8597: checking for $ac_word" >&5 +echo "$as_me:9675: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8609,90 +9687,186 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:8612: found $ac_dir/$ac_word" >&5 +echo "$as_me:9690: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG +if test -n "$NCURSES_CONFIG"; then + echo "$as_me:9698: result: $NCURSES_CONFIG" >&5 +echo "${ECHO_T}$NCURSES_CONFIG" >&6 +else + echo "$as_me:9701: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$NCURSES_CONFIG" && break + done +fi +if test -z "$NCURSES_CONFIG"; then + ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG + for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config +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:9714: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_NCURSES_CONFIG"; then + ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" +echo "$as_me:9729: found $ac_dir/$ac_word" >&5 break done -fi -fi -NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG -if test -n "$NCURSES_CONFIG"; then - echo "$as_me:8620: result: $NCURSES_CONFIG" >&5 -echo "${ECHO_T}$NCURSES_CONFIG" >&6 -else - echo "$as_me:8623: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi +fi +fi +ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG +if test -n "$ac_ct_NCURSES_CONFIG"; then + echo "$as_me:9737: result: $ac_ct_NCURSES_CONFIG" >&5 +echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 +else + echo "$as_me:9740: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$ac_ct_NCURSES_CONFIG" && break +done +test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" + + NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG +fi + + if test "$NCURSES_CONFIG" != none ; then + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in `$NCURSES_CONFIG --cflags` +do +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case $cf_add_cflags in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then - test -n "$NCURSES_CONFIG" && break - done -fi -if test -z "$NCURSES_CONFIG"; then - ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG - for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config -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:8636: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_NCURSES_CONFIG"; then - ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:8651: found $ac_dir/$ac_word" >&5 -break -done + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" -fi -fi -ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG -if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:8659: result: $ac_ct_NCURSES_CONFIG" >&5 -echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 -else - echo "$as_me:8662: result: no" >&5 -echo "${ECHO_T}no" >&6 fi - test -n "$ac_ct_NCURSES_CONFIG" && break -done -test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" - NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG fi - if test "$NCURSES_CONFIG" != none ; then +if test -n "$cf_new_extra_cppflags" ; then - CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" -cf_add_libs="`$NCURSES_CONFIG --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 +fi + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:8695: checking if we have identified curses headers" >&5 +echo "$as_me:9869: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8704,7 +9878,7 @@ for cf_header in \ curses.h $cf_cv_screen/curses.h do cat >conftest.$ac_ext <<_ACEOF -#line 8707 "configure" +#line 9881 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -8716,16 +9890,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8719: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9893: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8722: \$? = $ac_status" >&5 + echo "$as_me:9896: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8725: \"$ac_try\"") >&5 + { (eval echo "$as_me:9899: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8728: \$? = $ac_status" >&5 + echo "$as_me:9902: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -8736,11 +9910,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:8739: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:9913: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:8743: error: No curses header-files found" >&5 + { { echo "$as_me:9917: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -8750,23 +9924,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:8753: checking for $ac_header" >&5 +echo "$as_me:9927: 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 8759 "configure" +#line 9933 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:8763: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:9937: \"$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:8769: \$? = $ac_status" >&5 + echo "$as_me:9943: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -8785,7 +9959,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:8788: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:9962: 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 <conftest.$ac_ext <<_ACEOF -#line 8841 "configure" +#line 10018 "configure" #include "confdefs.h" #include int @@ -8850,16 +10027,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8853: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10030: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8856: \$? = $ac_status" >&5 + echo "$as_me:10033: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8859: \"$ac_try\"") >&5 + { (eval echo "$as_me:10036: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8862: \$? = $ac_status" >&5 + echo "$as_me:10039: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8876,7 +10053,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}:8879: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10056: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8895,7 +10072,7 @@ fi } -echo "$as_me:8898: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:10075: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8907,7 +10084,7 @@ else do cat >conftest.$ac_ext <<_ACEOF -#line 8910 "configure" +#line 10087 "configure" #include "confdefs.h" #include <$cf_header> @@ -8931,16 +10108,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8934: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10111: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8937: \$? = $ac_status" >&5 + echo "$as_me:10114: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8940: \"$ac_try\"") >&5 + { (eval echo "$as_me:10117: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8943: \$? = $ac_status" >&5 + echo "$as_me:10120: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -8955,14 +10132,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:8958: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:10135: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:8965: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:10142: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9078,9 +10255,12 @@ if test -n "$cf_incdir" ; then if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF -#line 9083 "configure" +#line 10263 "configure" #include "confdefs.h" #include int @@ -9092,16 +10272,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9095: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10275: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9098: \$? = $ac_status" >&5 + echo "$as_me:10278: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9101: \"$ac_try\"") >&5 + { (eval echo "$as_me:10281: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9104: \$? = $ac_status" >&5 + echo "$as_me:10284: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9118,7 +10298,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}:9121: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10301: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9141,7 +10321,7 @@ fi do cat >conftest.$ac_ext <<_ACEOF -#line 9144 "configure" +#line 10324 "configure" #include "confdefs.h" #include <$cf_header> @@ -9165,16 +10345,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9168: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10348: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9171: \$? = $ac_status" >&5 + echo "$as_me:10351: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9174: \"$ac_try\"") >&5 + { (eval echo "$as_me:10354: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9177: \$? = $ac_status" >&5 + echo "$as_me:10357: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -9195,12 +10375,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9198: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10378: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:9203: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:10383: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` @@ -9231,9 +10411,12 @@ if test -n "$cf_1st_incdir" ; then if test "$GCC" = yes then cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF -#line 9236 "configure" +#line 10419 "configure" #include "confdefs.h" #include int @@ -9245,16 +10428,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9248: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10431: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9251: \$? = $ac_status" >&5 + echo "$as_me:10434: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9254: \"$ac_try\"") >&5 + { (eval echo "$as_me:10437: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9257: \$? = $ac_status" >&5 + echo "$as_me:10440: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9271,7 +10454,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}:9274: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10457: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9319,7 +10502,7 @@ EOF ;; esac -echo "$as_me:9322: checking for terminfo header" >&5 +echo "$as_me:10505: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9337,7 +10520,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 9340 "configure" +#line 10523 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -9352,16 +10535,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9355: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10538: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9358: \$? = $ac_status" >&5 + echo "$as_me:10541: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9361: \"$ac_try\"") >&5 + { (eval echo "$as_me:10544: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9364: \$? = $ac_status" >&5 + echo "$as_me:10547: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -9377,7 +10560,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:9380: result: $cf_cv_term_header" >&5 +echo "$as_me:10563: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -9415,7 +10598,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:9418: checking for ncurses version" >&5 +echo "$as_me:10601: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9441,10 +10624,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:9444: \"$cf_try\"") >&5 + { (eval echo "$as_me:10627: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:9447: \$? = $ac_status" >&5 + echo "$as_me:10630: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -9454,7 +10637,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 9457 "configure" +#line 10640 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -9479,15 +10662,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:9482: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10665: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9485: \$? = $ac_status" >&5 + echo "$as_me:10668: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9487: \"$ac_try\"") >&5 + { (eval echo "$as_me:10670: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9490: \$? = $ac_status" >&5 + echo "$as_me:10673: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -9501,7 +10684,7 @@ fi rm -f $cf_tempfile fi -echo "$as_me:9504: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:10687: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -9514,7 +10697,7 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:9517: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:10700: 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 @@ -9522,7 +10705,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9525 "configure" +#line 10708 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9541,16 +10724,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9544: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10727: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9547: \$? = $ac_status" >&5 + echo "$as_me:10730: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9550: \"$ac_try\"") >&5 + { (eval echo "$as_me:10733: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9553: \$? = $ac_status" >&5 + echo "$as_me:10736: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -9561,10 +10744,10 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9564: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:10747: 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 - echo "$as_me:9567: checking for initscr in -lgpm" >&5 + echo "$as_me:10750: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9572,7 +10755,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9575 "configure" +#line 10758 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9591,16 +10774,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9594: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10777: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9597: \$? = $ac_status" >&5 + echo "$as_me:10780: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9600: \"$ac_try\"") >&5 + { (eval echo "$as_me:10783: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9603: \$? = $ac_status" >&5 + echo "$as_me:10786: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -9611,7 +10794,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9614: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:10797: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test $ac_cv_lib_gpm_initscr = yes; then LIBS="$cf_ncurses_SAVE" @@ -9626,7 +10809,7 @@ case $host_os in # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:9629: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:10812: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9634,7 +10817,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9637 "configure" +#line 10820 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9653,16 +10836,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9656: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10839: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9659: \$? = $ac_status" >&5 + echo "$as_me:10842: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9662: \"$ac_try\"") >&5 + { (eval echo "$as_me:10845: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9665: \$? = $ac_status" >&5 + echo "$as_me:10848: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -9673,7 +10856,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9676: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:10859: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -9683,38 +10866,38 @@ fi ;; esac -cf_add_libs="$cf_ncurses_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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) then -cf_add_libs="-l$cf_nculib_root" -# 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -9722,53 +10905,53 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:9725: checking for initscr" >&5 + echo "$as_me:10908: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9731 "configure" +#line 10914 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char initscr (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define initscr autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef initscr + #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 initscr (); -char (*f) (); +char initscr (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_initscr) || defined (__stub___initscr) -choke me -#else -f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for initscr #endif + return initscr (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9762: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10945: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9765: \$? = $ac_status" >&5 + echo "$as_me:10948: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9768: \"$ac_try\"") >&5 + { (eval echo "$as_me:10951: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9771: \$? = $ac_status" >&5 + echo "$as_me:10954: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -9778,18 +10961,18 @@ ac_cv_func_initscr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9781: result: $ac_cv_func_initscr" >&5 +echo "$as_me:10964: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test $ac_cv_func_initscr = yes; then eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:9788: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:10971: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9792 "configure" +#line 10975 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9801,25 +10984,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9804: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10987: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9807: \$? = $ac_status" >&5 + echo "$as_me:10990: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9810: \"$ac_try\"") >&5 + { (eval echo "$as_me:10993: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9813: \$? = $ac_status" >&5 + echo "$as_me:10996: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:9815: result: yes" >&5 + echo "$as_me:10998: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:9822: result: no" >&5 +echo "$as_me:11005: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -9887,11 +11070,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:9890: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:11073: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9894 "configure" +#line 11077 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9903,25 +11086,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9906: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11089: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9909: \$? = $ac_status" >&5 + echo "$as_me:11092: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9912: \"$ac_try\"") >&5 + { (eval echo "$as_me:11095: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9915: \$? = $ac_status" >&5 + echo "$as_me:11098: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:9917: result: yes" >&5 + echo "$as_me:11100: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:9924: result: no" >&5 +echo "$as_me:11107: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -9936,7 +11119,7 @@ fi eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:9939: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:11122: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -9944,7 +11127,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:9947: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:11130: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -9954,7 +11137,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >conftest.$ac_ext <<_ACEOF -#line 9957 "configure" +#line 11140 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9966,23 +11149,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9969: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11152: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9972: \$? = $ac_status" >&5 + echo "$as_me:11155: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9975: \"$ac_try\"") >&5 + { (eval echo "$as_me:11158: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9978: \$? = $ac_status" >&5 + echo "$as_me:11161: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:9980: result: yes" >&5 + echo "$as_me:11163: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:9985: result: no" >&5 +echo "$as_me:11168: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -10002,7 +11185,7 @@ fi ;; (pdcurses) - echo "$as_me:10005: checking for X" >&5 + echo "$as_me:11188: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -10062,21 +11245,25 @@ fi # Check X11 before X11Rn because it is often a symlink to the current release. ac_x_header_dirs=' /usr/X11/include +/usr/X11R7/include /usr/X11R6/include /usr/X11R5/include /usr/X11R4/include /usr/include/X11 +/usr/include/X11R7 /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 /usr/local/X11/include +/usr/local/X11R7/include /usr/local/X11R6/include /usr/local/X11R5/include /usr/local/X11R4/include /usr/local/include/X11 +/usr/local/include/X11R7 /usr/local/include/X11R6 /usr/local/include/X11R5 /usr/local/include/X11R4 @@ -10099,17 +11286,17 @@ if test "$ac_x_includes" = no; then # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF -#line 10102 "configure" +#line 11289 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:10106: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:11293: \"$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:10112: \$? = $ac_status" >&5 + echo "$as_me:11299: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -10142,7 +11329,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10145 "configure" +#line 11332 "configure" #include "confdefs.h" #include int @@ -10154,16 +11341,16 @@ XtMalloc (0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10157: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11344: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10160: \$? = $ac_status" >&5 + echo "$as_me:11347: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10163: \"$ac_try\"") >&5 + { (eval echo "$as_me:11350: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10166: \$? = $ac_status" >&5 + echo "$as_me:11353: \$? = $ac_status" >&5 (exit $ac_status); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -10201,7 +11388,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:10204: result: $have_x" >&5 + echo "$as_me:11391: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -10211,7 +11398,7 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:10214: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:11401: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -10235,11 +11422,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:10238: checking whether -R must be followed by a space" >&5 + echo "$as_me:11425: checking whether -R must be followed by a space" >&5 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line 10242 "configure" +#line 11429 "configure" #include "confdefs.h" int @@ -10251,16 +11438,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10254: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11441: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10257: \$? = $ac_status" >&5 + echo "$as_me:11444: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10260: \"$ac_try\"") >&5 + { (eval echo "$as_me:11447: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10263: \$? = $ac_status" >&5 + echo "$as_me:11450: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_nospace=yes else @@ -10270,13 +11457,13 @@ ac_R_nospace=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_nospace = yes; then - echo "$as_me:10273: result: no" >&5 + echo "$as_me:11460: result: no" >&5 echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line 10279 "configure" +#line 11466 "configure" #include "confdefs.h" int @@ -10288,16 +11475,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10291: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11478: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10294: \$? = $ac_status" >&5 + echo "$as_me:11481: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10297: \"$ac_try\"") >&5 + { (eval echo "$as_me:11484: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10300: \$? = $ac_status" >&5 + echo "$as_me:11487: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_space=yes else @@ -10307,11 +11494,11 @@ ac_R_space=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_space = yes; then - echo "$as_me:10310: result: yes" >&5 + echo "$as_me:11497: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:10314: result: neither works" >&5 + echo "$as_me:11501: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -10331,7 +11518,7 @@ echo "${ECHO_T}neither works" >&6 # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >conftest.$ac_ext <<_ACEOF -#line 10334 "configure" +#line 11521 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10350,22 +11537,22 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10353: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11540: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10356: \$? = $ac_status" >&5 + echo "$as_me:11543: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10359: \"$ac_try\"") >&5 + { (eval echo "$as_me:11546: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10362: \$? = $ac_status" >&5 + echo "$as_me:11549: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:10368: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:11555: checking for dnet_ntoa in -ldnet" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10373,7 +11560,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10376 "configure" +#line 11563 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10392,16 +11579,16 @@ dnet_ntoa (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10395: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11582: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10398: \$? = $ac_status" >&5 + echo "$as_me:11585: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10401: \"$ac_try\"") >&5 + { (eval echo "$as_me:11588: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10404: \$? = $ac_status" >&5 + echo "$as_me:11591: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -10412,14 +11599,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10415: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:11602: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:10422: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:11609: checking for dnet_ntoa in -ldnet_stub" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10427,7 +11614,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10430 "configure" +#line 11617 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10446,16 +11633,16 @@ dnet_ntoa (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10449: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11636: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10452: \$? = $ac_status" >&5 + echo "$as_me:11639: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10455: \"$ac_try\"") >&5 + { (eval echo "$as_me:11642: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10458: \$? = $ac_status" >&5 + echo "$as_me:11645: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -10466,7 +11653,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10469: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:11656: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" @@ -10485,53 +11672,53 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:10488: checking for gethostbyname" >&5 + echo "$as_me:11675: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10494 "configure" +#line 11681 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define gethostbyname autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef gethostbyname + #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 gethostbyname (); -char (*f) (); +char gethostbyname (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) -choke me -#else -f = gethostbyname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for gethostbyname #endif + return gethostbyname (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10525: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11712: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10528: \$? = $ac_status" >&5 + echo "$as_me:11715: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10531: \"$ac_try\"") >&5 + { (eval echo "$as_me:11718: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10534: \$? = $ac_status" >&5 + echo "$as_me:11721: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gethostbyname=yes else @@ -10541,11 +11728,11 @@ ac_cv_func_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10544: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:11731: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:10548: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:11735: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10553,7 +11740,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10556 "configure" +#line 11743 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10572,16 +11759,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10575: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11762: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10578: \$? = $ac_status" >&5 + echo "$as_me:11765: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10581: \"$ac_try\"") >&5 + { (eval echo "$as_me:11768: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10584: \$? = $ac_status" >&5 + echo "$as_me:11771: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -10592,14 +11779,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10595: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:11782: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 if test $ac_cv_lib_nsl_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:10602: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:11789: checking for gethostbyname in -lbsd" >&5 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10607,7 +11794,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10610 "configure" +#line 11797 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10626,16 +11813,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10629: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11816: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10632: \$? = $ac_status" >&5 + echo "$as_me:11819: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10635: \"$ac_try\"") >&5 + { (eval echo "$as_me:11822: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10638: \$? = $ac_status" >&5 + echo "$as_me:11825: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -10646,7 +11833,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10649: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:11836: result: $ac_cv_lib_bsd_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 if test $ac_cv_lib_bsd_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" @@ -10662,53 +11849,53 @@ fi # variants that don't use the nameserver (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:10665: checking for connect" >&5 + echo "$as_me:11852: checking for connect" >&5 echo $ECHO_N "checking for connect... $ECHO_C" >&6 if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10671 "configure" +#line 11858 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define connect autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef connect + #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 connect (); -char (*f) (); +char connect (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_connect) || defined (__stub___connect) -choke me -#else -f = connect; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for connect #endif + return connect (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10702: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11889: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10705: \$? = $ac_status" >&5 + echo "$as_me:11892: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10708: \"$ac_try\"") >&5 + { (eval echo "$as_me:11895: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10711: \$? = $ac_status" >&5 + echo "$as_me:11898: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_connect=yes else @@ -10718,11 +11905,11 @@ ac_cv_func_connect=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10721: result: $ac_cv_func_connect" >&5 +echo "$as_me:11908: result: $ac_cv_func_connect" >&5 echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo "$as_me:10725: checking for connect in -lsocket" >&5 + echo "$as_me:11912: checking for connect in -lsocket" >&5 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10730,7 +11917,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10733 "configure" +#line 11920 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10749,16 +11936,16 @@ connect (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10752: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11939: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10755: \$? = $ac_status" >&5 + echo "$as_me:11942: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10758: \"$ac_try\"") >&5 + { (eval echo "$as_me:11945: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10761: \$? = $ac_status" >&5 + echo "$as_me:11948: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_connect=yes else @@ -10769,7 +11956,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10772: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:11959: result: $ac_cv_lib_socket_connect" >&5 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" @@ -10778,53 +11965,53 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:10781: checking for remove" >&5 + echo "$as_me:11968: checking for remove" >&5 echo $ECHO_N "checking for remove... $ECHO_C" >&6 if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10787 "configure" +#line 11974 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define remove autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef remove + #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 remove (); -char (*f) (); +char remove (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_remove) || defined (__stub___remove) -choke me -#else -f = remove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for remove #endif + return remove (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10818: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12005: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10821: \$? = $ac_status" >&5 + echo "$as_me:12008: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10824: \"$ac_try\"") >&5 + { (eval echo "$as_me:12011: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10827: \$? = $ac_status" >&5 + echo "$as_me:12014: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_remove=yes else @@ -10834,11 +12021,11 @@ ac_cv_func_remove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10837: result: $ac_cv_func_remove" >&5 +echo "$as_me:12024: result: $ac_cv_func_remove" >&5 echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo "$as_me:10841: checking for remove in -lposix" >&5 + echo "$as_me:12028: checking for remove in -lposix" >&5 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10846,7 +12033,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10849 "configure" +#line 12036 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10865,16 +12052,16 @@ remove (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10868: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12055: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10871: \$? = $ac_status" >&5 + echo "$as_me:12058: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10874: \"$ac_try\"") >&5 + { (eval echo "$as_me:12061: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10877: \$? = $ac_status" >&5 + echo "$as_me:12064: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_posix_remove=yes else @@ -10885,7 +12072,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10888: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:12075: result: $ac_cv_lib_posix_remove" >&5 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" @@ -10894,53 +12081,53 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:10897: checking for shmat" >&5 + echo "$as_me:12084: checking for shmat" >&5 echo $ECHO_N "checking for shmat... $ECHO_C" >&6 if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10903 "configure" +#line 12090 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define shmat autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef shmat + #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 shmat (); -char (*f) (); +char shmat (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_shmat) || defined (__stub___shmat) -choke me -#else -f = shmat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for shmat #endif + return shmat (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10934: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12121: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10937: \$? = $ac_status" >&5 + echo "$as_me:12124: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10940: \"$ac_try\"") >&5 + { (eval echo "$as_me:12127: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10943: \$? = $ac_status" >&5 + echo "$as_me:12130: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_shmat=yes else @@ -10950,11 +12137,11 @@ ac_cv_func_shmat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10953: result: $ac_cv_func_shmat" >&5 +echo "$as_me:12140: result: $ac_cv_func_shmat" >&5 echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo "$as_me:10957: checking for shmat in -lipc" >&5 + echo "$as_me:12144: checking for shmat in -lipc" >&5 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10962,7 +12149,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10965 "configure" +#line 12152 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10981,16 +12168,16 @@ shmat (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10984: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12171: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10987: \$? = $ac_status" >&5 + echo "$as_me:12174: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10990: \"$ac_try\"") >&5 + { (eval echo "$as_me:12177: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10993: \$? = $ac_status" >&5 + echo "$as_me:12180: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -11001,7 +12188,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11004: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:12191: result: $ac_cv_lib_ipc_shmat" >&5 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" @@ -11019,7 +12206,7 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:11022: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:12209: checking for IceConnectionNumber in -lICE" >&5 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11027,7 +12214,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11030 "configure" +#line 12217 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11046,16 +12233,16 @@ IceConnectionNumber (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11049: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12236: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11052: \$? = $ac_status" >&5 + echo "$as_me:12239: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11055: \"$ac_try\"") >&5 + { (eval echo "$as_me:12242: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11058: \$? = $ac_status" >&5 + echo "$as_me:12245: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -11066,7 +12253,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11069: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:12256: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" @@ -11078,7 +12265,7 @@ fi cf_x_athena=${cf_x_athena:-Xaw} -echo "$as_me:11081: checking if you want to link with Xaw 3d library" >&5 +echo "$as_me:12268: checking if you want to link with Xaw 3d library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6 withval= @@ -11089,14 +12276,14 @@ if test "${with_Xaw3d+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$as_me:11092: result: yes" >&5 + echo "$as_me:12279: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:11095: result: no" >&5 + echo "$as_me:12282: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:11099: checking if you want to link with Xaw 3d xft library" >&5 +echo "$as_me:12286: checking if you want to link with Xaw 3d xft library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6 withval= @@ -11107,14 +12294,14 @@ if test "${with_Xaw3dxft+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3dxft - echo "$as_me:11110: result: yes" >&5 + echo "$as_me:12297: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:11113: result: no" >&5 + echo "$as_me:12300: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:11117: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:12304: checking if you want to link with neXT Athena library" >&5 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6 withval= @@ -11125,14 +12312,14 @@ if test "${with_neXtaw+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$as_me:11128: result: yes" >&5 + echo "$as_me:12315: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:11131: result: no" >&5 + echo "$as_me:12318: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:11135: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:12322: checking if you want to link with Athena-Plus library" >&5 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6 withval= @@ -11143,10 +12330,10 @@ if test "${with_XawPlus+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$as_me:11146: result: yes" >&5 + echo "$as_me:12333: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:11149: result: no" >&5 + echo "$as_me:12336: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -11166,17 +12353,17 @@ if test "$PKG_CONFIG" != none ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then test -n "$verbose" && echo " found package $cf_athena_pkg" 1>&6 -echo "${as_me:-configure}:11169: testing found package $cf_athena_pkg ..." 1>&5 +echo "${as_me:-configure}:12356: testing found package $cf_athena_pkg ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs $cf_athena_pkg 2>/dev/null`" test -n "$verbose" && echo " package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:11175: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:12362: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:11179: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:12366: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -11276,19 +12463,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -11307,20 +12494,20 @@ EOF LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 -echo "${as_me:-configure}:11310: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:12497: testing ..trimmed $LIBS ..." 1>&5 ;; esac done -echo "$as_me:11316: checking for usable $cf_x_athena/Xmu package" >&5 +echo "$as_me:12503: checking for usable $cf_x_athena/Xmu package" >&5 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6 if test "${cf_cv_xaw_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11323 "configure" +#line 12510 "configure" #include "confdefs.h" #include @@ -11336,16 +12523,16 @@ int check = XmuCompareISOLatin1("big", "small") } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11339: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12526: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11342: \$? = $ac_status" >&5 + echo "$as_me:12529: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11345: \"$ac_try\"") >&5 + { (eval echo "$as_me:12532: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11348: \$? = $ac_status" >&5 + echo "$as_me:12535: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xaw_compat=yes else @@ -11355,7 +12542,7 @@ cf_cv_xaw_compat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11358: result: $cf_cv_xaw_compat" >&5 +echo "$as_me:12545: result: $cf_cv_xaw_compat" >&5 echo "${ECHO_T}$cf_cv_xaw_compat" >&6 if test "$cf_cv_xaw_compat" = no @@ -11367,7 +12554,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6 (*) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:11370: testing work around broken package ..." 1>&5 +echo "${as_me:-configure}:12557: testing work around broken package ..." 1>&5 cf_save_xmu="$LIBS" cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'` @@ -11375,17 +12562,17 @@ echo "${as_me:-configure}:11370: testing work around broken package ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then test -n "$verbose" && echo " found package xmu" 1>&6 -echo "${as_me:-configure}:11378: testing found package xmu ..." 1>&5 +echo "${as_me:-configure}:12565: testing found package xmu ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs xmu 2>/dev/null`" test -n "$verbose" && echo " package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:11384: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:12571: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:11388: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:12575: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -11485,19 +12672,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -11505,12 +12692,12 @@ LIBS="$cf_add_libs" test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:11508: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:12695: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:11513: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:12700: testing ...after $LIBS ..." 1>&5 else cf_pkgconfig_incs= @@ -11518,12 +12705,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:11521: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:12708: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:11526: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:12713: testing ...after $LIBS ..." 1>&5 fi @@ -11534,7 +12721,7 @@ fi LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 -echo "${as_me:-configure}:11537: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:12724: testing ..trimmed $LIBS ..." 1>&5 ;; esac @@ -11559,17 +12746,17 @@ if test -z "$cf_x_athena_lib" ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then test -n "$verbose" && echo " found package Xext" 1>&6 -echo "${as_me:-configure}:11562: testing found package Xext ..." 1>&5 +echo "${as_me:-configure}:12749: testing found package Xext ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs Xext 2>/dev/null`" test -n "$verbose" && echo " package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:11568: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:12755: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:11572: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:12759: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -11669,19 +12856,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -11690,7 +12877,7 @@ else cf_pkgconfig_incs= cf_pkgconfig_libs= - echo "$as_me:11693: checking for XextCreateExtension in -lXext" >&5 + echo "$as_me:12880: checking for XextCreateExtension in -lXext" >&5 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11698,7 +12885,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11701 "configure" +#line 12888 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11717,16 +12904,16 @@ XextCreateExtension (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11720: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12907: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11723: \$? = $ac_status" >&5 + echo "$as_me:12910: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11726: \"$ac_try\"") >&5 + { (eval echo "$as_me:12913: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11729: \$? = $ac_status" >&5 + echo "$as_me:12916: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -11737,23 +12924,23 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11740: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:12927: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then -cf_add_libs="-lXext" -# 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lXext; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -11761,7 +12948,7 @@ fi fi -# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new), and (and +# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new) (and # in some cases has installed dummy files in the former, other cases replaced # it with a link to the new location). This complicates the configure script. # Check for that pitfall, and recover using pkg-config @@ -11773,17 +12960,17 @@ then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:11776: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:12963: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs x11 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:11782: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:12969: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:11786: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:12973: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -11883,19 +13070,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -11903,24 +13090,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:11906: WARNING: unable to find X11 library" >&5 + { echo "$as_me:13093: WARNING: unable to find X11 library" >&5 echo "$as_me: WARNING: unable to find X11 library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:11913: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:13100: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:11919: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:13106: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:11923: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:13110: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -12020,19 +13207,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -12040,24 +13227,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:12043: WARNING: unable to find ICE library" >&5 + { echo "$as_me:13230: WARNING: unable to find ICE library" >&5 echo "$as_me: WARNING: unable to find ICE library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:12050: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:13237: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:12056: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:13243: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:12060: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:13247: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -12157,19 +13344,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -12177,24 +13364,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:12180: WARNING: unable to find SM library" >&5 + { echo "$as_me:13367: WARNING: unable to find SM library" >&5 echo "$as_me: WARNING: unable to find SM library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:12187: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:13374: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:12193: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:13380: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:12197: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:13384: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -12294,19 +13481,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -12314,7 +13501,7 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:12317: WARNING: unable to find Xt library" >&5 + { echo "$as_me:13504: WARNING: unable to find Xt library" >&5 echo "$as_me: WARNING: unable to find Xt library" >&2;} fi @@ -12325,17 +13512,17 @@ cf_have_X_LIBS=no if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:12328: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:13515: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:12334: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:13521: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:12338: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:13525: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -12435,19 +13622,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -12456,14 +13643,14 @@ LIBS="$cf_add_libs" ;; (*) # we have an "xt" package, but it may omit Xt's dependency on X11 -echo "$as_me:12459: checking for usable X dependency" >&5 +echo "$as_me:13646: checking for usable X dependency" >&5 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6 if test "${cf_cv_xt_x11_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12466 "configure" +#line 13653 "configure" #include "confdefs.h" #include @@ -12482,16 +13669,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12485: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13672: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12488: \$? = $ac_status" >&5 + echo "$as_me:13675: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12491: \"$ac_try\"") >&5 + { (eval echo "$as_me:13678: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12494: \$? = $ac_status" >&5 + echo "$as_me:13681: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xt_x11_compat=yes else @@ -12501,30 +13688,30 @@ cf_cv_xt_x11_compat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12504: result: $cf_cv_xt_x11_compat" >&5 +echo "$as_me:13691: result: $cf_cv_xt_x11_compat" >&5 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6 if test "$cf_cv_xt_x11_compat" = no then test -n "$verbose" && echo " work around broken X11 dependency" 1>&6 -echo "${as_me:-configure}:12510: testing work around broken X11 dependency ..." 1>&5 +echo "${as_me:-configure}:13697: testing work around broken X11 dependency ..." 1>&5 # 2010/11/19 - good enough until a working Xt on Xcb is delivered. if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:12517: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:13704: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs x11 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:12523: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:13710: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:12527: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:13714: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -12624,19 +13811,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -12647,12 +13834,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:12650: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:13837: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:12655: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:13842: testing ...after $LIBS ..." 1>&5 fi @@ -12660,14 +13847,14 @@ fi ;; esac -echo "$as_me:12663: checking for usable X Toolkit package" >&5 +echo "$as_me:13850: checking for usable X Toolkit package" >&5 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6 if test "${cf_cv_xt_ice_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12670 "configure" +#line 13857 "configure" #include "confdefs.h" #include @@ -12682,16 +13869,16 @@ int num = IceConnectionNumber(0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12685: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13872: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12688: \$? = $ac_status" >&5 + echo "$as_me:13875: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12691: \"$ac_try\"") >&5 + { (eval echo "$as_me:13878: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12694: \$? = $ac_status" >&5 + echo "$as_me:13881: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xt_ice_compat=yes else @@ -12701,7 +13888,7 @@ cf_cv_xt_ice_compat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12704: result: $cf_cv_xt_ice_compat" >&5 +echo "$as_me:13891: result: $cf_cv_xt_ice_compat" >&5 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 if test "$cf_cv_xt_ice_compat" = no @@ -12715,22 +13902,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 (*) test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 -echo "${as_me:-configure}:12718: testing work around broken ICE dependency ..." 1>&5 +echo "${as_me:-configure}:13905: testing work around broken ICE dependency ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:12723: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:13910: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:12729: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:13916: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:12733: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:13920: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -12830,36 +14017,36 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:12852: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:14039: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:12858: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14045: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:12862: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14049: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -12959,19 +14146,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -12988,12 +14175,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:12991: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:14178: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:12996: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:14183: testing ...after $LIBS ..." 1>&5 fi @@ -13013,7 +14200,7 @@ else test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:13016: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:14203: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -13098,7 +14285,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:13101: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:14288: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -13108,7 +14295,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:13111: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:14298: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -13118,7 +14305,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:13121: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:14308: 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" @@ -13127,7 +14314,7 @@ fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 13130 "configure" +#line 14317 "configure" #include "confdefs.h" #include int @@ -13139,16 +14326,16 @@ printf("Hello world"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13142: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14329: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13145: \$? = $ac_status" >&5 + echo "$as_me:14332: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13148: \"$ac_try\"") >&5 + { (eval echo "$as_me:14335: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13151: \$? = $ac_status" >&5 + echo "$as_me:14338: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -13156,12 +14343,12 @@ else cat conftest.$ac_ext >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:13159: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:14346: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:13164: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:14351: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_flags" @@ -13169,53 +14356,53 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - echo "$as_me:13172: checking for XOpenDisplay" >&5 + echo "$as_me:14359: checking for XOpenDisplay" >&5 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6 if test "${ac_cv_func_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13178 "configure" +#line 14365 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char XOpenDisplay (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define XOpenDisplay autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef XOpenDisplay + #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 XOpenDisplay (); -char (*f) (); +char XOpenDisplay (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_XOpenDisplay) || defined (__stub___XOpenDisplay) -choke me -#else -f = XOpenDisplay; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for XOpenDisplay #endif + return XOpenDisplay (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13209: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14396: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13212: \$? = $ac_status" >&5 + echo "$as_me:14399: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13215: \"$ac_try\"") >&5 + { (eval echo "$as_me:14402: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13218: \$? = $ac_status" >&5 + echo "$as_me:14405: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XOpenDisplay=yes else @@ -13225,13 +14412,13 @@ ac_cv_func_XOpenDisplay=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13228: result: $ac_cv_func_XOpenDisplay" >&5 +echo "$as_me:14415: result: $ac_cv_func_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6 if test $ac_cv_func_XOpenDisplay = yes; then : else - echo "$as_me:13234: checking for XOpenDisplay in -lX11" >&5 + echo "$as_me:14421: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13239,7 +14426,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13242 "configure" +#line 14429 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13258,16 +14445,16 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13261: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14448: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13264: \$? = $ac_status" >&5 + echo "$as_me:14451: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13267: \"$ac_try\"") >&5 + { (eval echo "$as_me:14454: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13270: \$? = $ac_status" >&5 + echo "$as_me:14457: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -13278,23 +14465,23 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13281: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:14468: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test $ac_cv_lib_X11_XOpenDisplay = yes; then -cf_add_libs="-lX11" -# 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lX11; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -13302,53 +14489,53 @@ fi fi - echo "$as_me:13305: checking for XtAppInitialize" >&5 + echo "$as_me:14492: checking for XtAppInitialize" >&5 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6 if test "${ac_cv_func_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13311 "configure" +#line 14498 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char XtAppInitialize (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define XtAppInitialize autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef XtAppInitialize + #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 XtAppInitialize (); -char (*f) (); +char XtAppInitialize (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_XtAppInitialize) || defined (__stub___XtAppInitialize) -choke me -#else -f = XtAppInitialize; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for XtAppInitialize #endif + return XtAppInitialize (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13342: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14529: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13345: \$? = $ac_status" >&5 + echo "$as_me:14532: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13348: \"$ac_try\"") >&5 + { (eval echo "$as_me:14535: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13351: \$? = $ac_status" >&5 + echo "$as_me:14538: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XtAppInitialize=yes else @@ -13358,13 +14545,13 @@ ac_cv_func_XtAppInitialize=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13361: result: $ac_cv_func_XtAppInitialize" >&5 +echo "$as_me:14548: result: $ac_cv_func_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6 if test $ac_cv_func_XtAppInitialize = yes; then : else - echo "$as_me:13367: checking for XtAppInitialize in -lXt" >&5 + echo "$as_me:14554: checking for XtAppInitialize in -lXt" >&5 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13372,7 +14559,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13375 "configure" +#line 14562 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13391,16 +14578,16 @@ XtAppInitialize (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13394: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14581: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13397: \$? = $ac_status" >&5 + echo "$as_me:14584: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13400: \"$ac_try\"") >&5 + { (eval echo "$as_me:14587: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13403: \$? = $ac_status" >&5 + echo "$as_me:14590: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xt_XtAppInitialize=yes else @@ -13411,7 +14598,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13414: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "$as_me:14601: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then @@ -13428,7 +14615,7 @@ fi fi if test $cf_have_X_LIBS = no ; then - { echo "$as_me:13431: WARNING: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:14618: WARNING: Unable to successfully link X Toolkit library (-lXt) with test program. You will have to check and add the proper libraries by hand to makefile." >&5 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with @@ -13449,15 +14636,19 @@ do cf_save="$CPPFLAGS" cf_test=X11/$cf_x_athena_root/SimpleMenu.h if test $cf_path != default ; then - CPPFLAGS="$cf_save -I$cf_path/include" - echo "$as_me:13453: checking for $cf_test in $cf_path" >&5 + CPPFLAGS="$cf_save" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_path/include" + + echo "$as_me:14644: checking for $cf_test in $cf_path" >&5 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6 else - echo "$as_me:13456: checking for $cf_test" >&5 + echo "$as_me:14647: checking for $cf_test" >&5 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi cat >conftest.$ac_ext <<_ACEOF -#line 13460 "configure" +#line 14651 "configure" #include "confdefs.h" #include @@ -13471,16 +14662,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13474: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14665: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13477: \$? = $ac_status" >&5 + echo "$as_me:14668: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13480: \"$ac_try\"") >&5 + { (eval echo "$as_me:14671: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13483: \$? = $ac_status" >&5 + echo "$as_me:14674: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -13489,7 +14680,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:13492: result: $cf_result" >&5 + echo "$as_me:14683: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_inc=$cf_path @@ -13501,10 +14692,13 @@ echo "${ECHO_T}$cf_result" >&6 done if test -z "$cf_x_athena_inc" ; then - { echo "$as_me:13504: WARNING: Unable to successfully find Athena header files with test program" >&5 + { echo "$as_me:14695: WARNING: Unable to successfully find Athena header files with test program" >&5 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;} elif test "$cf_x_athena_inc" != default ; then - CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_x_athena_inc" + fi cf_x_athena_root=$cf_x_athena @@ -13531,47 +14725,47 @@ do cf_test=XawSimpleMenuAddGlobalActions if test $cf_path != default ; then -cf_add_libs="-L$cf_path/lib $cf_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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -L$cf_path/lib $cf_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" - echo "$as_me:13550: checking for $cf_libs in $cf_path" >&5 + echo "$as_me:14744: checking for $cf_libs in $cf_path" >&5 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6 else -cf_add_libs="$cf_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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" - echo "$as_me:13570: checking for $cf_test in $cf_libs" >&5 + echo "$as_me:14764: checking for $cf_test in $cf_libs" >&5 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 fi cat >conftest.$ac_ext <<_ACEOF -#line 13574 "configure" +#line 14768 "configure" #include "confdefs.h" #include @@ -13587,16 +14781,16 @@ $cf_test((XtAppContext) 0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13590: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14784: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13593: \$? = $ac_status" >&5 + echo "$as_me:14787: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13596: \"$ac_try\"") >&5 + { (eval echo "$as_me:14790: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13599: \$? = $ac_status" >&5 + echo "$as_me:14793: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -13605,7 +14799,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:13608: result: $cf_result" >&5 + echo "$as_me:14802: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_lib="$cf_libs" @@ -13619,7 +14813,7 @@ echo "${ECHO_T}$cf_result" >&6 done if test -z "$cf_x_athena_lib" ; then - { { echo "$as_me:13622: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + { { echo "$as_me:14816: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;} { (exit 1); exit 1; }; } fi @@ -13637,7 +14831,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:13640: checking for $ac_word" >&5 +echo "$as_me:14834: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13652,7 +14846,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_XCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:13655: found $ac_dir/$ac_word" >&5 +echo "$as_me:14849: found $ac_dir/$ac_word" >&5 break done @@ -13660,10 +14854,10 @@ fi fi XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG if test -n "$XCURSES_CONFIG"; then - echo "$as_me:13663: result: $XCURSES_CONFIG" >&5 + echo "$as_me:14857: result: $XCURSES_CONFIG" >&5 echo "${ECHO_T}$XCURSES_CONFIG" >&6 else - echo "$as_me:13666: result: no" >&5 + echo "$as_me:14860: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -13676,7 +14870,7 @@ if test -z "$XCURSES_CONFIG"; 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:13679: checking for $ac_word" >&5 +echo "$as_me:14873: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13691,45 +14885,141 @@ 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_XCURSES_CONFIG="$ac_prog" -echo "$as_me:13694: found $ac_dir/$ac_word" >&5 +echo "$as_me:14888: found $ac_dir/$ac_word" >&5 break done -fi -fi -ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG -if test -n "$ac_ct_XCURSES_CONFIG"; then - echo "$as_me:13702: result: $ac_ct_XCURSES_CONFIG" >&5 -echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6 -else - echo "$as_me:13705: result: no" >&5 -echo "${ECHO_T}no" >&6 +fi +fi +ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG +if test -n "$ac_ct_XCURSES_CONFIG"; then + echo "$as_me:14896: result: $ac_ct_XCURSES_CONFIG" >&5 +echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6 +else + echo "$as_me:14899: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$ac_ct_XCURSES_CONFIG" && break +done +test -n "$ac_ct_XCURSES_CONFIG" || ac_ct_XCURSES_CONFIG="none" + + XCURSES_CONFIG=$ac_ct_XCURSES_CONFIG +fi + +if test "$XCURSES_CONFIG" != none ; then + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in `$XCURSES_CONFIG --cflags` +do +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case $cf_add_cflags in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + fi - test -n "$ac_ct_XCURSES_CONFIG" && break -done -test -n "$ac_ct_XCURSES_CONFIG" || ac_ct_XCURSES_CONFIG="none" +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" - XCURSES_CONFIG=$ac_ct_XCURSES_CONFIG fi -if test "$XCURSES_CONFIG" != none ; then +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" -CPPFLAGS="$CPPFLAGS `$XCURSES_CONFIG --cflags`" +fi -cf_add_libs="`$XCURSES_CONFIG --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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$XCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -13741,7 +15031,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:13744: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15034: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -13826,7 +15116,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:13829: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:15119: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -13836,7 +15126,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:13839: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:15129: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -13846,7 +15136,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:13849: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:15139: 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" @@ -13855,7 +15145,7 @@ fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 13858 "configure" +#line 15148 "configure" #include "confdefs.h" #include int @@ -13867,16 +15157,16 @@ printf("Hello world"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13870: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15160: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13873: \$? = $ac_status" >&5 + echo "$as_me:15163: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13876: \"$ac_try\"") >&5 + { (eval echo "$as_me:15166: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13879: \$? = $ac_status" >&5 + echo "$as_me:15169: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -13884,12 +15174,12 @@ else cat conftest.$ac_ext >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:13887: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15177: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:13892: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:15182: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_flags" @@ -13897,7 +15187,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13900: checking for XOpenDisplay in -lX11" >&5 +echo "$as_me:15190: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13905,7 +15195,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13908 "configure" +#line 15198 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13924,16 +15214,16 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13927: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15217: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13930: \$? = $ac_status" >&5 + echo "$as_me:15220: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13933: \"$ac_try\"") >&5 + { (eval echo "$as_me:15223: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13936: \$? = $ac_status" >&5 + echo "$as_me:15226: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -13944,52 +15234,52 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13947: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:15237: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test $ac_cv_lib_X11_XOpenDisplay = yes; then -cf_add_libs="-lX11" -# 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lX11; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" fi -echo "$as_me:13969: checking for XCurses library" >&5 +echo "$as_me:15259: checking for XCurses library" >&5 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6 if test "${cf_cv_lib_XCurses+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cf_add_libs="-lXCurses" -# 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lXCurses; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 13992 "configure" +#line 15282 "configure" #include "confdefs.h" #include @@ -14004,16 +15294,16 @@ XCursesExit(); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14007: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15297: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14010: \$? = $ac_status" >&5 + echo "$as_me:15300: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14013: \"$ac_try\"") >&5 + { (eval echo "$as_me:15303: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14016: \$? = $ac_status" >&5 + echo "$as_me:15306: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_lib_XCurses=yes else @@ -14024,7 +15314,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14027: result: $cf_cv_lib_XCurses" >&5 +echo "$as_me:15317: result: $cf_cv_lib_XCurses" >&5 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6 fi @@ -14039,23 +15329,23 @@ cat >>confdefs.h <<\EOF #define XCURSES 1 EOF - echo "$as_me:14042: checking for xcurses.h" >&5 + echo "$as_me:15332: checking for xcurses.h" >&5 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6 if test "${ac_cv_header_xcurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14048 "configure" +#line 15338 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:14052: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15342: \"$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:14058: \$? = $ac_status" >&5 + echo "$as_me:15348: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14074,7 +15364,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14077: result: $ac_cv_header_xcurses_h" >&5 +echo "$as_me:15367: result: $ac_cv_header_xcurses_h" >&5 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6 if test $ac_cv_header_xcurses_h = yes; then @@ -14085,14 +15375,14 @@ EOF fi else - { { echo "$as_me:14088: error: Cannot link with XCurses" >&5 + { { echo "$as_me:15378: error: Cannot link with XCurses" >&5 echo "$as_me: error: Cannot link with XCurses" >&2;} { (exit 1); exit 1; }; } fi ;; (*) - { { echo "$as_me:14095: error: unexpected screen-value: $cf_cv_screen" >&5 + { { echo "$as_me:15385: error: unexpected screen-value: $cf_cv_screen" >&5 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;} { (exit 1); exit 1; }; } ;; @@ -14100,7 +15390,7 @@ esac : ${cf_nculib_root:=$cf_cv_screen} as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh` -echo "$as_me:14103: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5 +echo "$as_me:15393: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14108,7 +15398,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_nculib_root $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14111 "configure" +#line 15401 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14127,16 +15417,16 @@ _nc_init_pthreads (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14130: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15420: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14133: \$? = $ac_status" >&5 + echo "$as_me:15423: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14136: \"$ac_try\"") >&5 + { (eval echo "$as_me:15426: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14139: \$? = $ac_status" >&5 + echo "$as_me:15429: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -14147,7 +15437,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14150: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:15440: 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 cf_cv_ncurses_pthreads=yes @@ -14158,19 +15448,19 @@ fi if test "$cf_cv_ncurses_pthreads" = yes then -cf_add_libs="-lpthread" -# 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lpthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -14182,7 +15472,7 @@ case $cf_cv_screen in ;; esac -echo "$as_me:14185: checking for X11 rgb file" >&5 +echo "$as_me:15475: 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. @@ -14246,7 +15536,7 @@ case ".$cf_path" in cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:14249: error: expected a pathname, not \"$cf_path\"" >&5 + { { echo "$as_me:15539: error: expected a pathname, not \"$cf_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -14254,7 +15544,7 @@ esac fi -echo "$as_me:14257: result: $RGB_PATH" >&5 +echo "$as_me:15547: result: $RGB_PATH" >&5 echo "${ECHO_T}$RGB_PATH" >&6 cat >>confdefs.h <&5 +echo "$as_me:15588: checking if you want to check for panel functions" >&5 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6 # Check whether --enable-panel or --disable-panel was given. @@ -14312,7 +15602,7 @@ else cf_enable_panel=$cf_default_panel fi; -echo "$as_me:14315: result: $cf_enable_panel" >&5 +echo "$as_me:15605: result: $cf_enable_panel" >&5 echo "${ECHO_T}$cf_enable_panel" >&6 if test $cf_enable_panel = yes then @@ -14323,13 +15613,13 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:14326: checking pkg-config for panel$cf_cv_libtype" >&5 + echo "$as_me:15616: checking pkg-config for panel$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for panel$cf_cv_libtype... $ECHO_C" >&6 if "$PKG_CONFIG" --exists panel$cf_cv_libtype ; then - echo "$as_me:14329: result: yes" >&5 + echo "$as_me:15619: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:14332: checking if the panel$cf_cv_libtype package files work" >&5 + echo "$as_me:15622: checking if the panel$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the panel$cf_cv_libtype package files work... $ECHO_C" >&6 cf_save_CPPFLAGS="$CPPFLAGS" @@ -14433,24 +15723,24 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="`$PKG_CONFIG --libs panel$cf_cv_libtype`" -# 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$PKG_CONFIG --libs panel$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 14453 "configure" +#line 15743 "configure" #include "confdefs.h" #include int @@ -14462,37 +15752,37 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14465: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15755: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14468: \$? = $ac_status" >&5 + echo "$as_me:15758: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14471: \"$ac_try\"") >&5 + { (eval echo "$as_me:15761: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14474: \$? = $ac_status" >&5 + echo "$as_me:15764: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 14480 "configure" +#line 15770 "configure" #include "confdefs.h" #include int main(void) { (void) new_panel ( 0 ); return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14487: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15777: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14490: \$? = $ac_status" >&5 + echo "$as_me:15780: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14492: \"$ac_try\"") >&5 + { (eval echo "$as_me:15782: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14495: \$? = $ac_status" >&5 + echo "$as_me:15785: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_have_curses_lib=yes else @@ -14509,7 +15799,7 @@ cat conftest.$ac_ext >&5 cf_have_curses_lib=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:14512: result: $cf_have_curses_lib" >&5 + echo "$as_me:15802: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes if test "$cf_have_curses_lib" != "yes" @@ -14529,7 +15819,7 @@ EOF fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh` -echo "$as_me:14532: checking for new_panel in -lpanel$cf_cv_libtype" >&5 +echo "$as_me:15822: checking for new_panel in -lpanel$cf_cv_libtype" >&5 echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14537,7 +15827,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lpanel$cf_cv_libtype $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14540 "configure" +#line 15830 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14556,16 +15846,16 @@ new_panel (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14559: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15849: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14562: \$? = $ac_status" >&5 + echo "$as_me:15852: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14565: \"$ac_try\"") >&5 + { (eval echo "$as_me:15855: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14568: \$? = $ac_status" >&5 + echo "$as_me:15858: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -14576,25 +15866,25 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14579: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:15869: 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 cf_upper=`echo "have_libpanel" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -cf_add_libs="-lpanel$cf_cv_libtype" -# 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lpanel$cf_cv_libtype; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -14609,7 +15899,7 @@ fi cf_curses_headers="$cf_curses_headers panel.h" fi -echo "$as_me:14612: checking if you want to check for menu functions" >&5 +echo "$as_me:15902: checking if you want to check for menu functions" >&5 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6 # Check whether --enable-menu or --disable-menu was given. @@ -14626,7 +15916,7 @@ else cf_enable_menu=$cf_default_menu fi; -echo "$as_me:14629: result: $cf_enable_menu" >&5 +echo "$as_me:15919: result: $cf_enable_menu" >&5 echo "${ECHO_T}$cf_enable_menu" >&6 if test $cf_enable_menu = yes then @@ -14635,14 +15925,14 @@ then ;; (curses*) -echo "$as_me:14638: checking for NetBSD menu.h" >&5 +echo "$as_me:15928: checking for NetBSD menu.h" >&5 echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6 if test "${cf_cv_netbsd_menu_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14645 "configure" +#line 15935 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -14660,16 +15950,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15953: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14666: \$? = $ac_status" >&5 + echo "$as_me:15956: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14669: \"$ac_try\"") >&5 + { (eval echo "$as_me:15959: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14672: \$? = $ac_status" >&5 + echo "$as_me:15962: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_netbsd_menu_h=yes @@ -14681,7 +15971,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14684: result: $cf_cv_netbsd_menu_h" >&5 +echo "$as_me:15974: result: $cf_cv_netbsd_menu_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6 test "$cf_cv_netbsd_menu_h" = yes && @@ -14698,13 +15988,13 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:14701: checking pkg-config for menu$cf_cv_libtype" >&5 + echo "$as_me:15991: checking pkg-config for menu$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for menu$cf_cv_libtype... $ECHO_C" >&6 if "$PKG_CONFIG" --exists menu$cf_cv_libtype ; then - echo "$as_me:14704: result: yes" >&5 + echo "$as_me:15994: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:14707: checking if the menu$cf_cv_libtype package files work" >&5 + echo "$as_me:15997: checking if the menu$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the menu$cf_cv_libtype package files work... $ECHO_C" >&6 cf_save_CPPFLAGS="$CPPFLAGS" @@ -14808,24 +16098,24 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="`$PKG_CONFIG --libs menu$cf_cv_libtype`" -# 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$PKG_CONFIG --libs menu$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 14828 "configure" +#line 16118 "configure" #include "confdefs.h" #include int @@ -14837,37 +16127,37 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14840: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16130: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14843: \$? = $ac_status" >&5 + echo "$as_me:16133: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14846: \"$ac_try\"") >&5 + { (eval echo "$as_me:16136: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14849: \$? = $ac_status" >&5 + echo "$as_me:16139: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 14855 "configure" +#line 16145 "configure" #include "confdefs.h" #include int main(void) { (void) menu_driver ( 0,0 ); return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14862: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16152: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14865: \$? = $ac_status" >&5 + echo "$as_me:16155: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14867: \"$ac_try\"") >&5 + { (eval echo "$as_me:16157: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14870: \$? = $ac_status" >&5 + echo "$as_me:16160: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_have_curses_lib=yes else @@ -14884,7 +16174,7 @@ cat conftest.$ac_ext >&5 cf_have_curses_lib=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:14887: result: $cf_have_curses_lib" >&5 + echo "$as_me:16177: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes if test "$cf_have_curses_lib" != "yes" @@ -14904,7 +16194,7 @@ EOF fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh` -echo "$as_me:14907: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 +echo "$as_me:16197: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14912,7 +16202,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmenu$cf_cv_libtype $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14915 "configure" +#line 16205 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14931,16 +16221,16 @@ menu_driver (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14934: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16224: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14937: \$? = $ac_status" >&5 + echo "$as_me:16227: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14940: \"$ac_try\"") >&5 + { (eval echo "$as_me:16230: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14943: \$? = $ac_status" >&5 + echo "$as_me:16233: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -14951,25 +16241,25 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14954: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:16244: 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 cf_upper=`echo "have_libmenu" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -cf_add_libs="-lmenu$cf_cv_libtype" -# 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lmenu$cf_cv_libtype; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -14984,7 +16274,7 @@ fi cf_curses_headers="$cf_curses_headers menu.h" fi -echo "$as_me:14987: checking if you want to check for form functions" >&5 +echo "$as_me:16277: checking if you want to check for form functions" >&5 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6 # Check whether --enable-form or --disable-form was given. @@ -15001,7 +16291,7 @@ else cf_enable_form=$cf_default_form fi; -echo "$as_me:15004: result: $cf_enable_form" >&5 +echo "$as_me:16294: result: $cf_enable_form" >&5 echo "${ECHO_T}$cf_enable_form" >&6 if test $cf_enable_form = yes then @@ -15010,14 +16300,14 @@ then ;; (curses*) -echo "$as_me:15013: checking for NetBSD form.h" >&5 +echo "$as_me:16303: checking for NetBSD form.h" >&5 echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6 if test "${cf_cv_netbsd_form_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15020 "configure" +#line 16310 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15036,16 +16326,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15039: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16329: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15042: \$? = $ac_status" >&5 + echo "$as_me:16332: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15045: \"$ac_try\"") >&5 + { (eval echo "$as_me:16335: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15048: \$? = $ac_status" >&5 + echo "$as_me:16338: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_netbsd_form_h=yes @@ -15057,7 +16347,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15060: result: $cf_cv_netbsd_form_h" >&5 +echo "$as_me:16350: result: $cf_cv_netbsd_form_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6 test "$cf_cv_netbsd_form_h" = yes && @@ -15074,13 +16364,13 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:15077: checking pkg-config for form$cf_cv_libtype" >&5 + echo "$as_me:16367: checking pkg-config for form$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for form$cf_cv_libtype... $ECHO_C" >&6 if "$PKG_CONFIG" --exists form$cf_cv_libtype ; then - echo "$as_me:15080: result: yes" >&5 + echo "$as_me:16370: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:15083: checking if the form$cf_cv_libtype package files work" >&5 + echo "$as_me:16373: checking if the form$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the form$cf_cv_libtype package files work... $ECHO_C" >&6 cf_save_CPPFLAGS="$CPPFLAGS" @@ -15184,24 +16474,24 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="`$PKG_CONFIG --libs form$cf_cv_libtype`" -# 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$PKG_CONFIG --libs form$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 15204 "configure" +#line 16494 "configure" #include "confdefs.h" #include int @@ -15213,37 +16503,37 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15216: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16506: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15219: \$? = $ac_status" >&5 + echo "$as_me:16509: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15222: \"$ac_try\"") >&5 + { (eval echo "$as_me:16512: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15225: \$? = $ac_status" >&5 + echo "$as_me:16515: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 15231 "configure" +#line 16521 "configure" #include "confdefs.h" #include int main(void) { (void) form_driver ( 0,0 ); return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15238: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16528: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15241: \$? = $ac_status" >&5 + echo "$as_me:16531: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15243: \"$ac_try\"") >&5 + { (eval echo "$as_me:16533: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15246: \$? = $ac_status" >&5 + echo "$as_me:16536: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_have_curses_lib=yes else @@ -15260,7 +16550,7 @@ cat conftest.$ac_ext >&5 cf_have_curses_lib=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:15263: result: $cf_have_curses_lib" >&5 + echo "$as_me:16553: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes if test "$cf_have_curses_lib" != "yes" @@ -15280,7 +16570,7 @@ EOF fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh` -echo "$as_me:15283: checking for form_driver in -lform$cf_cv_libtype" >&5 +echo "$as_me:16573: checking for form_driver in -lform$cf_cv_libtype" >&5 echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15288,7 +16578,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lform$cf_cv_libtype $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15291 "configure" +#line 16581 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15307,16 +16597,16 @@ form_driver (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15310: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16600: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15313: \$? = $ac_status" >&5 + echo "$as_me:16603: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15316: \"$ac_try\"") >&5 + { (eval echo "$as_me:16606: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15319: \$? = $ac_status" >&5 + echo "$as_me:16609: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -15327,25 +16617,25 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15330: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:16620: 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 cf_upper=`echo "have_libform" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -cf_add_libs="-lform$cf_cv_libtype" -# 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lform$cf_cv_libtype; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -15365,23 +16655,23 @@ fi for ac_header in $cf_curses_headers do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:15368: checking for $ac_header" >&5 +echo "$as_me:16658: 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 15374 "configure" +#line 16664 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:15378: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16668: \"$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:15384: \$? = $ac_status" >&5 + echo "$as_me:16674: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15400,7 +16690,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:15403: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16693: 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:16703: 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 15419 "configure" +#line 16709 "configure" #include "confdefs.h" #include #include @@ -15424,13 +16714,13 @@ else #include _ACEOF -if { (eval echo "$as_me:15427: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16717: \"$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:15433: \$? = $ac_status" >&5 + echo "$as_me:16723: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15452,7 +16742,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 15455 "configure" +#line 16745 "configure" #include "confdefs.h" #include @@ -15470,7 +16760,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 15473 "configure" +#line 16763 "configure" #include "confdefs.h" #include @@ -15491,7 +16781,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 15494 "configure" +#line 16784 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -15517,15 +16807,15 @@ main (void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15520: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16810: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15523: \$? = $ac_status" >&5 + echo "$as_me:16813: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15525: \"$ac_try\"") >&5 + { (eval echo "$as_me:16815: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15528: \$? = $ac_status" >&5 + echo "$as_me:16818: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -15538,7 +16828,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:15541: result: $ac_cv_header_stdc" >&5 +echo "$as_me:16831: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -15548,13 +16838,13 @@ EOF fi -echo "$as_me:15551: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:16841: 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 15557 "configure" +#line 16847 "configure" #include "confdefs.h" #include #include @@ -15570,16 +16860,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15573: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16863: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15576: \$? = $ac_status" >&5 + echo "$as_me:16866: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15579: \"$ac_try\"") >&5 + { (eval echo "$as_me:16869: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15582: \$? = $ac_status" >&5 + echo "$as_me:16872: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -15589,7 +16879,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15592: result: $ac_cv_header_time" >&5 +echo "$as_me:16882: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -15613,23 +16903,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:15616: checking for $ac_header" >&5 +echo "$as_me:16906: 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 15622 "configure" +#line 16912 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:15626: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16916: \"$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:15632: \$? = $ac_status" >&5 + echo "$as_me:16922: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15648,7 +16938,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:15651: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16941: 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:16954: 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 15670 "configure" +#line 16960 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:15674: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16964: \"$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:15680: \$? = $ac_status" >&5 + echo "$as_me:16970: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15696,7 +16986,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:15699: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:16989: 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:16999: 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 @@ -15716,7 +17006,7 @@ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h do cat >conftest.$ac_ext <<_ACEOF -#line 15719 "configure" +#line 17009 "configure" #include "confdefs.h" #include <$cf_header> @@ -15729,16 +17019,16 @@ int x = optind; char *y = optarg } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15732: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17022: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15735: \$? = $ac_status" >&5 + echo "$as_me:17025: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15738: \"$ac_try\"") >&5 + { (eval echo "$as_me:17028: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15741: \$? = $ac_status" >&5 + echo "$as_me:17031: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_getopt_header=$cf_header break @@ -15750,7 +17040,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:15753: result: $cf_cv_getopt_header" >&5 +echo "$as_me:17043: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test $cf_cv_getopt_header != none ; then @@ -15770,58 +17060,58 @@ fi for ac_func in \ getopt \ gettimeofday \ -tdestroy \ +strstr \ tsearch \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:15778: checking for $ac_func" >&5 +echo "$as_me:17068: 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 15784 "configure" +#line 17074 "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. */ +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + #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) (); +char $ac_func (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for $ac_func #endif + return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15815: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17105: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15818: \$? = $ac_status" >&5 + echo "$as_me:17108: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15821: \"$ac_try\"") >&5 + { (eval echo "$as_me:17111: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15824: \$? = $ac_status" >&5 + echo "$as_me:17114: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -15831,7 +17121,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15834: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:17124: 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:17135: checking if we can use termcap.h" >&5 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6 if test "${cf_cv_have_termcap_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15852 "configure" +#line 17142 "configure" #include "confdefs.h" #include +#ifdef NCURSES_VERSION +#undef NCURSES_VERSION +#endif #include +#ifndef NCURSES_VERSION +#error wrong header +#endif int main (void) @@ -15864,16 +17160,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15867: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17163: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15870: \$? = $ac_status" >&5 + echo "$as_me:17166: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15873: \"$ac_try\"") >&5 + { (eval echo "$as_me:17169: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15876: \$? = $ac_status" >&5 + echo "$as_me:17172: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_termcap_h=yes else @@ -15883,14 +17179,72 @@ cf_cv_have_termcap_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15886: result: $cf_cv_have_termcap_h" >&5 +echo "$as_me:17182: result: $cf_cv_have_termcap_h" >&5 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6 -test "x$cf_cv_have_termcap_h" = xyes && cat >>confdefs.h <<\EOF +if test "x$cf_cv_have_termcap_h" = xyes +then + cat >>confdefs.h <<\EOF #define HAVE_TERMCAP_H 1 EOF +else +echo "$as_me:17191: checking if we can use ncurses/termcap.h" >&5 +echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6 +if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +#line 17198 "configure" +#include "confdefs.h" + +#include +#ifdef NCURSES_VERSION +#undef NCURSES_VERSION +#endif +#include +#ifndef NCURSES_VERSION +#error wrong header +#endif + +int +main (void) +{ +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:17219: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:17222: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:17225: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17228: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_ncurses_termcap_h=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_have_ncurses_termcap_h=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:17238: result: $cf_cv_have_ncurses_termcap_h" >&5 +echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6 +test "x$cf_cv_have_ncurses_termcap_h" = xyes && cat >>confdefs.h <<\EOF +#define HAVE_NCURSES_TERMCAP_H 1 +EOF + +fi + if test "x$ac_cv_func_getopt" = xno; then - { { echo "$as_me:15893: error: getopt is required for building programs" >&5 + { { echo "$as_me:17247: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi @@ -15909,53 +17263,53 @@ wcstombs \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:15912: checking for $ac_func" >&5 +echo "$as_me:17266: 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 15918 "configure" +#line 17272 "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. */ +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + #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) (); +char $ac_func (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for $ac_func #endif + return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15949: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17303: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15952: \$? = $ac_status" >&5 + echo "$as_me:17306: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15955: \"$ac_try\"") >&5 + { (eval echo "$as_me:17309: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15958: \$? = $ac_status" >&5 + echo "$as_me:17312: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -15965,7 +17319,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15968: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:17322: 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:17334: checking definition to turn on extended curses functions" >&5 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6 if test "${cf_cv_need_xopen_extension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15985,7 +17339,7 @@ else cf_cv_need_xopen_extension=unknown cat >conftest.$ac_ext <<_ACEOF -#line 15988 "configure" +#line 17342 "configure" #include "confdefs.h" #include @@ -16011,16 +17365,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16014: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17368: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16017: \$? = $ac_status" >&5 + echo "$as_me:17371: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16020: \"$ac_try\"") >&5 + { (eval echo "$as_me:17374: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16023: \$? = $ac_status" >&5 + echo "$as_me:17377: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_xopen_extension=none else @@ -16030,7 +17384,7 @@ cat conftest.$ac_ext >&5 for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR do cat >conftest.$ac_ext <<_ACEOF -#line 16033 "configure" +#line 17387 "configure" #include "confdefs.h" #define $cf_try_xopen_extension 1 @@ -16052,16 +17406,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16055: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17409: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16058: \$? = $ac_status" >&5 + echo "$as_me:17412: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16061: \"$ac_try\"") >&5 + { (eval echo "$as_me:17415: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16064: \$? = $ac_status" >&5 + echo "$as_me:17418: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_xopen_extension=$cf_try_xopen_extension; break else @@ -16075,16 +17429,19 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16078: result: $cf_cv_need_xopen_extension" >&5 +echo "$as_me:17432: result: $cf_cv_need_xopen_extension" >&5 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 case $cf_cv_need_xopen_extension in (*_*) - CPPFLAGS="$CPPFLAGS -D$cf_cv_need_xopen_extension" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D$cf_cv_need_xopen_extension" + ;; esac -echo "$as_me:16087: checking for term.h" >&5 +echo "$as_me:17444: checking for term.h" >&5 echo $ECHO_N "checking for term.h... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16105,7 +17462,7 @@ esac for cf_header in $cf_header_list do cat >conftest.$ac_ext <<_ACEOF -#line 16108 "configure" +#line 17465 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16119,16 +17476,16 @@ WINDOW *x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16122: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17479: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16125: \$? = $ac_status" >&5 + echo "$as_me:17482: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16128: \"$ac_try\"") >&5 + { (eval echo "$as_me:17485: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16131: \$? = $ac_status" >&5 + echo "$as_me:17488: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header=$cf_header break @@ -16147,7 +17504,7 @@ case $cf_cv_term_header in for cf_header in ncurses/term.h ncursesw/term.h do cat >conftest.$ac_ext <<_ACEOF -#line 16150 "configure" +#line 17507 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16165,16 +17522,16 @@ WINDOW *x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16168: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17525: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16171: \$? = $ac_status" >&5 + echo "$as_me:17528: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16174: \"$ac_try\"") >&5 + { (eval echo "$as_me:17531: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16177: \$? = $ac_status" >&5 + echo "$as_me:17534: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header=$cf_header break @@ -16189,7 +17546,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext esac fi -echo "$as_me:16192: result: $cf_cv_term_header" >&5 +echo "$as_me:17549: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 case $cf_cv_term_header in @@ -16216,7 +17573,7 @@ EOF ;; esac -echo "$as_me:16219: checking for unctrl.h" >&5 +echo "$as_me:17576: checking for unctrl.h" >&5 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6 if test "${cf_cv_unctrl_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16237,7 +17594,7 @@ esac for cf_header in $cf_header_list do cat >conftest.$ac_ext <<_ACEOF -#line 16240 "configure" +#line 17597 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16251,16 +17608,16 @@ WINDOW *x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16254: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17611: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16257: \$? = $ac_status" >&5 + echo "$as_me:17614: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16260: \"$ac_try\"") >&5 + { (eval echo "$as_me:17617: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16263: \$? = $ac_status" >&5 + echo "$as_me:17620: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_unctrl_header=$cf_header break @@ -16273,12 +17630,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:16276: result: $cf_cv_unctrl_header" >&5 +echo "$as_me:17633: result: $cf_cv_unctrl_header" >&5 echo "${ECHO_T}$cf_cv_unctrl_header" >&6 case $cf_cv_unctrl_header in (no) - { echo "$as_me:16281: WARNING: unctrl.h header not found" >&5 + { echo "$as_me:17638: WARNING: unctrl.h header not found" >&5 echo "$as_me: WARNING: unctrl.h header not found" >&2;} ;; esac @@ -16367,10 +17724,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:16370: checking for ${cf_func}" >&5 + echo "$as_me:17727: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:16373: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:17730: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16379,7 +17736,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >conftest.$ac_ext <<_ACEOF -#line 16382 "configure" +#line 17739 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -16412,16 +17769,16 @@ if (foo + 1234L > 5678L) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16415: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17772: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16418: \$? = $ac_status" >&5 + echo "$as_me:17775: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16421: \"$ac_try\"") >&5 + { (eval echo "$as_me:17778: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16424: \$? = $ac_status" >&5 + echo "$as_me:17781: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -16437,7 +17794,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:16440: result: $cf_result" >&5 + echo "$as_me:17797: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result != no; then cat >>confdefs.h <&5 + echo "$as_me:17812: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:16458: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:17815: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16464,7 +17821,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >conftest.$ac_ext <<_ACEOF -#line 16467 "configure" +#line 17824 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -16497,16 +17854,16 @@ if (foo + 1234L > 5678L) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16500: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17857: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16503: \$? = $ac_status" >&5 + echo "$as_me:17860: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16506: \"$ac_try\"") >&5 + { (eval echo "$as_me:17863: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16509: \$? = $ac_status" >&5 + echo "$as_me:17866: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -16522,7 +17879,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:16525: result: $cf_result" >&5 + echo "$as_me:17882: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result != no; then cat >>confdefs.h <conftest.$ac_ext <<_ACEOF -#line 16549 "configure" +#line 17906 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16566,21 +17923,21 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16569: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17926: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16572: \$? = $ac_status" >&5 + echo "$as_me:17929: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16575: \"$ac_try\"") >&5 + { (eval echo "$as_me:17932: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16578: \$? = $ac_status" >&5 + echo "$as_me:17935: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6 -echo "${as_me:-configure}:16583: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 +echo "${as_me:-configure}:17940: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:17960: checking for ncurses extended functions" >&5 echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6 if test "${cf_cv_ncurses_ext_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16610 "configure" +#line 17967 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16622,16 +17979,16 @@ int x = NCURSES_EXT_FUNCS } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16625: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17982: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16628: \$? = $ac_status" >&5 + echo "$as_me:17985: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16631: \"$ac_try\"") >&5 + { (eval echo "$as_me:17988: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16634: \$? = $ac_status" >&5 + echo "$as_me:17991: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_ext_funcs=defined else @@ -16639,7 +17996,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 16642 "configure" +#line 17999 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16664,16 +18021,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16667: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18024: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16670: \$? = $ac_status" >&5 + echo "$as_me:18027: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16673: \"$ac_try\"") >&5 + { (eval echo "$as_me:18030: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16676: \$? = $ac_status" >&5 + echo "$as_me:18033: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_ext_funcs=yes else @@ -16687,7 +18044,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16690: result: $cf_cv_ncurses_ext_funcs" >&5 +echo "$as_me:18047: result: $cf_cv_ncurses_ext_funcs" >&5 echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6 test "$cf_cv_ncurses_ext_funcs" = yes && cat >>confdefs.h <<\EOF @@ -16701,11 +18058,11 @@ then if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno then cf_define_xpg5=no - echo "$as_me:16704: checking if _XPG5 should be defined to enable wide-characters" >&5 + echo "$as_me:18061: checking if _XPG5 should be defined to enable wide-characters" >&5 echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 16708 "configure" +#line 18065 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16718,16 +18075,16 @@ int x = _XPG5 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16721: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18078: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16724: \$? = $ac_status" >&5 + echo "$as_me:18081: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16727: \"$ac_try\"") >&5 + { (eval echo "$as_me:18084: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16730: \$? = $ac_status" >&5 + echo "$as_me:18087: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -16736,7 +18093,7 @@ cat conftest.$ac_ext >&5 cf_save_cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XPG5" cat >conftest.$ac_ext <<_ACEOF -#line 16739 "configure" +#line 18096 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16749,16 +18106,16 @@ int x = _XPG5 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16752: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18109: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16755: \$? = $ac_status" >&5 + echo "$as_me:18112: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16758: \"$ac_try\"") >&5 + { (eval echo "$as_me:18115: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16761: \$? = $ac_status" >&5 + echo "$as_me:18118: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_define_xpg5=yes else @@ -16769,7 +18126,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save_cppflags" fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:16772: result: $cf_define_xpg5" >&5 + echo "$as_me:18129: result: $cf_define_xpg5" >&5 echo "${ECHO_T}$cf_define_xpg5" >&6 if test "$cf_define_xpg5" = yes @@ -16778,14 +18135,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6 fi fi - echo "$as_me:16781: checking for wide-character functions" >&5 + echo "$as_me:18138: checking for wide-character functions" >&5 echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6 if test "${cf_cv_widechar_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16788 "configure" +#line 18145 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16802,16 +18159,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16805: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18162: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16808: \$? = $ac_status" >&5 + echo "$as_me:18165: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16811: \"$ac_try\"") >&5 + { (eval echo "$as_me:18168: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16814: \$? = $ac_status" >&5 + echo "$as_me:18171: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_widechar_funcs=yes else @@ -16822,7 +18179,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16825: result: $cf_cv_widechar_funcs" >&5 +echo "$as_me:18182: result: $cf_cv_widechar_funcs" >&5 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 if test "$cf_cv_widechar_funcs" != no ; then @@ -16843,14 +18200,14 @@ EOF fi -echo "$as_me:16846: checking if $cf_cv_screen library uses pthreads" >&5 +echo "$as_me:18203: checking if $cf_cv_screen library uses pthreads" >&5 echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6 if test "${cf_cv_use_pthreads+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16853 "configure" +#line 18210 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16868,16 +18225,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16871: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18228: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16874: \$? = $ac_status" >&5 + echo "$as_me:18231: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16877: \"$ac_try\"") >&5 + { (eval echo "$as_me:18234: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16880: \$? = $ac_status" >&5 + echo "$as_me:18237: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_use_pthreads=yes else @@ -16888,20 +18245,20 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16891: result: $cf_cv_use_pthreads" >&5 +echo "$as_me:18248: result: $cf_cv_use_pthreads" >&5 echo "${ECHO_T}$cf_cv_use_pthreads" >&6 test $cf_cv_use_pthreads = yes && cat >>confdefs.h <<\EOF #define USE_PTHREADS 1 EOF -echo "$as_me:16897: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:18254: 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 16904 "configure" +#line 18261 "configure" #include "confdefs.h" #include @@ -16921,16 +18278,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16924: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18281: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16927: \$? = $ac_status" >&5 + echo "$as_me:18284: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16930: \"$ac_try\"") >&5 + { (eval echo "$as_me:18287: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16933: \$? = $ac_status" >&5 + echo "$as_me:18290: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sys_time_select=yes else @@ -16942,7 +18299,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16945: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:18302: 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 @@ -16951,7 +18308,7 @@ EOF # special check for test/ditto.c -echo "$as_me:16954: checking for openpty in -lutil" >&5 +echo "$as_me:18311: 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 @@ -16959,7 +18316,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16962 "configure" +#line 18319 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16978,16 +18335,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16981: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18338: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16984: \$? = $ac_status" >&5 + echo "$as_me:18341: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16987: \"$ac_try\"") >&5 + { (eval echo "$as_me:18344: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16990: \$? = $ac_status" >&5 + echo "$as_me:18347: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -16998,7 +18355,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17001: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:18358: 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 @@ -17006,7 +18363,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:17009: checking for openpty header" >&5 +echo "$as_me:18366: 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 @@ -17014,26 +18371,26 @@ else 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lutil; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" } for cf_header in pty.h libutil.h util.h do cat >conftest.$ac_ext <<_ACEOF -#line 17036 "configure" +#line 18393 "configure" #include "confdefs.h" #include <$cf_header> @@ -17050,16 +18407,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17053: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18410: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17056: \$? = $ac_status" >&5 + echo "$as_me:18413: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17059: \"$ac_try\"") >&5 + { (eval echo "$as_me:18416: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17062: \$? = $ac_status" >&5 + echo "$as_me:18419: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_openpty=$cf_header @@ -17077,7 +18434,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi -echo "$as_me:17080: result: $cf_cv_func_openpty" >&5 +echo "$as_me:18437: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -17092,26 +18449,26 @@ 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_libs="$TEST_LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lutil; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done TEST_LIBS="$cf_add_libs" fi fi -echo "$as_me:17114: checking for function curses_version" >&5 +echo "$as_me:18471: checking for function curses_version" >&5 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6 if test "${cf_cv_func_curses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17121,7 +18478,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_curses_version=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 17124 "configure" +#line 18481 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -17134,15 +18491,15 @@ int main(void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17137: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18494: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17140: \$? = $ac_status" >&5 + echo "$as_me:18497: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17142: \"$ac_try\"") >&5 + { (eval echo "$as_me:18499: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17145: \$? = $ac_status" >&5 + echo "$as_me:18502: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_curses_version=yes @@ -17157,14 +18514,14 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f core fi -echo "$as_me:17160: result: $cf_cv_func_curses_version" >&5 +echo "$as_me:18517: result: $cf_cv_func_curses_version" >&5 echo "${ECHO_T}$cf_cv_func_curses_version" >&6 test "$cf_cv_func_curses_version" = yes && cat >>confdefs.h <<\EOF #define HAVE_CURSES_VERSION 1 EOF -echo "$as_me:17167: checking for alternate character set array" >&5 +echo "$as_me:18524: checking for alternate character set array" >&5 echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6 if test "${cf_cv_curses_acs_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17174,7 +18531,7 @@ cf_cv_curses_acs_map=unknown for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map do cat >conftest.$ac_ext <<_ACEOF -#line 17177 "configure" +#line 18534 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -17190,16 +18547,16 @@ $name['k'] = ACS_PLUS } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17193: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18550: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17196: \$? = $ac_status" >&5 + echo "$as_me:18553: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17199: \"$ac_try\"") >&5 + { (eval echo "$as_me:18556: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17202: \$? = $ac_status" >&5 + echo "$as_me:18559: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_acs_map=$name; break else @@ -17210,7 +18567,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:17213: result: $cf_cv_curses_acs_map" >&5 +echo "$as_me:18570: result: $cf_cv_curses_acs_map" >&5 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 test "$cf_cv_curses_acs_map" != unknown && @@ -17220,7 +18577,7 @@ EOF if test "$cf_enable_widec" = yes; then -echo "$as_me:17223: checking for wide alternate character set array" >&5 +echo "$as_me:18580: checking for wide alternate character set array" >&5 echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6 if test "${cf_cv_curses_wacs_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17230,7 +18587,7 @@ else for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char do cat >conftest.$ac_ext <<_ACEOF -#line 17233 "configure" +#line 18590 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -17246,16 +18603,16 @@ void *foo = &($name['k']) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17249: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18606: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17252: \$? = $ac_status" >&5 + echo "$as_me:18609: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17255: \"$ac_try\"") >&5 + { (eval echo "$as_me:18612: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17258: \$? = $ac_status" >&5 + echo "$as_me:18615: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_map=$name break @@ -17266,7 +18623,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:17269: result: $cf_cv_curses_wacs_map" >&5 +echo "$as_me:18626: result: $cf_cv_curses_wacs_map" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 test "$cf_cv_curses_wacs_map" != unknown && @@ -17274,7 +18631,7 @@ cat >>confdefs.h <&5 +echo "$as_me:18634: checking for wide alternate character constants" >&5 echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6 if test "${cf_cv_curses_wacs_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17284,7 +18641,7 @@ cf_cv_curses_wacs_symbols=no if test "$cf_cv_curses_wacs_map" != unknown then cat >conftest.$ac_ext <<_ACEOF -#line 17287 "configure" +#line 18644 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -17301,16 +18658,16 @@ cchar_t *foo = WACS_PLUS; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17304: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18661: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17307: \$? = $ac_status" >&5 + echo "$as_me:18664: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17310: \"$ac_try\"") >&5 + { (eval echo "$as_me:18667: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17313: \$? = $ac_status" >&5 + echo "$as_me:18670: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -17320,7 +18677,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 17323 "configure" +#line 18680 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -17336,16 +18693,16 @@ cchar_t *foo = WACS_PLUS } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17339: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18696: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17342: \$? = $ac_status" >&5 + echo "$as_me:18699: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17345: \"$ac_try\"") >&5 + { (eval echo "$as_me:18702: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17348: \$? = $ac_status" >&5 + echo "$as_me:18705: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -17356,7 +18713,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi fi -echo "$as_me:17359: result: $cf_cv_curses_wacs_symbols" >&5 +echo "$as_me:18716: result: $cf_cv_curses_wacs_symbols" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 test "$cf_cv_curses_wacs_symbols" != no && @@ -17366,10 +18723,10 @@ EOF fi -echo "$as_me:17369: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:18726: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 17372 "configure" +#line 18729 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -17387,16 +18744,16 @@ attr_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17390: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18747: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17393: \$? = $ac_status" >&5 + echo "$as_me:18750: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17396: \"$ac_try\"") >&5 + { (eval echo "$as_me:18753: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17399: \$? = $ac_status" >&5 + echo "$as_me:18756: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17405,7 +18762,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17408: result: $cf_result" >&5 +echo "$as_me:18765: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17426,14 +18783,14 @@ fi if test "$cf_enable_widec" = yes; then # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:17429: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:18786: 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 17436 "configure" +#line 18793 "configure" #include "confdefs.h" #include @@ -17451,23 +18808,23 @@ mbstate_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17454: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18811: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17457: \$? = $ac_status" >&5 + echo "$as_me:18814: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17460: \"$ac_try\"") >&5 + { (eval echo "$as_me:18817: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17463: \$? = $ac_status" >&5 + echo "$as_me:18820: \$? = $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 17470 "configure" +#line 18827 "configure" #include "confdefs.h" #include @@ -17486,16 +18843,16 @@ mbstate_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17489: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18846: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17492: \$? = $ac_status" >&5 + echo "$as_me:18849: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17495: \"$ac_try\"") >&5 + { (eval echo "$as_me:18852: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17498: \$? = $ac_status" >&5 + echo "$as_me:18855: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=yes else @@ -17507,7 +18864,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:17510: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:18867: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -17530,14 +18887,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:17533: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:18890: 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 17540 "configure" +#line 18897 "configure" #include "confdefs.h" #include @@ -17555,23 +18912,23 @@ wchar_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17558: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18915: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17561: \$? = $ac_status" >&5 + echo "$as_me:18918: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17564: \"$ac_try\"") >&5 + { (eval echo "$as_me:18921: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17567: \$? = $ac_status" >&5 + echo "$as_me:18924: \$? = $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 17574 "configure" +#line 18931 "configure" #include "confdefs.h" #include @@ -17590,16 +18947,16 @@ wchar_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17593: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18950: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17596: \$? = $ac_status" >&5 + echo "$as_me:18953: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17599: \"$ac_try\"") >&5 + { (eval echo "$as_me:18956: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17602: \$? = $ac_status" >&5 + echo "$as_me:18959: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_t=yes else @@ -17611,7 +18968,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:17614: result: $cf_cv_wchar_t" >&5 +echo "$as_me:18971: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -17634,14 +18991,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:17637: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:18994: 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 17644 "configure" +#line 19001 "configure" #include "confdefs.h" #include @@ -17659,23 +19016,23 @@ wint_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17662: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19019: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17665: \$? = $ac_status" >&5 + echo "$as_me:19022: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17668: \"$ac_try\"") >&5 + { (eval echo "$as_me:19025: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17671: \$? = $ac_status" >&5 + echo "$as_me:19028: \$? = $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 17678 "configure" +#line 19035 "configure" #include "confdefs.h" #include @@ -17694,16 +19051,16 @@ wint_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17697: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19054: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17700: \$? = $ac_status" >&5 + echo "$as_me:19057: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17703: \"$ac_try\"") >&5 + { (eval echo "$as_me:19060: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17706: \$? = $ac_status" >&5 + echo "$as_me:19063: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wint_t=yes else @@ -17715,7 +19072,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:17718: result: $cf_cv_wint_t" >&5 +echo "$as_me:19075: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -17739,10 +19096,10 @@ fi if test "$NCURSES_OK_MBSTATE_T" = 0 ; then -echo "$as_me:17742: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:19099: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 17745 "configure" +#line 19102 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -17760,16 +19117,16 @@ mbstate_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17763: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19120: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17766: \$? = $ac_status" >&5 + echo "$as_me:19123: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17769: \"$ac_try\"") >&5 + { (eval echo "$as_me:19126: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17772: \$? = $ac_status" >&5 + echo "$as_me:19129: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17778,7 +19135,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17781: result: $cf_result" >&5 +echo "$as_me:19138: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17800,10 +19157,10 @@ fi if test "$NCURSES_OK_WCHAR_T" = 0 ; then -echo "$as_me:17803: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:19160: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 17806 "configure" +#line 19163 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -17821,16 +19178,16 @@ wchar_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17824: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19181: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17827: \$? = $ac_status" >&5 + echo "$as_me:19184: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17830: \"$ac_try\"") >&5 + { (eval echo "$as_me:19187: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17833: \$? = $ac_status" >&5 + echo "$as_me:19190: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17839,7 +19196,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17842: result: $cf_result" >&5 +echo "$as_me:19199: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17861,10 +19218,10 @@ fi if test "$NCURSES_OK_WINT_T" = 0 ; then -echo "$as_me:17864: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:19221: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 17867 "configure" +#line 19224 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -17882,16 +19239,16 @@ wint_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17885: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19242: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17888: \$? = $ac_status" >&5 + echo "$as_me:19245: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17891: \"$ac_try\"") >&5 + { (eval echo "$as_me:19248: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17894: \$? = $ac_status" >&5 + echo "$as_me:19251: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -17900,7 +19257,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17903: result: $cf_result" >&5 +echo "$as_me:19260: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17922,17 +19279,18 @@ fi fi for cf_data in \ +TABSIZE \ curscr \ ospeed \ boolnames \ boolfnames \ ttytype do -echo "$as_me:17931: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:19289: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 17935 "configure" +#line 19293 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -17960,16 +19318,16 @@ void *foo = &($cf_data) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17963: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19321: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17966: \$? = $ac_status" >&5 + echo "$as_me:19324: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17969: \"$ac_try\"") >&5 + { (eval echo "$as_me:19327: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17972: \$? = $ac_status" >&5 + echo "$as_me:19330: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes @@ -17979,7 +19337,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:17982: result: $cf_result" >&5 +echo "$as_me:19340: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -17991,14 +19349,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./ EOF else - echo "$as_me:17994: checking for data $cf_data in library" >&5 + echo "$as_me:19352: checking for data $cf_data in library" >&5 echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6 # BSD linkers insist on making weak linkage, but resolve at runtime. if test "$cross_compiling" = yes; then # cross-compiling cat >conftest.$ac_ext <<_ACEOF -#line 18001 "configure" +#line 19359 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -18031,16 +19389,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18034: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19392: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18037: \$? = $ac_status" >&5 + echo "$as_me:19395: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18040: \"$ac_try\"") >&5 + { (eval echo "$as_me:19398: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18043: \$? = $ac_status" >&5 + echo "$as_me:19401: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -18052,7 +19410,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 18055 "configure" +#line 19413 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -18078,15 +19436,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18081: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19439: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18084: \$? = $ac_status" >&5 + echo "$as_me:19442: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18086: \"$ac_try\"") >&5 + { (eval echo "$as_me:19444: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18089: \$? = $ac_status" >&5 + echo "$as_me:19447: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes @@ -18098,7 +19456,7 @@ cf_result=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:18101: result: $cf_result" >&5 + echo "$as_me:19459: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -18115,7 +19473,7 @@ done if ( test "$GCC" = yes || test "$GXX" = yes ) then -echo "$as_me:18118: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:19476: checking if you want to turn on gcc warnings" >&5 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -18132,7 +19490,7 @@ else with_warnings=no fi; -echo "$as_me:18135: result: $with_warnings" >&5 +echo "$as_me:19493: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "$with_warnings" = "yes" then @@ -18155,10 +19513,10 @@ cat > conftest.i <&5 + { echo "$as_me:19516: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:19568: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18213: \$? = $ac_status" >&5 + echo "$as_me:19571: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:18215: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:19573: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in @@ -18271,113 +19629,111 @@ fi rm -rf conftest* fi -INTEL_COMPILER=no - -if test "$GCC" = yes ; then - case $host_os in - (linux*|gnu*) - echo "$as_me:18279: 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 18284 "configure" +if test "x$have_x" = xyes; then +cat >conftest.$ac_ext <<_ACEOF +#line 19634 "configure" #include "confdefs.h" +#include +#include + int main (void) { - -#ifdef __INTEL_COMPILER -#else -make an error -#endif - +String foo = malloc(1) ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18301: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19649: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18304: \$? = $ac_status" >&5 + echo "$as_me:19652: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18307: \"$ac_try\"") >&5 + { (eval echo "$as_me:19655: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18310: \$? = $ac_status" >&5 + echo "$as_me:19658: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - INTEL_COMPILER=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147" +echo "$as_me:19661: checking for X11/Xt const-feature" >&5 +echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 +if test "${cf_cv_const_x_string+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$cf_save_CFLAGS" - echo "$as_me:18321: result: $INTEL_COMPILER" >&5 -echo "${ECHO_T}$INTEL_COMPILER" >&6 - ;; - esac -fi - -CLANG_COMPILER=no -if test "$GCC" = yes ; then - echo "$as_me:18330: 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 18335 "configure" +#line 19668 "configure" #include "confdefs.h" +#define _CONST_X_STRING /* X11R7.8 (perhaps) */ +#undef XTSTRINGDEFINES /* X11R5 and later */ +#include +#include + int main (void) { - -#ifdef __clang__ -#else -make an error -#endif - +String foo = malloc(1); *foo = 0 ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18352: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19685: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18355: \$? = $ac_status" >&5 + echo "$as_me:19688: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18358: \"$ac_try\"") >&5 + { (eval echo "$as_me:19691: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18361: \$? = $ac_status" >&5 + echo "$as_me:19694: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - CLANG_COMPILER=yes -cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" + + cf_cv_const_x_string=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 + + cf_cv_const_x_string=yes + fi rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$cf_save_CFLAGS" - echo "$as_me:18372: result: $CLANG_COMPILER" >&5 -echo "${ECHO_T}$CLANG_COMPILER" >&6 + fi +echo "$as_me:19709: result: $cf_cv_const_x_string" >&5 +echo "${ECHO_T}$cf_cv_const_x_string" >&6 + +case $cf_cv_const_x_string in +(no) + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-DXTSTRINGDEFINES" + + ;; +(*) + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_CONST_X_STRING" + + ;; +esac + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext + fi cat > conftest.$ac_ext <&5 + { echo "$as_me:19750: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -18407,21 +19763,20 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:18410: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:19766: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18413: \$? = $ac_status" >&5 + echo "$as_me:19769: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:18415: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:19771: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi done CFLAGS="$cf_save_CFLAGS" - elif test "$GCC" = yes then - { echo "$as_me:18424: checking for $CC warning options..." >&5 + { echo "$as_me:19779: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= @@ -18445,23 +19800,20 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:18448: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:19803: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18451: \$? = $ac_status" >&5 + echo "$as_me:19806: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:18453: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:19808: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in - (Wcast-qual) - CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES" - ;; (Winline) case $GCC_VERSION in ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:18464: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:19816: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -18471,7 +19823,7 @@ echo "${as_me:-configure}:18464: testing feature is broken in gcc $GCC_VERSION . ([12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:18474: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:19826: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -18487,7 +19839,7 @@ rm -rf conftest* fi fi -echo "$as_me:18490: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:19842: 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. @@ -18504,7 +19856,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:18507: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:19859: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in @@ -18618,23 +19970,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:18621: checking for dmalloc.h" >&5 + echo "$as_me:19973: 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 18627 "configure" +#line 19979 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18631: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:19983: \"$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:18637: \$? = $ac_status" >&5 + echo "$as_me:19989: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18653,11 +20005,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18656: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:20008: 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:18660: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:20012: 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 @@ -18665,7 +20017,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18668 "configure" +#line 20020 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18684,16 +20036,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18687: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20039: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18690: \$? = $ac_status" >&5 + echo "$as_me:20042: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18693: \"$ac_try\"") >&5 + { (eval echo "$as_me:20045: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18696: \$? = $ac_status" >&5 + echo "$as_me:20048: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -18704,7 +20056,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18707: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:20059: 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:20074: 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. @@ -18736,7 +20088,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:18739: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:20091: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in @@ -18850,23 +20202,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:18853: checking for dbmalloc.h" >&5 + echo "$as_me:20205: 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 18859 "configure" +#line 20211 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18863: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:20215: \"$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:18869: \$? = $ac_status" >&5 + echo "$as_me:20221: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18885,11 +20237,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18888: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:20240: 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:18892: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:20244: 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 @@ -18897,7 +20249,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18900 "configure" +#line 20252 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18916,16 +20268,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18919: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20271: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18922: \$? = $ac_status" >&5 + echo "$as_me:20274: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18925: \"$ac_try\"") >&5 + { (eval echo "$as_me:20277: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18928: \$? = $ac_status" >&5 + echo "$as_me:20280: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -18936,7 +20288,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18939: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:20291: 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:20306: 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. @@ -18968,7 +20320,7 @@ EOF else with_valgrind= fi; -echo "$as_me:18971: result: ${with_valgrind:-no}" >&5 +echo "$as_me:20323: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in @@ -19081,7 +20433,7 @@ fi ;; esac -echo "$as_me:19084: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:20436: 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. @@ -19091,7 +20443,7 @@ if test "${enable_leaks+set}" = set; then else : ${with_no_leaks:=no} fi; -echo "$as_me:19094: result: $with_no_leaks" >&5 +echo "$as_me:20446: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then @@ -19107,64 +20459,66 @@ EOF fi LD_RPATH_OPT= -echo "$as_me:19110: checking for an rpath option" >&5 +if test "x$cf_cv_enable_rpath" != xno +then + echo "$as_me:20464: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 -case $cf_cv_system_name in -(irix*) - if test "$GCC" = yes; then + 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|freebsd*) LD_RPATH_OPT="-Wl,-rpath," - else + ;; + (openbsd[2-9].*|mirbsd*) + LD_RPATH_OPT="-Wl,-rpath," + ;; + (dragonfly*) LD_RPATH_OPT="-rpath " - fi - ;; -(linux*|gnu*|k*bsd*-gnu|freebsd*) - LD_RPATH_OPT="-Wl,-rpath," - ;; -(openbsd[2-9].*|mirbsd*) - LD_RPATH_OPT="-Wl,-rpath," - ;; -(dragonfly*) - LD_RPATH_OPT="-rpath " - ;; -(netbsd*) - LD_RPATH_OPT="-Wl,-rpath," - ;; -(osf*|mls+*) - LD_RPATH_OPT="-rpath " - ;; -(solaris2*) - LD_RPATH_OPT="-R" - ;; -(*) - ;; -esac -echo "$as_me:19141: result: $LD_RPATH_OPT" >&5 + ;; + (netbsd*) + LD_RPATH_OPT="-Wl,-rpath," + ;; + (osf*|mls+*) + LD_RPATH_OPT="-rpath " + ;; + (solaris2*) + LD_RPATH_OPT="-R" + ;; + (*) + ;; + esac + echo "$as_me:20495: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 -case "x$LD_RPATH_OPT" in -(x-R*) - echo "$as_me:19146: checking if we need a space after rpath option" >&5 + case "x$LD_RPATH_OPT" in + (x-R*) + echo "$as_me:20500: 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" + cf_save_LIBS="$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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in ${LD_RPATH_OPT}$libdir; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 19167 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 20521 "configure" #include "confdefs.h" int @@ -19176,16 +20530,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19179: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20533: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19182: \$? = $ac_status" >&5 + echo "$as_me:20536: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19185: \"$ac_try\"") >&5 + { (eval echo "$as_me:20539: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19188: \$? = $ac_status" >&5 + echo "$as_me:20542: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_space=no else @@ -19194,14 +20548,15 @@ cat conftest.$ac_ext >&5 cf_rpath_space=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS="$cf_save_LIBS" - echo "$as_me:19198: result: $cf_rpath_space" >&5 + LIBS="$cf_save_LIBS" + echo "$as_me:20552: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 - test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " - ;; -esac + test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " + ;; + esac +fi -echo "$as_me:19204: checking if rpath-hack should be disabled" >&5 +echo "$as_me:20559: 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. @@ -19218,21 +20573,21 @@ else cf_disable_rpath_hack=no fi; -echo "$as_me:19221: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:20576: 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:19225: checking for updated LDFLAGS" >&5 +echo "$as_me:20580: 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:19228: result: maybe" >&5 + echo "$as_me:20583: 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:19235: checking for $ac_word" >&5 +echo "$as_me:20590: 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 @@ -19247,7 +20602,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:19250: found $ac_dir/$ac_word" >&5 +echo "$as_me:20605: found $ac_dir/$ac_word" >&5 break done @@ -19255,10 +20610,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:19258: result: $cf_ldd_prog" >&5 + echo "$as_me:20613: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:19261: result: no" >&5 + echo "$as_me:20616: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -19272,7 +20627,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >conftest.$ac_ext <<_ACEOF -#line 19275 "configure" +#line 20630 "configure" #include "confdefs.h" #include int @@ -19284,16 +20639,16 @@ printf("Hello"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19287: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20642: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19290: \$? = $ac_status" >&5 + echo "$as_me:20645: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19293: \"$ac_try\"") >&5 + { (eval echo "$as_me:20648: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19296: \$? = $ac_status" >&5 + echo "$as_me:20651: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq` cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` @@ -19321,7 +20676,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}:19324: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:20679: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -19333,11 +20688,11 @@ echo "${as_me:-configure}:19324: testing ...adding -L$cf_rpath_dir/lib to LDFLAG test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:19336: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:20691: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:19340: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:20695: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -19374,7 +20729,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:19377: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:20732: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -19387,11 +20742,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:19390: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:20745: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:19394: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:20749: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -19428,7 +20783,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:19431: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:20786: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -19441,14 +20796,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:19444: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:20799: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:19448: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:20803: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:19451: result: no" >&5 + echo "$as_me:20806: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -19538,7 +20893,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:19541: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:20896: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -19670,7 +21025,7 @@ EOF cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:19717: error: ambiguous option: $1 + { { echo "$as_me:21072: 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;} @@ -19733,7 +21088,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:19736: error: unrecognized option: $1 + -*) { { echo "$as_me:21091: 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;} @@ -19752,7 +21107,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20170501, executed with +This file was extended by $as_me 2.52.20190901, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -19783,7 +21138,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;; - *) { { echo "$as_me:19786: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:21141: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -19847,6 +21202,7 @@ s,@datadir@,$datadir,;t t s,@sysconfdir@,$sysconfdir,;t t s,@sharedstatedir@,$sharedstatedir,;t t s,@localstatedir@,$localstatedir,;t t +s,@runstatedir@,$runstatedir,;t t s,@libdir@,$libdir,;t t s,@includedir@,$includedir,;t t s,@oldincludedir@,$oldincludedir,;t t @@ -19888,6 +21244,8 @@ s,@AWK@,$AWK,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@INSTALL_OPT_S@,$INSTALL_OPT_S,;t t +s,@INSTALL_OPT_O@,$INSTALL_OPT_O,;t t s,@LINT@,$LINT,;t t s,@LINT_OPTS@,$LINT_OPTS,;t t s,@CTAGS@,$CTAGS,;t t @@ -20076,7 +21434,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:20079: creating $ac_file" >&5 + { echo "$as_me:21437: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -20094,7 +21452,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:20097: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:21455: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -20107,7 +21465,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:20110: error: cannot find input file: $f" >&5 + { { echo "$as_me:21468: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -20123,7 +21481,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:20126: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:21484: 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;} @@ -20132,7 +21490,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:20135: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:21493: 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;} @@ -20169,7 +21527,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:20172: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:21530: 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;} @@ -20180,7 +21538,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:20183: WARNING: Some variables may not be substituted: + { echo "$as_me:21541: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -20229,7 +21587,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:20232: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:21590: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -20240,7 +21598,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:20243: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:21601: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -20253,7 +21611,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:20256: error: cannot find input file: $f" >&5 + { { echo "$as_me:21614: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -20311,7 +21669,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:20314: $ac_file is unchanged" >&5 + { echo "$as_me:21672: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \