X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=Ada95%2Fconfigure;h=f36c5fc34a872e37fa10097866152d8a5ca08850;hb=17db5dfb5e91dbd31058d78c9c23efead6f822ea;hp=8b155bcbce9314651c2003cb743020bbc3fc20ee;hpb=f259fb41d8f08b7e042eb928b839b59c8e39098c;p=ncurses.git diff --git a/Ada95/configure b/Ada95/configure index 8b155bcb..f36c5fc3 100755 --- a/Ada95/configure +++ b/Ada95/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.83 . +# From configure.in Revision: 1.85 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20210509. # @@ -3279,83 +3279,131 @@ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 ;; esac -PKG_CONFIG_LIBDIR=no +# if $PKG_CONFIG_LIBDIR is set, try to use that +cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[ ]*,,'` + +# if the option is used, let that override. otherwise default to "libdir" # Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given. if test "${with_pkg_config_libdir+set}" = set; then withval="$with_pkg_config_libdir" - PKG_CONFIG_LIBDIR=$withval + cf_search_path=$withval else - test "x$PKG_CONFIG" != xnone && PKG_CONFIG_LIBDIR=yes + test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir fi; -case x$PKG_CONFIG_LIBDIR in +case "x$cf_search_path" in +(xlibdir) + PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' + echo "$as_me:3298: result: $PKG_CONFIG_LIBDIR" >&5 +echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + cf_search_path= + ;; +(x) + ;; +(x/*\ *) + PKG_CONFIG_LIBDIR= + ;; (x/*) + PKG_CONFIG_LIBDIR="$cf_search_path" + echo "$as_me:3309: result: $PKG_CONFIG_LIBDIR" >&5 +echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + cf_search_path= ;; -(xyes) +(xyes|xauto) + echo "$as_me:3314: result: auto" >&5 +echo "${ECHO_T}auto" >&6 + cf_search_path= # Look for the library directory using the same prefix as the executable - if test "x$PKG_CONFIG" = xnone + echo "$as_me:3318: checking for search-list" >&5 +echo $ECHO_N "checking for search-list... $ECHO_C" >&6 + if test "x$PKG_CONFIG" != xnone then - cf_path=$prefix - else - cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'` - fi - - # If you don't like using the default architecture, you have to specify the - # intended library directory and corresponding compiler/linker options. - # - # This case allows for Debian's 2014-flavor of multiarch, along with the - # most common variations before that point. Some other variants spell the - # directory differently, e.g., "pkg-config", and put it in unusual places. - # pkg-config has always been poorly standardized, which is ironic... - case x`(arch) 2>/dev/null` in - (*64) - cf_search_path="\ - $cf_path/lib/*64-linux-gnu \ - $cf_path/share \ - $cf_path/lib64 \ - $cf_path/lib32 \ - $cf_path/lib" - ;; - (*) - cf_search_path="\ - $cf_path/lib/*-linux-gnu \ - $cf_path/share \ - $cf_path/lib32 \ - $cf_path/lib \ - $cf_path/libdata" - ;; - esac + # works for pkg-config since version 0.24 (2009) + # works for pkgconf since version 0.8.3 (2012) + for cf_pkg_program in \ + `echo "$PKG_CONFIG" | sed -e 's,^.*/,,'` \ + pkg-config \ + pkgconf + do + cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` + test -n "$cf_search_path" && break + done - test -n "$verbose" && echo " list..." 1>&6 + # works for pkg-config since import in 2005 of original 2001 HP code. + test -z "$cf_search_path" && \ + cf_search_path=` + "$PKG_CONFIG" --debug --exists no-such-package 2>&1 | $AWK "\ +/^Scanning directory (#[1-9][0-9]* )?'.*'$/{ \ + sub(\"^[^']*'\",\"\"); \ + sub(\"'.*\",\"\"); \ + printf \" %s\", \\$0; } \ +{ next; } \ +"` + fi -echo "${as_me:-configure}:3332: testing list... ..." 1>&5 + echo "$as_me:3345: result: $cf_search_path" >&5 +echo "${ECHO_T}$cf_search_path" >&6 + ;; +(*) + { { echo "$as_me:3349: error: Unexpected option value: $cf_search_path" >&5 +echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;} + { (exit 1); exit 1; }; } + ;; +esac +if test -n "$cf_search_path" +then + echo "$as_me:3357: checking for first directory" >&5 +echo $ECHO_N "checking for first directory... $ECHO_C" >&6 + cf_pkg_config_path=none for cf_config in $cf_search_path do - test -n "$verbose" && echo " checking $cf_config/pkgconfig" 1>&6 - -echo "${as_me:-configure}:3338: testing checking $cf_config/pkgconfig ..." 1>&5 - - if test -d "$cf_config/pkgconfig" + if test -d "$cf_config" then - PKG_CONFIG_LIBDIR=$cf_config/pkgconfig - echo "$as_me:3343: checking done" >&5 -echo $ECHO_N "checking done... $ECHO_C" >&6 + cf_pkg_config_path=$cf_config break fi done - ;; -(*) - ;; -esac + echo "$as_me:3368: result: $cf_pkg_config_path" >&5 +echo "${ECHO_T}$cf_pkg_config_path" >&6 + + if test "x$cf_pkg_config_path" != xnone ; then + # limit this to the first directory found + PKG_CONFIG_LIBDIR="$cf_pkg_config_path" + fi -if test "x$PKG_CONFIG_LIBDIR" != xno ; then - echo "$as_me:3354: result: $PKG_CONFIG_LIBDIR" >&5 + if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" + then + echo "$as_me:3378: checking for workaround" >&5 +echo $ECHO_N "checking for workaround... $ECHO_C" >&6 + if test "$prefix" = "NONE" ; then + cf_prefix="$ac_default_prefix" + else + cf_prefix="$prefix" + fi + eval cf_libdir=$libdir + cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"` + cf_backup= + for cf_config in $cf_search_path + do + case $cf_config in + $cf_libdir/pkgconfig) + PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig + break + ;; + *) + test -z "$cf_backup" && cf_backup=$cf_config + ;; + esac + done + test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup + echo "$as_me:3401: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + fi fi -echo "$as_me:3358: checking if you want to build test-programs" >&5 +echo "$as_me:3406: checking if you want to build test-programs" >&5 echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6 # Check whether --with-tests or --without-tests was given. @@ -3365,10 +3413,10 @@ if test "${with_tests+set}" = set; then else cf_with_tests=yes fi; -echo "$as_me:3368: result: $cf_with_tests" >&5 +echo "$as_me:3416: result: $cf_with_tests" >&5 echo "${ECHO_T}$cf_with_tests" >&6 -echo "$as_me:3371: checking if we should assume mixed-case filenames" >&5 +echo "$as_me:3419: checking if we should assume mixed-case filenames" >&5 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 # Check whether --enable-mixed-case or --disable-mixed-case was given. @@ -3378,11 +3426,11 @@ if test "${enable_mixed_case+set}" = set; then else enable_mixedcase=auto fi; -echo "$as_me:3381: result: $enable_mixedcase" >&5 +echo "$as_me:3429: result: $enable_mixedcase" >&5 echo "${ECHO_T}$enable_mixedcase" >&6 if test "$enable_mixedcase" = "auto" ; then -echo "$as_me:3385: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:3433: 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 @@ -3409,7 +3457,7 @@ else fi fi -echo "$as_me:3412: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3460: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -3427,7 +3475,7 @@ EOF fi # do this after mixed-case option (tags/TAGS is not as important as tic). -echo "$as_me:3430: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:3478: 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 @@ -3447,16 +3495,16 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:3450: result: yes" >&5 + echo "$as_me:3498: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:3454: result: no" >&5 + echo "$as_me:3502: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi -echo "$as_me:3459: checking for \".PHONY\" make-support" >&5 +echo "$as_me:3507: checking for \".PHONY\" make-support" >&5 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6 if test "${cf_cv_make_PHONY+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3511,7 +3559,7 @@ CF_EOF rm -rf conftest* fi -echo "$as_me:3514: result: $cf_cv_make_PHONY" >&5 +echo "$as_me:3562: result: $cf_cv_make_PHONY" >&5 echo "${ECHO_T}$cf_cv_make_PHONY" >&6 MAKE_NO_PHONY="#" MAKE_PHONY="#" @@ -3522,7 +3570,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:3525: checking for $ac_word" >&5 +echo "$as_me:3573: 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 @@ -3537,7 +3585,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:3540: found $ac_dir/$ac_word" >&5 +echo "$as_me:3588: found $ac_dir/$ac_word" >&5 break done @@ -3545,10 +3593,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:3548: result: $CTAGS" >&5 + echo "$as_me:3596: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:3551: result: no" >&5 + echo "$as_me:3599: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3559,7 +3607,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:3562: checking for $ac_word" >&5 +echo "$as_me:3610: 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 @@ -3574,7 +3622,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:3577: found $ac_dir/$ac_word" >&5 +echo "$as_me:3625: found $ac_dir/$ac_word" >&5 break done @@ -3582,10 +3630,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:3585: result: $ETAGS" >&5 + echo "$as_me:3633: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:3588: result: no" >&5 + echo "$as_me:3636: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3594,7 +3642,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:3597: checking for $ac_word" >&5 +echo "$as_me:3645: 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 @@ -3609,7 +3657,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:3612: found $ac_dir/$ac_word" >&5 +echo "$as_me:3660: found $ac_dir/$ac_word" >&5 break done @@ -3618,17 +3666,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:3621: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:3669: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:3624: result: no" >&5 + echo "$as_me:3672: 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:3631: checking for $ac_word" >&5 +echo "$as_me:3679: 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 @@ -3643,7 +3691,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:3646: found $ac_dir/$ac_word" >&5 +echo "$as_me:3694: found $ac_dir/$ac_word" >&5 break done @@ -3652,10 +3700,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:3655: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:3703: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:3658: result: no" >&5 + echo "$as_me:3706: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3675,7 +3723,7 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:3678: checking for makeflags variable" >&5 +echo "$as_me:3726: checking for makeflags variable" >&5 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 if test "${cf_cv_makeflags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3705,7 +3753,7 @@ CF_EOF ;; (*) -echo "${as_me:-configure}:3708: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 +echo "${as_me:-configure}:3756: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ;; esac @@ -3713,13 +3761,13 @@ echo "${as_me:-configure}:3708: testing given option \"$cf_option\",no match \"$ rm -f cf_makeflags.tmp fi -echo "$as_me:3716: result: $cf_cv_makeflags" >&5 +echo "$as_me:3764: result: $cf_cv_makeflags" >&5 echo "${ECHO_T}$cf_cv_makeflags" >&6 if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:3722: checking for $ac_word" >&5 +echo "$as_me:3770: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3734,7 +3782,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:3737: found $ac_dir/$ac_word" >&5 +echo "$as_me:3785: found $ac_dir/$ac_word" >&5 break done @@ -3742,10 +3790,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:3745: result: $RANLIB" >&5 + echo "$as_me:3793: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:3748: result: no" >&5 + echo "$as_me:3796: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3754,7 +3802,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:3757: checking for $ac_word" >&5 +echo "$as_me:3805: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3769,7 +3817,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:3772: found $ac_dir/$ac_word" >&5 +echo "$as_me:3820: found $ac_dir/$ac_word" >&5 break done @@ -3778,10 +3826,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:3781: result: $ac_ct_RANLIB" >&5 + echo "$as_me:3829: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:3784: result: no" >&5 + echo "$as_me:3832: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3793,7 +3841,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 -echo "$as_me:3796: checking for $ac_word" >&5 +echo "$as_me:3844: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3808,7 +3856,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LD="${ac_tool_prefix}ld" -echo "$as_me:3811: found $ac_dir/$ac_word" >&5 +echo "$as_me:3859: found $ac_dir/$ac_word" >&5 break done @@ -3816,10 +3864,10 @@ fi fi LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$as_me:3819: result: $LD" >&5 + echo "$as_me:3867: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:3822: result: no" >&5 + echo "$as_me:3870: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3828,7 +3876,7 @@ if test -z "$ac_cv_prog_LD"; then ac_ct_LD=$LD # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 -echo "$as_me:3831: checking for $ac_word" >&5 +echo "$as_me:3879: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3843,7 +3891,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_LD="ld" -echo "$as_me:3846: found $ac_dir/$ac_word" >&5 +echo "$as_me:3894: found $ac_dir/$ac_word" >&5 break done @@ -3852,10 +3900,10 @@ fi fi ac_ct_LD=$ac_cv_prog_ac_ct_LD if test -n "$ac_ct_LD"; then - echo "$as_me:3855: result: $ac_ct_LD" >&5 + echo "$as_me:3903: result: $ac_ct_LD" >&5 echo "${ECHO_T}$ac_ct_LD" >&6 else - echo "$as_me:3858: result: no" >&5 + echo "$as_me:3906: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3867,7 +3915,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:3870: checking for $ac_word" >&5 +echo "$as_me:3918: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3882,7 +3930,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AR="${ac_tool_prefix}ar" -echo "$as_me:3885: found $ac_dir/$ac_word" >&5 +echo "$as_me:3933: found $ac_dir/$ac_word" >&5 break done @@ -3890,10 +3938,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:3893: result: $AR" >&5 + echo "$as_me:3941: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:3896: result: no" >&5 + echo "$as_me:3944: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3902,7 +3950,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:3905: checking for $ac_word" >&5 +echo "$as_me:3953: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3917,7 +3965,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_AR="ar" -echo "$as_me:3920: found $ac_dir/$ac_word" >&5 +echo "$as_me:3968: found $ac_dir/$ac_word" >&5 break done @@ -3926,10 +3974,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:3929: result: $ac_ct_AR" >&5 + echo "$as_me:3977: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:3932: result: no" >&5 + echo "$as_me:3980: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3941,7 +3989,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:3944: checking for $ac_word" >&5 +echo "$as_me:3992: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3956,7 +4004,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AR="${ac_tool_prefix}ar" -echo "$as_me:3959: found $ac_dir/$ac_word" >&5 +echo "$as_me:4007: found $ac_dir/$ac_word" >&5 break done @@ -3964,10 +4012,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:3967: result: $AR" >&5 + echo "$as_me:4015: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:3970: result: no" >&5 + echo "$as_me:4018: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3976,7 +4024,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:3979: checking for $ac_word" >&5 +echo "$as_me:4027: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3991,7 +4039,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_AR="ar" -echo "$as_me:3994: found $ac_dir/$ac_word" >&5 +echo "$as_me:4042: found $ac_dir/$ac_word" >&5 break done @@ -4000,10 +4048,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:4003: result: $ac_ct_AR" >&5 + echo "$as_me:4051: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4006: result: no" >&5 + echo "$as_me:4054: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4012,7 +4060,7 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:4015: checking for options to update archives" >&5 +echo "$as_me:4063: checking for options to update archives" >&5 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 if test "${cf_cv_ar_flags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4049,13 +4097,13 @@ else rm -f conftest.a cat >"conftest.$ac_ext" <&5 + if { (eval echo "$as_me:4103: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4058: \$? = $ac_status" >&5 + echo "$as_me:4106: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null @@ -4066,7 +4114,7 @@ EOF else test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me:-configure}:4069: testing cannot compile test-program ..." 1>&5 +echo "${as_me:-configure}:4117: testing cannot compile test-program ..." 1>&5 break fi @@ -4076,7 +4124,7 @@ echo "${as_me:-configure}:4069: testing cannot compile test-program ..." 1>&5 esac fi -echo "$as_me:4079: result: $cf_cv_ar_flags" >&5 +echo "$as_me:4127: result: $cf_cv_ar_flags" >&5 echo "${ECHO_T}$cf_cv_ar_flags" >&6 if test -n "$ARFLAGS" ; then @@ -4087,17 +4135,17 @@ else ARFLAGS=$cf_cv_ar_flags fi - echo "$as_me:4090: checking for PATH separator" >&5 + echo "$as_me:4138: checking for PATH separator" >&5 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 case "$cf_cv_system_name" in (os2*) PATH_SEPARATOR=';' ;; (*) ${PATH_SEPARATOR:=':'} ;; esac - echo "$as_me:4097: result: $PATH_SEPARATOR" >&5 + echo "$as_me:4145: result: $PATH_SEPARATOR" >&5 echo "${ECHO_T}$PATH_SEPARATOR" >&6 -echo "$as_me:4100: checking if you have specified an install-prefix" >&5 +echo "$as_me:4148: checking if you have specified an install-prefix" >&5 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 # Check whether --with-install-prefix or --without-install-prefix was given. @@ -4110,7 +4158,7 @@ if test "${with_install_prefix+set}" = set; then ;; esac fi; -echo "$as_me:4113: result: $DESTDIR" >&5 +echo "$as_me:4161: result: $DESTDIR" >&5 echo "${ECHO_T}$DESTDIR" >&6 ############################################################################### @@ -4138,7 +4186,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4141: checking for $ac_word" >&5 +echo "$as_me:4189: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_BUILD_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4153,7 +4201,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_BUILD_CC="$ac_prog" -echo "$as_me:4156: found $ac_dir/$ac_word" >&5 +echo "$as_me:4204: found $ac_dir/$ac_word" >&5 break done @@ -4161,10 +4209,10 @@ fi fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - echo "$as_me:4164: result: $BUILD_CC" >&5 + echo "$as_me:4212: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 else - echo "$as_me:4167: result: no" >&5 + echo "$as_me:4215: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4173,12 +4221,12 @@ done test -n "$BUILD_CC" || BUILD_CC="none" fi; - echo "$as_me:4176: checking for native build C compiler" >&5 + echo "$as_me:4224: checking for native build C compiler" >&5 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 - echo "$as_me:4178: result: $BUILD_CC" >&5 + echo "$as_me:4226: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 - echo "$as_me:4181: checking for native build C preprocessor" >&5 + echo "$as_me:4229: checking for native build C preprocessor" >&5 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 # Check whether --with-build-cpp or --without-build-cpp was given. @@ -4188,10 +4236,10 @@ if test "${with_build_cpp+set}" = set; then else BUILD_CPP='${BUILD_CC} -E' fi; - echo "$as_me:4191: result: $BUILD_CPP" >&5 + echo "$as_me:4239: result: $BUILD_CPP" >&5 echo "${ECHO_T}$BUILD_CPP" >&6 - echo "$as_me:4194: checking for native build C flags" >&5 + echo "$as_me:4242: checking for native build C flags" >&5 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 # Check whether --with-build-cflags or --without-build-cflags was given. @@ -4199,10 +4247,10 @@ if test "${with_build_cflags+set}" = set; then withval="$with_build_cflags" BUILD_CFLAGS="$withval" fi; - echo "$as_me:4202: result: $BUILD_CFLAGS" >&5 + echo "$as_me:4250: result: $BUILD_CFLAGS" >&5 echo "${ECHO_T}$BUILD_CFLAGS" >&6 - echo "$as_me:4205: checking for native build C preprocessor-flags" >&5 + echo "$as_me:4253: checking for native build C preprocessor-flags" >&5 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 # Check whether --with-build-cppflags or --without-build-cppflags was given. @@ -4210,10 +4258,10 @@ if test "${with_build_cppflags+set}" = set; then withval="$with_build_cppflags" BUILD_CPPFLAGS="$withval" fi; - echo "$as_me:4213: result: $BUILD_CPPFLAGS" >&5 + echo "$as_me:4261: result: $BUILD_CPPFLAGS" >&5 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - echo "$as_me:4216: checking for native build linker-flags" >&5 + echo "$as_me:4264: checking for native build linker-flags" >&5 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 # Check whether --with-build-ldflags or --without-build-ldflags was given. @@ -4221,10 +4269,10 @@ if test "${with_build_ldflags+set}" = set; then withval="$with_build_ldflags" BUILD_LDFLAGS="$withval" fi; - echo "$as_me:4224: result: $BUILD_LDFLAGS" >&5 + echo "$as_me:4272: result: $BUILD_LDFLAGS" >&5 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - echo "$as_me:4227: checking for native build linker-libraries" >&5 + echo "$as_me:4275: checking for native build linker-libraries" >&5 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 # Check whether --with-build-libs or --without-build-libs was given. @@ -4232,7 +4280,7 @@ if test "${with_build_libs+set}" = set; then withval="$with_build_libs" BUILD_LIBS="$withval" fi; - echo "$as_me:4235: result: $BUILD_LIBS" >&5 + echo "$as_me:4283: result: $BUILD_LIBS" >&5 echo "${ECHO_T}$BUILD_LIBS" >&6 # this assumes we're on Unix. @@ -4242,7 +4290,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6 : ${BUILD_CC:='${CC}'} if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then - { { echo "$as_me:4245: error: Cross-build requires two compilers. + { { echo "$as_me:4293: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&5 echo "$as_me: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&2;} @@ -4267,7 +4315,7 @@ fi ### shared, for example. cf_list_models="" -echo "$as_me:4270: checking if you want to build shared C-objects" >&5 +echo "$as_me:4318: checking if you want to build shared C-objects" >&5 echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6 # Check whether --with-shared or --without-shared was given. @@ -4277,27 +4325,27 @@ if test "${with_shared+set}" = set; then else with_shared=no fi; -echo "$as_me:4280: result: $with_shared" >&5 +echo "$as_me:4328: result: $with_shared" >&5 echo "${ECHO_T}$with_shared" >&6 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" -echo "$as_me:4284: checking for specified models" >&5 +echo "$as_me:4332: checking for specified models" >&5 echo $ECHO_N "checking for specified models... $ECHO_C" >&6 test -z "$cf_list_models" && cf_list_models=normal -echo "$as_me:4287: result: $cf_list_models" >&5 +echo "$as_me:4335: result: $cf_list_models" >&5 echo "${ECHO_T}$cf_list_models" >&6 ### Use the first model as the default, and save its suffix for use in building ### up test-applications. -echo "$as_me:4292: checking for default model" >&5 +echo "$as_me:4340: checking for default model" >&5 echo $ECHO_N "checking for default model... $ECHO_C" >&6 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` -echo "$as_me:4295: result: $DFT_LWR_MODEL" >&5 +echo "$as_me:4343: result: $DFT_LWR_MODEL" >&5 echo "${ECHO_T}$DFT_LWR_MODEL" >&6 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -echo "$as_me:4300: checking for specific curses-directory" >&5 +echo "$as_me:4348: 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. @@ -4307,7 +4355,7 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:4310: result: $cf_cv_curses_dir" >&5 +echo "$as_me:4358: 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" @@ -4338,7 +4386,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:4341: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:4389: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -4374,7 +4422,7 @@ if test -n "$cf_cv_curses_dir/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 4377 "configure" +#line 4425 "configure" #include "confdefs.h" #include int @@ -4386,16 +4434,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4389: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4437: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4392: \$? = $ac_status" >&5 + echo "$as_me:4440: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4395: \"$ac_try\"") >&5 + { (eval echo "$as_me:4443: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4398: \$? = $ac_status" >&5 + echo "$as_me:4446: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4412,7 +4460,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}:4415: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:4463: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -4448,7 +4496,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}:4451: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:4499: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -4463,13 +4511,13 @@ cf_ncuconfig_root=ncurses cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:4466: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:4514: 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:4469: result: yes" >&5 + echo "$as_me:4517: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:4472: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:4520: 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 @@ -4602,7 +4650,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 4605 "configure" +#line 4653 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -4614,37 +4662,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4617: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4665: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4620: \$? = $ac_status" >&5 + echo "$as_me:4668: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4623: \"$ac_try\"") >&5 + { (eval echo "$as_me:4671: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4626: \$? = $ac_status" >&5 + echo "$as_me:4674: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 4632 "configure" +#line 4680 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:4639: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4687: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4642: \$? = $ac_status" >&5 + echo "$as_me:4690: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:4644: \"$ac_try\"") >&5 + { (eval echo "$as_me:4692: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4647: \$? = $ac_status" >&5 + echo "$as_me:4695: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -4675,12 +4723,38 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_add_cflags in $cf_pkg_cflags +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_pkg_cflags +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -4773,6 +4847,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -4790,7 +4866,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 4793 "configure" +#line 4869 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -4802,37 +4878,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4805: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4881: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4808: \$? = $ac_status" >&5 + echo "$as_me:4884: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4811: \"$ac_try\"") >&5 + { (eval echo "$as_me:4887: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4814: \$? = $ac_status" >&5 + echo "$as_me:4890: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 4820 "configure" +#line 4896 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:4827: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4903: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4830: \$? = $ac_status" >&5 + echo "$as_me:4906: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:4832: \"$ac_try\"") >&5 + { (eval echo "$as_me:4908: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4835: \$? = $ac_status" >&5 + echo "$as_me:4911: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -4849,7 +4925,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:4852: result: $cf_have_ncuconfig" >&5 + echo "$as_me:4928: 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" @@ -4865,7 +4941,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:4868: checking for terminfo header" >&5 +echo "$as_me:4944: 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 @@ -4883,7 +4959,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 4886 "configure" +#line 4962 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -4898,16 +4974,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4901: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4977: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4904: \$? = $ac_status" >&5 + echo "$as_me:4980: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4907: \"$ac_try\"") >&5 + { (eval echo "$as_me:4983: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4910: \$? = $ac_status" >&5 + echo "$as_me:4986: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -4923,7 +4999,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:4926: result: $cf_cv_term_header" >&5 +echo "$as_me:5002: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -4958,7 +5034,7 @@ esac fi else - echo "$as_me:4961: result: no" >&5 + echo "$as_me:5037: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -4974,7 +5050,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:4977: checking for $ac_word" >&5 +echo "$as_me:5053: 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 @@ -4989,7 +5065,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:4992: found $ac_dir/$ac_word" >&5 +echo "$as_me:5068: found $ac_dir/$ac_word" >&5 break done @@ -4997,10 +5073,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:5000: result: $NCURSES_CONFIG" >&5 + echo "$as_me:5076: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:5003: result: no" >&5 + echo "$as_me:5079: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5013,7 +5089,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:5016: checking for $ac_word" >&5 +echo "$as_me:5092: 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 @@ -5028,7 +5104,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:5031: found $ac_dir/$ac_word" >&5 +echo "$as_me:5107: found $ac_dir/$ac_word" >&5 break done @@ -5036,10 +5112,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:5039: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:5115: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:5042: result: no" >&5 + echo "$as_me:5118: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5052,12 +5128,38 @@ fi if test "$NCURSES_CONFIG" != none ; then +for cf_add_cflags in `$NCURSES_CONFIG --cflags` +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$NCURSES_CONFIG --cflags` +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -5150,6 +5252,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -5168,7 +5272,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:5171: checking if we have identified curses headers" >&5 +echo "$as_me:5275: 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 @@ -5180,7 +5284,7 @@ for cf_header in \ curses.h ncurses/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 5183 "configure" +#line 5287 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -5192,16 +5296,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5195: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5299: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5198: \$? = $ac_status" >&5 + echo "$as_me:5302: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5201: \"$ac_try\"") >&5 + { (eval echo "$as_me:5305: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5204: \$? = $ac_status" >&5 + echo "$as_me:5308: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -5212,11 +5316,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5215: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:5319: 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:5219: error: No curses header-files found" >&5 + { { echo "$as_me:5323: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -5226,23 +5330,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:5229: checking for $ac_header" >&5 +echo "$as_me:5333: 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 5235 "configure" +#line 5339 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5239: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:5343: \"$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:5245: \$? = $ac_status" >&5 + echo "$as_me:5349: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5261,7 +5365,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:5264: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:5368: 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 5320 "configure" +#line 5424 "configure" #include "confdefs.h" #include int @@ -5329,16 +5433,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5332: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5436: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5335: \$? = $ac_status" >&5 + echo "$as_me:5439: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5338: \"$ac_try\"") >&5 + { (eval echo "$as_me:5442: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5341: \$? = $ac_status" >&5 + echo "$as_me:5445: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5355,7 +5459,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}:5358: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5462: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5374,7 +5478,7 @@ fi } -echo "$as_me:5377: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:5481: 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 @@ -5386,7 +5490,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 5389 "configure" +#line 5493 "configure" #include "confdefs.h" #include <$cf_header> @@ -5410,16 +5514,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5413: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5517: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5416: \$? = $ac_status" >&5 + echo "$as_me:5520: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5419: \"$ac_try\"") >&5 + { (eval echo "$as_me:5523: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5422: \$? = $ac_status" >&5 + echo "$as_me:5526: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -5434,14 +5538,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5437: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:5541: 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:5444: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:5548: 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 @@ -5562,7 +5666,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 5565 "configure" +#line 5669 "configure" #include "confdefs.h" #include int @@ -5574,16 +5678,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5577: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5681: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5580: \$? = $ac_status" >&5 + echo "$as_me:5684: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5583: \"$ac_try\"") >&5 + { (eval echo "$as_me:5687: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5586: \$? = $ac_status" >&5 + echo "$as_me:5690: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5600,7 +5704,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}:5603: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5707: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5623,7 +5727,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 5626 "configure" +#line 5730 "configure" #include "confdefs.h" #include <$cf_header> @@ -5647,16 +5751,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5650: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5754: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5653: \$? = $ac_status" >&5 + echo "$as_me:5757: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5656: \"$ac_try\"") >&5 + { (eval echo "$as_me:5760: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5659: \$? = $ac_status" >&5 + echo "$as_me:5763: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -5677,12 +5781,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:5680: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5784: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:5685: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:5789: 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%/[^/]*$%%'` @@ -5718,7 +5822,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 5721 "configure" +#line 5825 "configure" #include "confdefs.h" #include int @@ -5730,16 +5834,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5733: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5837: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5736: \$? = $ac_status" >&5 + echo "$as_me:5840: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5739: \"$ac_try\"") >&5 + { (eval echo "$as_me:5843: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5742: \$? = $ac_status" >&5 + echo "$as_me:5846: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5756,7 +5860,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}:5759: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5863: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5804,7 +5908,7 @@ EOF ;; esac -echo "$as_me:5807: checking for terminfo header" >&5 +echo "$as_me:5911: 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 @@ -5822,7 +5926,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 5825 "configure" +#line 5929 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -5837,16 +5941,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5840: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5944: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5843: \$? = $ac_status" >&5 + echo "$as_me:5947: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5846: \"$ac_try\"") >&5 + { (eval echo "$as_me:5950: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5849: \$? = $ac_status" >&5 + echo "$as_me:5953: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -5862,7 +5966,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5865: result: $cf_cv_term_header" >&5 +echo "$as_me:5969: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -5900,7 +6004,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:5903: checking for ncurses version" >&5 +echo "$as_me:6007: 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 @@ -5926,10 +6030,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:5929: \"$cf_try\"") >&5 + { (eval echo "$as_me:6033: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:5932: \$? = $ac_status" >&5 + echo "$as_me:6036: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -5939,7 +6043,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 5942 "configure" +#line 6046 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -5964,15 +6068,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:5967: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6071: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5970: \$? = $ac_status" >&5 + echo "$as_me:6074: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:5972: \"$ac_try\"") >&5 + { (eval echo "$as_me:6076: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5975: \$? = $ac_status" >&5 + echo "$as_me:6079: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -5986,7 +6090,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:5989: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:6093: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -5999,7 +6103,7 @@ cf_nculib_root=ncurses # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:6002: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:6106: 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 @@ -6007,7 +6111,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6010 "configure" +#line 6114 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6026,16 +6130,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6029: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6133: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6032: \$? = $ac_status" >&5 + echo "$as_me:6136: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6035: \"$ac_try\"") >&5 + { (eval echo "$as_me:6139: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6038: \$? = $ac_status" >&5 + echo "$as_me:6142: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -6046,10 +6150,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6049: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:6153: 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:6052: checking for initscr in -lgpm" >&5 + echo "$as_me:6156: 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 @@ -6057,7 +6161,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6060 "configure" +#line 6164 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6076,16 +6180,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6079: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6183: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6082: \$? = $ac_status" >&5 + echo "$as_me:6186: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6085: \"$ac_try\"") >&5 + { (eval echo "$as_me:6189: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6088: \$? = $ac_status" >&5 + echo "$as_me:6192: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -6096,7 +6200,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6099: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:6203: 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" @@ -6109,9 +6213,9 @@ fi case "$host_os" in (freebsd*) # This is only necessary if you are linking against an obsolete - # version of ncurses (but it should do no harm, since it's static). + # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:6114: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:6218: 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 @@ -6119,7 +6223,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6122 "configure" +#line 6226 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6138,16 +6242,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6141: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6245: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6144: \$? = $ac_status" >&5 + echo "$as_me:6248: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6147: \"$ac_try\"") >&5 + { (eval echo "$as_me:6251: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6150: \$? = $ac_status" >&5 + echo "$as_me:6254: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -6158,7 +6262,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6161: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:6265: 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" @@ -6207,13 +6311,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:6210: checking for initscr" >&5 + echo "$as_me:6314: 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 6216 "configure" +#line 6320 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -6244,16 +6348,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6247: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6351: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6250: \$? = $ac_status" >&5 + echo "$as_me:6354: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6253: \"$ac_try\"") >&5 + { (eval echo "$as_me:6357: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6256: \$? = $ac_status" >&5 + echo "$as_me:6360: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -6263,18 +6367,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:6266: result: $ac_cv_func_initscr" >&5 +echo "$as_me:6370: 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:6273: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:6377: 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 6277 "configure" +#line 6381 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6286,25 +6390,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6289: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6393: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6292: \$? = $ac_status" >&5 + echo "$as_me:6396: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6295: \"$ac_try\"") >&5 + { (eval echo "$as_me:6399: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6298: \$? = $ac_status" >&5 + echo "$as_me:6402: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:6300: result: yes" >&5 + echo "$as_me:6404: 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:6307: result: no" >&5 +echo "$as_me:6411: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -6372,11 +6476,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:6375: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:6479: 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 6379 "configure" +#line 6483 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6388,25 +6492,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6391: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6495: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6394: \$? = $ac_status" >&5 + echo "$as_me:6498: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6397: \"$ac_try\"") >&5 + { (eval echo "$as_me:6501: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6400: \$? = $ac_status" >&5 + echo "$as_me:6504: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:6402: result: yes" >&5 + echo "$as_me:6506: 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:6409: result: no" >&5 +echo "$as_me:6513: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -6421,7 +6525,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:6424: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:6528: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -6429,7 +6533,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:6432: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:6536: 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 @@ -6439,7 +6543,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 6442 "configure" +#line 6546 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6451,23 +6555,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6454: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6558: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6457: \$? = $ac_status" >&5 + echo "$as_me:6561: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6460: \"$ac_try\"") >&5 + { (eval echo "$as_me:6564: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6463: \$? = $ac_status" >&5 + echo "$as_me:6567: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:6465: result: yes" >&5 + echo "$as_me:6569: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:6470: result: no" >&5 +echo "$as_me:6574: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -6485,7 +6589,7 @@ else NCURSES_CONFIG=none fi -echo "$as_me:6488: checking if you want wide-character code" >&5 +echo "$as_me:6592: checking if you want wide-character code" >&5 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -6495,30 +6599,30 @@ if test "${enable_widec+set}" = set; then else with_widec=no fi; -echo "$as_me:6498: result: $with_widec" >&5 +echo "$as_me:6602: result: $with_widec" >&5 echo "${ECHO_T}$with_widec" >&6 if test "$with_widec" = yes ; then for ac_header in wchar.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:6505: checking for $ac_header" >&5 +echo "$as_me:6609: 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 6511 "configure" +#line 6615 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:6515: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6619: \"$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:6521: \$? = $ac_status" >&5 + echo "$as_me:6625: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6537,7 +6641,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6540: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:6644: 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:6654: 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 @@ -6555,7 +6659,7 @@ else cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6558 "configure" +#line 6662 "configure" #include "confdefs.h" #include @@ -6573,16 +6677,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6576: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6680: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6579: \$? = $ac_status" >&5 + echo "$as_me:6683: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6582: \"$ac_try\"") >&5 + { (eval echo "$as_me:6686: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6585: \$? = $ac_status" >&5 + echo "$as_me:6689: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_utf8_lib=yes else @@ -6594,12 +6698,12 @@ cat "conftest.$ac_ext" >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:6597: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:6701: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6602 "configure" +#line 6706 "configure" #include "confdefs.h" #include @@ -6612,16 +6716,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6615: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6719: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6618: \$? = $ac_status" >&5 + echo "$as_me:6722: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6621: \"$ac_try\"") >&5 + { (eval echo "$as_me:6725: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6624: \$? = $ac_status" >&5 + echo "$as_me:6728: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -6635,7 +6739,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lutf8 $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6638 "configure" +#line 6742 "configure" #include "confdefs.h" #include @@ -6648,16 +6752,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6651: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6755: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6654: \$? = $ac_status" >&5 + echo "$as_me:6758: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6657: \"$ac_try\"") >&5 + { (eval echo "$as_me:6761: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6660: \$? = $ac_status" >&5 + echo "$as_me:6764: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -6674,9 +6778,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:6677: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:6781: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:6679: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:6783: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -6767,7 +6871,7 @@ 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}:6770: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:6874: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -6775,7 +6879,7 @@ echo "${as_me:-configure}:6770: testing ... testing $cf_cv_header_path_utf8 ..." CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" cat >"conftest.$ac_ext" <<_ACEOF -#line 6778 "configure" +#line 6882 "configure" #include "confdefs.h" #include @@ -6788,21 +6892,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6791: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6895: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6794: \$? = $ac_status" >&5 + echo "$as_me:6898: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6797: \"$ac_try\"") >&5 + { (eval echo "$as_me:6901: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6800: \$? = $ac_status" >&5 + echo "$as_me:6904: \$? = $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}:6805: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:6909: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -6820,7 +6924,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:6823: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:6927: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -6895,13 +6999,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}:6898: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7002: 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 6904 "configure" +#line 7008 "configure" #include "confdefs.h" #include @@ -6914,21 +7018,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6917: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7021: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6920: \$? = $ac_status" >&5 + echo "$as_me:7024: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6923: \"$ac_try\"") >&5 + { (eval echo "$as_me:7027: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6926: \$? = $ac_status" >&5 + echo "$as_me:7030: \$? = $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}:6931: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7035: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -6970,7 +7074,7 @@ fi fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:6973: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:7077: 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 @@ -7008,7 +7112,7 @@ if test -n "$cf_cv_header_path_utf8" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 7011 "configure" +#line 7115 "configure" #include "confdefs.h" #include int @@ -7020,16 +7124,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7023: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7127: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7026: \$? = $ac_status" >&5 + echo "$as_me:7130: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7029: \"$ac_try\"") >&5 + { (eval echo "$as_me:7133: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7032: \$? = $ac_status" >&5 + echo "$as_me:7136: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -7046,7 +7150,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}:7049: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7153: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7082,7 +7186,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}:7085: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7189: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7112,13 +7216,13 @@ cf_ncuconfig_root=ncursesw cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:7115: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:7219: 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:7118: result: yes" >&5 + echo "$as_me:7222: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:7121: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:7225: 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 @@ -7251,7 +7355,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 7254 "configure" +#line 7358 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7263,37 +7367,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7266: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7370: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7269: \$? = $ac_status" >&5 + echo "$as_me:7373: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7272: \"$ac_try\"") >&5 + { (eval echo "$as_me:7376: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7275: \$? = $ac_status" >&5 + echo "$as_me:7379: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 7281 "configure" +#line 7385 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:7288: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7392: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7291: \$? = $ac_status" >&5 + echo "$as_me:7395: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:7293: \"$ac_try\"") >&5 + { (eval echo "$as_me:7397: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7296: \$? = $ac_status" >&5 + echo "$as_me:7400: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -7324,12 +7428,38 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_add_cflags in $cf_pkg_cflags +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_pkg_cflags +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -7422,6 +7552,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -7439,7 +7571,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 7442 "configure" +#line 7574 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7451,37 +7583,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7454: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7586: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7457: \$? = $ac_status" >&5 + echo "$as_me:7589: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7460: \"$ac_try\"") >&5 + { (eval echo "$as_me:7592: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7463: \$? = $ac_status" >&5 + echo "$as_me:7595: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 7469 "configure" +#line 7601 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:7476: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7608: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7479: \$? = $ac_status" >&5 + echo "$as_me:7611: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:7481: \"$ac_try\"") >&5 + { (eval echo "$as_me:7613: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7484: \$? = $ac_status" >&5 + echo "$as_me:7616: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -7498,7 +7630,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:7501: result: $cf_have_ncuconfig" >&5 + echo "$as_me:7633: 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" @@ -7514,7 +7646,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:7517: checking for terminfo header" >&5 +echo "$as_me:7649: 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 @@ -7532,7 +7664,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 7535 "configure" +#line 7667 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -7547,16 +7679,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7550: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7682: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7553: \$? = $ac_status" >&5 + echo "$as_me:7685: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7556: \"$ac_try\"") >&5 + { (eval echo "$as_me:7688: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7559: \$? = $ac_status" >&5 + echo "$as_me:7691: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -7572,7 +7704,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:7575: result: $cf_cv_term_header" >&5 +echo "$as_me:7707: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -7607,7 +7739,7 @@ esac fi else - echo "$as_me:7610: result: no" >&5 + echo "$as_me:7742: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -7623,7 +7755,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:7626: checking for $ac_word" >&5 +echo "$as_me:7758: 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 @@ -7638,7 +7770,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:7641: found $ac_dir/$ac_word" >&5 +echo "$as_me:7773: found $ac_dir/$ac_word" >&5 break done @@ -7646,10 +7778,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:7649: result: $NCURSES_CONFIG" >&5 + echo "$as_me:7781: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:7652: result: no" >&5 + echo "$as_me:7784: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7662,7 +7794,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:7665: checking for $ac_word" >&5 +echo "$as_me:7797: 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 @@ -7677,7 +7809,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:7680: found $ac_dir/$ac_word" >&5 +echo "$as_me:7812: found $ac_dir/$ac_word" >&5 break done @@ -7685,10 +7817,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:7688: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:7820: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:7691: result: no" >&5 + echo "$as_me:7823: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7701,12 +7833,38 @@ fi if test "$NCURSES_CONFIG" != none ; then +for cf_add_cflags in `$NCURSES_CONFIG --cflags` +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$NCURSES_CONFIG --cflags` +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -7799,6 +7957,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -7817,7 +7977,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:7820: checking if we have identified curses headers" >&5 +echo "$as_me:7980: 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 @@ -7829,7 +7989,7 @@ for cf_header in \ curses.h ncursesw/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 7832 "configure" +#line 7992 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -7841,16 +8001,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7844: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8004: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7847: \$? = $ac_status" >&5 + echo "$as_me:8007: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7850: \"$ac_try\"") >&5 + { (eval echo "$as_me:8010: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7853: \$? = $ac_status" >&5 + echo "$as_me:8013: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -7861,11 +8021,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:7864: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:8024: 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:7868: error: No curses header-files found" >&5 + { { echo "$as_me:8028: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -7875,23 +8035,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:7878: checking for $ac_header" >&5 +echo "$as_me:8038: 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 7884 "configure" +#line 8044 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:7888: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:8048: \"$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:7894: \$? = $ac_status" >&5 + echo "$as_me:8054: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7910,7 +8070,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:7913: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:8073: 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 7969 "configure" +#line 8129 "configure" #include "confdefs.h" #include int @@ -7978,16 +8138,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7981: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8141: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7984: \$? = $ac_status" >&5 + echo "$as_me:8144: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7987: \"$ac_try\"") >&5 + { (eval echo "$as_me:8147: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7990: \$? = $ac_status" >&5 + echo "$as_me:8150: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8004,7 +8164,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}:8007: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8167: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8023,7 +8183,7 @@ fi } -echo "$as_me:8026: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:8186: 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 @@ -8035,7 +8195,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 8038 "configure" +#line 8198 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -8067,16 +8227,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8070: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8230: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8073: \$? = $ac_status" >&5 + echo "$as_me:8233: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8076: \"$ac_try\"") >&5 + { (eval echo "$as_me:8236: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8079: \$? = $ac_status" >&5 + echo "$as_me:8239: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -8091,14 +8251,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8094: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:8254: 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:8101: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:8261: 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 @@ -8219,7 +8379,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 8222 "configure" +#line 8382 "configure" #include "confdefs.h" #include int @@ -8231,16 +8391,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8234: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8394: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8237: \$? = $ac_status" >&5 + echo "$as_me:8397: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8240: \"$ac_try\"") >&5 + { (eval echo "$as_me:8400: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8243: \$? = $ac_status" >&5 + echo "$as_me:8403: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8257,7 +8417,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}:8260: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8420: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8280,7 +8440,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 8283 "configure" +#line 8443 "configure" #include "confdefs.h" #include <$cf_header> @@ -8304,16 +8464,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8307: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8467: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8310: \$? = $ac_status" >&5 + echo "$as_me:8470: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8313: \"$ac_try\"") >&5 + { (eval echo "$as_me:8473: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8316: \$? = $ac_status" >&5 + echo "$as_me:8476: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -8334,12 +8494,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:8337: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8497: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:8342: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:8502: 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%/[^/]*$%%'` @@ -8375,7 +8535,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 8378 "configure" +#line 8538 "configure" #include "confdefs.h" #include int @@ -8387,16 +8547,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8390: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8550: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8393: \$? = $ac_status" >&5 + echo "$as_me:8553: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8396: \"$ac_try\"") >&5 + { (eval echo "$as_me:8556: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8399: \$? = $ac_status" >&5 + echo "$as_me:8559: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8413,7 +8573,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}:8416: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8576: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8461,7 +8621,7 @@ EOF ;; esac -echo "$as_me:8464: checking for terminfo header" >&5 +echo "$as_me:8624: 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 @@ -8479,7 +8639,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 8482 "configure" +#line 8642 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -8494,16 +8654,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8497: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8657: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8500: \$? = $ac_status" >&5 + echo "$as_me:8660: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8503: \"$ac_try\"") >&5 + { (eval echo "$as_me:8663: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8506: \$? = $ac_status" >&5 + echo "$as_me:8666: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -8519,7 +8679,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8522: result: $cf_cv_term_header" >&5 +echo "$as_me:8682: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -8557,7 +8717,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:8560: checking for ncurses version" >&5 +echo "$as_me:8720: 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 @@ -8583,10 +8743,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:8586: \"$cf_try\"") >&5 + { (eval echo "$as_me:8746: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:8589: \$? = $ac_status" >&5 + echo "$as_me:8749: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -8596,7 +8756,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 8599 "configure" +#line 8759 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -8621,15 +8781,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:8624: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8784: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8627: \$? = $ac_status" >&5 + echo "$as_me:8787: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:8629: \"$ac_try\"") >&5 + { (eval echo "$as_me:8789: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8632: \$? = $ac_status" >&5 + echo "$as_me:8792: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -8643,7 +8803,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:8646: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:8806: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -8656,7 +8816,7 @@ cf_nculib_root=ncursesw # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:8659: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:8819: 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 @@ -8664,7 +8824,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 8667 "configure" +#line 8827 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8683,16 +8843,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8686: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8846: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8689: \$? = $ac_status" >&5 + echo "$as_me:8849: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8692: \"$ac_try\"") >&5 + { (eval echo "$as_me:8852: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8695: \$? = $ac_status" >&5 + echo "$as_me:8855: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -8703,10 +8863,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8706: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:8866: 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:8709: checking for initscr in -lgpm" >&5 + echo "$as_me:8869: 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 @@ -8714,7 +8874,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 8717 "configure" +#line 8877 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8733,16 +8893,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8736: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8896: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8739: \$? = $ac_status" >&5 + echo "$as_me:8899: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8742: \"$ac_try\"") >&5 + { (eval echo "$as_me:8902: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8745: \$? = $ac_status" >&5 + echo "$as_me:8905: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -8753,7 +8913,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8756: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:8916: 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" @@ -8766,9 +8926,9 @@ fi case "$host_os" in (freebsd*) # This is only necessary if you are linking against an obsolete - # version of ncurses (but it should do no harm, since it's static). + # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:8771: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:8931: 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 @@ -8776,7 +8936,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 8779 "configure" +#line 8939 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8795,16 +8955,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8798: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8958: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8801: \$? = $ac_status" >&5 + echo "$as_me:8961: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8804: \"$ac_try\"") >&5 + { (eval echo "$as_me:8964: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8807: \$? = $ac_status" >&5 + echo "$as_me:8967: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -8815,7 +8975,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8818: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:8978: 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" @@ -8864,13 +9024,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:8867: checking for initscr" >&5 + echo "$as_me:9027: 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 8873 "configure" +#line 9033 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -8901,16 +9061,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8904: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9064: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8907: \$? = $ac_status" >&5 + echo "$as_me:9067: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8910: \"$ac_try\"") >&5 + { (eval echo "$as_me:9070: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8913: \$? = $ac_status" >&5 + echo "$as_me:9073: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -8920,18 +9080,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:8923: result: $ac_cv_func_initscr" >&5 +echo "$as_me:9083: 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:8930: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:9090: 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 8934 "configure" +#line 9094 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8943,25 +9103,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8946: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9106: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8949: \$? = $ac_status" >&5 + echo "$as_me:9109: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8952: \"$ac_try\"") >&5 + { (eval echo "$as_me:9112: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8955: \$? = $ac_status" >&5 + echo "$as_me:9115: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:8957: result: yes" >&5 + echo "$as_me:9117: 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:8964: result: no" >&5 +echo "$as_me:9124: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -9029,11 +9189,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:9032: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:9192: 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 9036 "configure" +#line 9196 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9045,25 +9205,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9048: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9208: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9051: \$? = $ac_status" >&5 + echo "$as_me:9211: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9054: \"$ac_try\"") >&5 + { (eval echo "$as_me:9214: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9057: \$? = $ac_status" >&5 + echo "$as_me:9217: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:9059: result: yes" >&5 + echo "$as_me:9219: 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:9066: result: no" >&5 +echo "$as_me:9226: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -9078,7 +9238,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:9081: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:9241: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -9086,7 +9246,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:9089: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:9249: 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 @@ -9096,7 +9256,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 9099 "configure" +#line 9259 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9108,23 +9268,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9111: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9271: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9114: \$? = $ac_status" >&5 + echo "$as_me:9274: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9117: \"$ac_try\"") >&5 + { (eval echo "$as_me:9277: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9120: \$? = $ac_status" >&5 + echo "$as_me:9280: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:9122: result: yes" >&5 + echo "$as_me:9282: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:9127: result: no" >&5 +echo "$as_me:9287: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -9148,13 +9308,13 @@ cf_ncuconfig_root=ncurses cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:9151: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:9311: 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:9154: result: yes" >&5 + echo "$as_me:9314: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:9157: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:9317: 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 @@ -9287,7 +9447,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 9290 "configure" +#line 9450 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9299,37 +9459,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9302: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9462: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9305: \$? = $ac_status" >&5 + echo "$as_me:9465: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9308: \"$ac_try\"") >&5 + { (eval echo "$as_me:9468: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9311: \$? = $ac_status" >&5 + echo "$as_me:9471: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 9317 "configure" +#line 9477 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:9324: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9484: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9327: \$? = $ac_status" >&5 + echo "$as_me:9487: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:9329: \"$ac_try\"") >&5 + { (eval echo "$as_me:9489: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9332: \$? = $ac_status" >&5 + echo "$as_me:9492: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -9360,12 +9520,38 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_add_cflags in $cf_pkg_cflags +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_pkg_cflags +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -9458,6 +9644,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -9475,7 +9663,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 9478 "configure" +#line 9666 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9487,37 +9675,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9490: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9678: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9493: \$? = $ac_status" >&5 + echo "$as_me:9681: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9496: \"$ac_try\"") >&5 + { (eval echo "$as_me:9684: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9499: \$? = $ac_status" >&5 + echo "$as_me:9687: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 9505 "configure" +#line 9693 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:9512: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9700: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9515: \$? = $ac_status" >&5 + echo "$as_me:9703: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:9517: \"$ac_try\"") >&5 + { (eval echo "$as_me:9705: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9520: \$? = $ac_status" >&5 + echo "$as_me:9708: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -9534,7 +9722,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:9537: result: $cf_have_ncuconfig" >&5 + echo "$as_me:9725: 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" @@ -9550,7 +9738,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:9553: checking for terminfo header" >&5 +echo "$as_me:9741: 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 @@ -9568,7 +9756,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 9571 "configure" +#line 9759 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -9583,16 +9771,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9586: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9774: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9589: \$? = $ac_status" >&5 + echo "$as_me:9777: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9592: \"$ac_try\"") >&5 + { (eval echo "$as_me:9780: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9595: \$? = $ac_status" >&5 + echo "$as_me:9783: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -9608,7 +9796,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:9611: result: $cf_cv_term_header" >&5 +echo "$as_me:9799: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -9643,7 +9831,7 @@ esac fi else - echo "$as_me:9646: result: no" >&5 + echo "$as_me:9834: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -9659,7 +9847,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:9662: checking for $ac_word" >&5 +echo "$as_me:9850: 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 @@ -9674,7 +9862,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:9677: found $ac_dir/$ac_word" >&5 +echo "$as_me:9865: found $ac_dir/$ac_word" >&5 break done @@ -9682,10 +9870,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:9685: result: $NCURSES_CONFIG" >&5 + echo "$as_me:9873: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:9688: result: no" >&5 + echo "$as_me:9876: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9698,7 +9886,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:9701: checking for $ac_word" >&5 +echo "$as_me:9889: 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 @@ -9713,7 +9901,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:9716: found $ac_dir/$ac_word" >&5 +echo "$as_me:9904: found $ac_dir/$ac_word" >&5 break done @@ -9721,10 +9909,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:9724: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:9912: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:9727: result: no" >&5 + echo "$as_me:9915: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9737,12 +9925,38 @@ fi if test "$NCURSES_CONFIG" != none ; then +for cf_add_cflags in `$NCURSES_CONFIG --cflags` +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$NCURSES_CONFIG --cflags` +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -9835,6 +10049,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -9853,7 +10069,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:9856: checking if we have identified curses headers" >&5 +echo "$as_me:10072: 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 @@ -9865,7 +10081,7 @@ for cf_header in \ curses.h ncurses/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 9868 "configure" +#line 10084 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -9877,16 +10093,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9880: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10096: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9883: \$? = $ac_status" >&5 + echo "$as_me:10099: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9886: \"$ac_try\"") >&5 + { (eval echo "$as_me:10102: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9889: \$? = $ac_status" >&5 + echo "$as_me:10105: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -9897,11 +10113,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:9900: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:10116: 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:9904: error: No curses header-files found" >&5 + { { echo "$as_me:10120: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -9911,23 +10127,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:9914: checking for $ac_header" >&5 +echo "$as_me:10130: 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 9920 "configure" +#line 10136 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:9924: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:10140: \"$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:9930: \$? = $ac_status" >&5 + echo "$as_me:10146: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9946,7 +10162,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:9949: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:10165: 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 10005 "configure" +#line 10221 "configure" #include "confdefs.h" #include int @@ -10014,16 +10230,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10017: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10233: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10020: \$? = $ac_status" >&5 + echo "$as_me:10236: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10023: \"$ac_try\"") >&5 + { (eval echo "$as_me:10239: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10026: \$? = $ac_status" >&5 + echo "$as_me:10242: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -10040,7 +10256,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}:10043: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10259: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10059,7 +10275,7 @@ fi } -echo "$as_me:10062: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:10278: 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 @@ -10071,7 +10287,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 10074 "configure" +#line 10290 "configure" #include "confdefs.h" #include <$cf_header> @@ -10095,16 +10311,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10098: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10314: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10101: \$? = $ac_status" >&5 + echo "$as_me:10317: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10104: \"$ac_try\"") >&5 + { (eval echo "$as_me:10320: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10107: \$? = $ac_status" >&5 + echo "$as_me:10323: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -10119,14 +10335,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:10122: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:10338: 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:10129: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:10345: 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 @@ -10247,7 +10463,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 10250 "configure" +#line 10466 "configure" #include "confdefs.h" #include int @@ -10259,16 +10475,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10262: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10478: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10265: \$? = $ac_status" >&5 + echo "$as_me:10481: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10268: \"$ac_try\"") >&5 + { (eval echo "$as_me:10484: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10271: \$? = $ac_status" >&5 + echo "$as_me:10487: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -10285,7 +10501,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}:10288: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10504: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10308,7 +10524,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 10311 "configure" +#line 10527 "configure" #include "confdefs.h" #include <$cf_header> @@ -10332,16 +10548,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10335: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10551: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10338: \$? = $ac_status" >&5 + echo "$as_me:10554: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10341: \"$ac_try\"") >&5 + { (eval echo "$as_me:10557: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10344: \$? = $ac_status" >&5 + echo "$as_me:10560: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -10362,12 +10578,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:10365: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10581: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:10370: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:10586: 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%/[^/]*$%%'` @@ -10403,7 +10619,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 10406 "configure" +#line 10622 "configure" #include "confdefs.h" #include int @@ -10415,16 +10631,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10418: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10634: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10421: \$? = $ac_status" >&5 + echo "$as_me:10637: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10424: \"$ac_try\"") >&5 + { (eval echo "$as_me:10640: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10427: \$? = $ac_status" >&5 + echo "$as_me:10643: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -10441,7 +10657,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}:10444: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10660: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10489,7 +10705,7 @@ EOF ;; esac -echo "$as_me:10492: checking for terminfo header" >&5 +echo "$as_me:10708: 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 @@ -10507,7 +10723,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 10510 "configure" +#line 10726 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -10522,16 +10738,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10525: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10741: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10528: \$? = $ac_status" >&5 + echo "$as_me:10744: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10531: \"$ac_try\"") >&5 + { (eval echo "$as_me:10747: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10534: \$? = $ac_status" >&5 + echo "$as_me:10750: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -10547,7 +10763,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:10550: result: $cf_cv_term_header" >&5 +echo "$as_me:10766: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -10585,7 +10801,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:10588: checking for ncurses version" >&5 +echo "$as_me:10804: 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 @@ -10611,10 +10827,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:10614: \"$cf_try\"") >&5 + { (eval echo "$as_me:10830: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:10617: \$? = $ac_status" >&5 + echo "$as_me:10833: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -10624,7 +10840,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 10627 "configure" +#line 10843 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -10649,15 +10865,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:10652: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10868: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10655: \$? = $ac_status" >&5 + echo "$as_me:10871: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:10657: \"$ac_try\"") >&5 + { (eval echo "$as_me:10873: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10660: \$? = $ac_status" >&5 + echo "$as_me:10876: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -10671,7 +10887,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:10674: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:10890: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -10684,7 +10900,7 @@ cf_nculib_root=ncurses # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:10687: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:10903: 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 @@ -10692,7 +10908,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10695 "configure" +#line 10911 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10711,16 +10927,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10714: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10930: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10717: \$? = $ac_status" >&5 + echo "$as_me:10933: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10720: \"$ac_try\"") >&5 + { (eval echo "$as_me:10936: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10723: \$? = $ac_status" >&5 + echo "$as_me:10939: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -10731,10 +10947,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10734: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:10950: 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:10737: checking for initscr in -lgpm" >&5 + echo "$as_me:10953: 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 @@ -10742,7 +10958,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10745 "configure" +#line 10961 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10761,16 +10977,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10764: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10980: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10767: \$? = $ac_status" >&5 + echo "$as_me:10983: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10770: \"$ac_try\"") >&5 + { (eval echo "$as_me:10986: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10773: \$? = $ac_status" >&5 + echo "$as_me:10989: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -10781,7 +10997,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10784: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:11000: 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" @@ -10794,9 +11010,9 @@ fi case "$host_os" in (freebsd*) # This is only necessary if you are linking against an obsolete - # version of ncurses (but it should do no harm, since it's static). + # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:10799: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:11015: 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 @@ -10804,7 +11020,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10807 "configure" +#line 11023 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10823,16 +11039,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10826: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11042: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10829: \$? = $ac_status" >&5 + echo "$as_me:11045: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10832: \"$ac_try\"") >&5 + { (eval echo "$as_me:11048: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10835: \$? = $ac_status" >&5 + echo "$as_me:11051: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -10843,7 +11059,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10846: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:11062: 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" @@ -10892,13 +11108,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:10895: checking for initscr" >&5 + echo "$as_me:11111: 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 10901 "configure" +#line 11117 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -10929,16 +11145,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10932: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11148: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10935: \$? = $ac_status" >&5 + echo "$as_me:11151: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10938: \"$ac_try\"") >&5 + { (eval echo "$as_me:11154: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10941: \$? = $ac_status" >&5 + echo "$as_me:11157: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -10948,18 +11164,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:10951: result: $ac_cv_func_initscr" >&5 +echo "$as_me:11167: 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:10958: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:11174: 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 10962 "configure" +#line 11178 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10971,25 +11187,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10974: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11190: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10977: \$? = $ac_status" >&5 + echo "$as_me:11193: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10980: \"$ac_try\"") >&5 + { (eval echo "$as_me:11196: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10983: \$? = $ac_status" >&5 + echo "$as_me:11199: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:10985: result: yes" >&5 + echo "$as_me:11201: 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:10992: result: no" >&5 +echo "$as_me:11208: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -11057,11 +11273,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:11060: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:11276: 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 11064 "configure" +#line 11280 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11073,25 +11289,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11076: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11292: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11079: \$? = $ac_status" >&5 + echo "$as_me:11295: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11082: \"$ac_try\"") >&5 + { (eval echo "$as_me:11298: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11085: \$? = $ac_status" >&5 + echo "$as_me:11301: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:11087: result: yes" >&5 + echo "$as_me:11303: 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:11094: result: no" >&5 +echo "$as_me:11310: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -11106,7 +11322,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:11109: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:11325: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -11114,7 +11330,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:11117: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:11333: 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 @@ -11124,7 +11340,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 11127 "configure" +#line 11343 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11136,23 +11352,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11139: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11355: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11142: \$? = $ac_status" >&5 + echo "$as_me:11358: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11145: \"$ac_try\"") >&5 + { (eval echo "$as_me:11361: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11148: \$? = $ac_status" >&5 + echo "$as_me:11364: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:11150: result: yes" >&5 + echo "$as_me:11366: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:11155: result: no" >&5 +echo "$as_me:11371: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -11205,10 +11421,10 @@ else AUTOCONF_$cf_name NCURSES_VERSION_$cf_name CF_EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out" - { (eval echo "$as_me:11208: \"$cf_try\"") >&5 + { (eval echo "$as_me:11424: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:11211: \$? = $ac_status" >&5 + echo "$as_me:11427: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ ][ ]*//" conftest.out` @@ -11226,10 +11442,10 @@ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} cf_cv_timestamp=`date` -echo "$as_me:11229: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 +echo "$as_me:11445: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 -echo "$as_me:11232: checking if you want to have a library-prefix" >&5 +echo "$as_me:11448: checking if you want to have a library-prefix" >&5 echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 # Check whether --with-lib-prefix or --without-lib-prefix was given. @@ -11239,7 +11455,7 @@ if test "${with_lib_prefix+set}" = set; then else with_lib_prefix=auto fi; -echo "$as_me:11242: result: $with_lib_prefix" >&5 +echo "$as_me:11458: result: $with_lib_prefix" >&5 echo "${ECHO_T}$with_lib_prefix" >&6 if test "$with_lib_prefix" = auto @@ -11277,7 +11493,7 @@ if test X"$CC_G_OPT" = X"" ; then test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT='' fi -echo "$as_me:11280: checking for default loader flags" >&5 +echo "$as_me:11496: checking for default loader flags" >&5 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 case $DFT_LWR_MODEL in (normal) LD_MODEL='' ;; @@ -11285,13 +11501,13 @@ case $DFT_LWR_MODEL in (profile) LD_MODEL='-pg';; (shared) LD_MODEL='' ;; esac -echo "$as_me:11288: result: $LD_MODEL" >&5 +echo "$as_me:11504: result: $LD_MODEL" >&5 echo "${ECHO_T}$LD_MODEL" >&6 LD_RPATH_OPT= if test "x$cf_cv_enable_rpath" != xno then - echo "$as_me:11294: checking for an rpath option" >&5 + echo "$as_me:11510: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case "$cf_cv_system_name" in (irix*) @@ -11322,12 +11538,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 (*) ;; esac - echo "$as_me:11325: result: $LD_RPATH_OPT" >&5 + echo "$as_me:11541: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:11330: checking if we need a space after rpath option" >&5 + echo "$as_me:11546: 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" @@ -11348,7 +11564,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 11351 "configure" +#line 11567 "configure" #include "confdefs.h" int @@ -11360,16 +11576,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11363: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11579: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11366: \$? = $ac_status" >&5 + echo "$as_me:11582: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11369: \"$ac_try\"") >&5 + { (eval echo "$as_me:11585: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11372: \$? = $ac_status" >&5 + echo "$as_me:11588: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_space=no else @@ -11379,7 +11595,7 @@ cf_rpath_space=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:11382: result: $cf_rpath_space" >&5 + echo "$as_me:11598: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; @@ -11401,7 +11617,7 @@ fi cf_ld_rpath_opt= test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - echo "$as_me:11404: checking if release/abi version should be used for shared libs" >&5 + echo "$as_me:11620: checking if release/abi version should be used for shared libs" >&5 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 # Check whether --with-shlib-version or --without-shlib-version was given. @@ -11416,9 +11632,9 @@ if test "${with_shlib_version+set}" = set; then cf_cv_shlib_version=$withval ;; (*) - echo "$as_me:11419: result: $withval" >&5 + echo "$as_me:11635: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 - { { echo "$as_me:11421: error: option value must be one of: rel, abi, or auto" >&5 + { { echo "$as_me:11637: error: option value must be one of: rel, abi, or auto" >&5 echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} { (exit 1); exit 1; }; } ;; @@ -11427,7 +11643,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} else cf_cv_shlib_version=auto fi; - echo "$as_me:11430: result: $cf_cv_shlib_version" >&5 + echo "$as_me:11646: result: $cf_cv_shlib_version" >&5 echo "${ECHO_T}$cf_cv_shlib_version" >&6 cf_cv_rm_so_locs=no @@ -11450,14 +11666,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 if test "$cf_try_fPIC" = yes then - echo "$as_me:11453: checking which $CC option to use" >&5 + echo "$as_me:11669: checking which $CC option to use" >&5 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" for CC_SHARED_OPTS in -fPIC -fpic '' do CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11460 "configure" +#line 11676 "configure" #include "confdefs.h" #include int @@ -11469,16 +11685,16 @@ int x = 1 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11472: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11688: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11475: \$? = $ac_status" >&5 + echo "$as_me:11691: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11478: \"$ac_try\"") >&5 + { (eval echo "$as_me:11694: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11481: \$? = $ac_status" >&5 + echo "$as_me:11697: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -11487,7 +11703,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" done - echo "$as_me:11490: result: $CC_SHARED_OPTS" >&5 + echo "$as_me:11706: result: $CC_SHARED_OPTS" >&5 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 CFLAGS="$cf_save_CFLAGS" fi @@ -11558,7 +11774,7 @@ CF_EOF MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi cf_cv_shlib_version_infix=yes - echo "$as_me:11561: checking if ld -search_paths_first works" >&5 + echo "$as_me:11777: checking if ld -search_paths_first works" >&5 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11567,7 +11783,7 @@ else cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" cat >"conftest.$ac_ext" <<_ACEOF -#line 11570 "configure" +#line 11786 "configure" #include "confdefs.h" int @@ -11579,16 +11795,16 @@ int i; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11582: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11798: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11585: \$? = $ac_status" >&5 + echo "$as_me:11801: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11588: \"$ac_try\"") >&5 + { (eval echo "$as_me:11804: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11591: \$? = $ac_status" >&5 + echo "$as_me:11807: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ldflags_search_paths_first=yes else @@ -11599,12 +11815,23 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LDFLAGS=$cf_save_LDFLAGS fi -echo "$as_me:11602: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "$as_me:11818: result: $cf_cv_ldflags_search_paths_first" >&5 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 if test "$cf_cv_ldflags_search_paths_first" = yes; then LDFLAGS="$LDFLAGS -Wl,-search_paths_first" fi ;; + (haiku*) + + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + if test "$cf_cv_shlib_version" = rel; then + cf_cv_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}' + else + cf_cv_shared_soname='`basename $@`' + fi + + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' + ;; (hpux[7-8]*) # HP-UX 8.07 ld lacks "+b" option used for libdir search-list if test "$GCC" != yes; then @@ -11938,7 +12165,7 @@ CF_EOF do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11941 "configure" +#line 12168 "configure" #include "confdefs.h" #include int @@ -11950,16 +12177,16 @@ printf("Hello\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11953: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12180: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11956: \$? = $ac_status" >&5 + echo "$as_me:12183: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11959: \"$ac_try\"") >&5 + { (eval echo "$as_me:12186: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11962: \$? = $ac_status" >&5 + echo "$as_me:12189: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -11996,7 +12223,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes ;; (*) - { echo "$as_me:11999: WARNING: ignored --with-shlib-version" >&5 + { echo "$as_me:12226: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac @@ -12006,7 +12233,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} if test -n "$cf_try_cflags" then cat > conftest.$ac_ext < int main(int argc, char *argv[]) { @@ -12018,18 +12245,18 @@ EOF for cf_opt in $cf_try_cflags do CFLAGS="$cf_save_CFLAGS -$cf_opt" - echo "$as_me:12021: checking if CFLAGS option -$cf_opt works" >&5 + echo "$as_me:12248: checking if CFLAGS option -$cf_opt works" >&5 echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 - if { (eval echo "$as_me:12023: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:12250: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12026: \$? = $ac_status" >&5 + echo "$as_me:12253: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - echo "$as_me:12028: result: yes" >&5 + echo "$as_me:12255: result: yes" >&5 echo "${ECHO_T}yes" >&6 cf_save_CFLAGS="$CFLAGS" else - echo "$as_me:12032: result: no" >&5 + echo "$as_me:12259: result: no" >&5 echo "${ECHO_T}no" >&6 fi done @@ -12044,17 +12271,17 @@ echo "${ECHO_T}no" >&6 test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 -echo "${as_me:-configure}:12047: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 +echo "${as_me:-configure}:12274: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:12051: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:12278: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 # The test/sample programs in the original tree link using rpath option. # Make it optional for packagers. if test -n "$LOCAL_LDFLAGS" then - echo "$as_me:12057: checking if you want to link sample programs with rpath option" >&5 + echo "$as_me:12284: checking if you want to link sample programs with rpath option" >&5 echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6 # Check whether --enable-rpath-link or --disable-rpath-link was given. @@ -12064,7 +12291,7 @@ if test "${enable_rpath_link+set}" = set; then else with_rpath_link=yes fi; - echo "$as_me:12067: result: $with_rpath_link" >&5 + echo "$as_me:12294: result: $with_rpath_link" >&5 echo "${ECHO_T}$with_rpath_link" >&6 if test "$with_rpath_link" = no then @@ -12077,7 +12304,7 @@ fi ### use option --enable-broken-linker to force on use of broken-linker support -echo "$as_me:12080: checking if you want broken-linker support code" >&5 +echo "$as_me:12307: checking if you want broken-linker support code" >&5 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 # Check whether --enable-broken_linker or --disable-broken_linker was given. @@ -12087,7 +12314,7 @@ if test "${enable_broken_linker+set}" = set; then else with_broken_linker=no fi; -echo "$as_me:12090: result: $with_broken_linker" >&5 +echo "$as_me:12317: result: $with_broken_linker" >&5 echo "${ECHO_T}$with_broken_linker" >&6 : "${BROKEN_LINKER:=0}" @@ -12102,14 +12329,14 @@ fi # Check to define _XOPEN_SOURCE "automatically" -echo "$as_me:12105: checking if the POSIX test-macros are already defined" >&5 +echo "$as_me:12332: checking if the POSIX test-macros are already defined" >&5 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 if test "${cf_cv_posix_visible+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 12112 "configure" +#line 12339 "configure" #include "confdefs.h" #include int @@ -12128,16 +12355,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12131: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12358: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12134: \$? = $ac_status" >&5 + echo "$as_me:12361: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12137: \"$ac_try\"") >&5 + { (eval echo "$as_me:12364: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12140: \$? = $ac_status" >&5 + echo "$as_me:12367: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_visible=no else @@ -12148,7 +12375,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12151: result: $cf_cv_posix_visible" >&5 +echo "$as_me:12378: result: $cf_cv_posix_visible" >&5 echo "${ECHO_T}$cf_cv_posix_visible" >&6 if test "$cf_cv_posix_visible" = no; then @@ -12189,18 +12416,18 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) +(linux*gnu|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) cf_gnu_xopen_source=$cf_XOPEN_SOURCE -echo "$as_me:12196: checking if this is the GNU C library" >&5 +echo "$as_me:12423: 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 12203 "configure" +#line 12430 "configure" #include "confdefs.h" #include int @@ -12219,16 +12446,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12222: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12449: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12225: \$? = $ac_status" >&5 + echo "$as_me:12452: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12228: \"$ac_try\"") >&5 + { (eval echo "$as_me:12455: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12231: \$? = $ac_status" >&5 + echo "$as_me:12458: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library=yes else @@ -12239,7 +12466,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12242: result: $cf_cv_gnu_library" >&5 +echo "$as_me:12469: result: $cf_cv_gnu_library" >&5 echo "${ECHO_T}$cf_cv_gnu_library" >&6 if test x$cf_cv_gnu_library = xyes; then @@ -12247,7 +12474,7 @@ if test x$cf_cv_gnu_library = xyes; then # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE # was changed to help a little. newlib incorporated the change about 4 # years later. - echo "$as_me:12250: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo "$as_me:12477: 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 @@ -12259,7 +12486,7 @@ else CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 12262 "configure" +#line 12489 "configure" #include "confdefs.h" #include int @@ -12278,16 +12505,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12281: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12508: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12284: \$? = $ac_status" >&5 + echo "$as_me:12511: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12287: \"$ac_try\"") >&5 + { (eval echo "$as_me:12514: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12290: \$? = $ac_status" >&5 + echo "$as_me:12517: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library_219=yes else @@ -12299,12 +12526,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save" fi -echo "$as_me:12302: result: $cf_cv_gnu_library_219" >&5 +echo "$as_me:12529: 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:12307: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo "$as_me:12534: 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 @@ -12409,7 +12636,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 12412 "configure" +#line 12639 "configure" #include "confdefs.h" #include @@ -12429,16 +12656,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12432: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12659: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12435: \$? = $ac_status" >&5 + echo "$as_me:12662: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12438: \"$ac_try\"") >&5 + { (eval echo "$as_me:12665: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12441: \$? = $ac_status" >&5 + echo "$as_me:12668: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_dftsrc_219=yes else @@ -12449,7 +12676,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12452: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "$as_me:12679: 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 @@ -12458,14 +12685,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 if test "x$cf_cv_gnu_dftsrc_219" != xyes; then - echo "$as_me:12461: checking if we must define _GNU_SOURCE" >&5 + echo "$as_me:12688: 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 12468 "configure" +#line 12695 "configure" #include "confdefs.h" #include int @@ -12480,16 +12707,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12483: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12710: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12486: \$? = $ac_status" >&5 + echo "$as_me:12713: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12489: \"$ac_try\"") >&5 + { (eval echo "$as_me:12716: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12492: \$? = $ac_status" >&5 + echo "$as_me:12719: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -12596,7 +12823,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 12599 "configure" +#line 12826 "configure" #include "confdefs.h" #include int @@ -12611,16 +12838,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12614: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12841: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12617: \$? = $ac_status" >&5 + echo "$as_me:12844: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12620: \"$ac_try\"") >&5 + { (eval echo "$as_me:12847: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12623: \$? = $ac_status" >&5 + echo "$as_me:12850: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -12635,12 +12862,12 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12638: result: $cf_cv_gnu_source" >&5 +echo "$as_me:12865: 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:12643: checking if we should also define _DEFAULT_SOURCE" >&5 + echo "$as_me:12870: 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 @@ -12650,7 +12877,7 @@ else CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 12653 "configure" +#line 12880 "configure" #include "confdefs.h" #include int @@ -12665,16 +12892,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12668: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12895: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12671: \$? = $ac_status" >&5 + echo "$as_me:12898: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12674: \"$ac_try\"") >&5 + { (eval echo "$as_me:12901: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12677: \$? = $ac_status" >&5 + echo "$as_me:12904: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_default_source=no else @@ -12685,7 +12912,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12688: result: $cf_cv_default_source" >&5 +echo "$as_me:12915: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 if test "$cf_cv_default_source" = yes then @@ -12722,16 +12949,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:12725: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:12952: 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}:12731: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:12958: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 12734 "configure" +#line 12961 "configure" #include "confdefs.h" #include int @@ -12746,16 +12973,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12749: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12976: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12752: \$? = $ac_status" >&5 + echo "$as_me:12979: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12755: \"$ac_try\"") >&5 + { (eval echo "$as_me:12982: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12758: \$? = $ac_status" >&5 + echo "$as_me:12985: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -12776,7 +13003,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 12779 "configure" +#line 13006 "configure" #include "confdefs.h" #include int @@ -12791,16 +13018,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12794: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13021: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12797: \$? = $ac_status" >&5 + echo "$as_me:13024: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12800: \"$ac_try\"") >&5 + { (eval echo "$as_me:13027: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12803: \$? = $ac_status" >&5 + echo "$as_me:13030: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -12811,7 +13038,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:12814: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:13041: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -12819,10 +13046,10 @@ echo "${as_me:-configure}:12814: testing ifdef from value $cf_POSIX_C_SOURCE ... test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:12822: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:13049: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 12825 "configure" +#line 13052 "configure" #include "confdefs.h" #include int @@ -12837,16 +13064,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12840: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13067: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12843: \$? = $ac_status" >&5 + echo "$as_me:13070: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12846: \"$ac_try\"") >&5 + { (eval echo "$as_me:13073: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12849: \$? = $ac_status" >&5 + echo "$as_me:13076: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -12862,7 +13089,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12865: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:13092: 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 @@ -12979,7 +13206,7 @@ fi # cf_cv_posix_visible # OpenBSD 6.x has broken locale support, both compile-time and runtime. # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html # Abusing the conformance level is a workaround. - { echo "$as_me:12982: WARNING: this system does not provide usable locale support" >&5 + { echo "$as_me:13209: WARNING: this system does not provide usable locale support" >&5 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} cf_xopen_source="-D_BSD_SOURCE" cf_XOPEN_SOURCE=700 @@ -13011,14 +13238,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} ;; (*) -echo "$as_me:13014: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:13241: 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 13021 "configure" +#line 13248 "configure" #include "confdefs.h" #include @@ -13032,21 +13259,22 @@ main (void) #ifndef _XOPEN_SOURCE make an error #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13040: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13268: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13043: \$? = $ac_status" >&5 + echo "$as_me:13271: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13046: \"$ac_try\"") >&5 + { (eval echo "$as_me:13274: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13049: \$? = $ac_status" >&5 + echo "$as_me:13277: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -13058,7 +13286,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 13061 "configure" +#line 13289 "configure" #include "confdefs.h" #include @@ -13069,24 +13297,25 @@ int main (void) { -#ifdef _XOPEN_SOURCE +#ifndef _XOPEN_SOURCE make an error #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13080: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13309: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13083: \$? = $ac_status" >&5 + echo "$as_me:13312: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13086: \"$ac_try\"") >&5 + { (eval echo "$as_me:13315: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13089: \$? = $ac_status" >&5 + echo "$as_me:13318: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -13095,13 +13324,13 @@ cat "conftest.$ac_ext" >&5 cf_cv_xopen_source=$cf_XOPEN_SOURCE 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:13104: result: $cf_cv_xopen_source" >&5 +echo "$as_me:13333: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -13116,12 +13345,38 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" +for cf_add_cflags in $cf_temp_xopen_source +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_temp_xopen_source +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -13214,8 +13469,12 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + fi + cf_save_xopen_cppflags="$CPPFLAGS" + if test "$cf_cv_posix_visible" = no; then cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE @@ -13231,16 +13490,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:13234: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:13493: 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}:13240: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:13499: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13243 "configure" +#line 13502 "configure" #include "confdefs.h" #include int @@ -13255,16 +13514,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13258: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13517: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13261: \$? = $ac_status" >&5 + echo "$as_me:13520: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13264: \"$ac_try\"") >&5 + { (eval echo "$as_me:13523: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13267: \$? = $ac_status" >&5 + echo "$as_me:13526: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -13285,7 +13544,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 13288 "configure" +#line 13547 "configure" #include "confdefs.h" #include int @@ -13300,16 +13559,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13303: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13562: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13306: \$? = $ac_status" >&5 + echo "$as_me:13565: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13309: \"$ac_try\"") >&5 + { (eval echo "$as_me:13568: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13312: \$? = $ac_status" >&5 + echo "$as_me:13571: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13320,7 +13579,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:13323: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:13582: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -13328,10 +13587,10 @@ echo "${as_me:-configure}:13323: testing ifdef from value $cf_POSIX_C_SOURCE ... test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:13331: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:13590: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13334 "configure" +#line 13593 "configure" #include "confdefs.h" #include int @@ -13346,16 +13605,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13349: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13608: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13352: \$? = $ac_status" >&5 + echo "$as_me:13611: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13355: \"$ac_try\"") >&5 + { (eval echo "$as_me:13614: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13358: \$? = $ac_status" >&5 + echo "$as_me:13617: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13371,7 +13630,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13374: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:13633: 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 @@ -13480,17 +13739,96 @@ fi fi # cf_cv_posix_visible + # Some of these niche implementations use copy/paste, double-check... + test -n "$verbose" && echo " checking if _POSIX_C_SOURCE inteferes" 1>&6 + +echo "${as_me:-configure}:13745: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +#line 13748 "configure" +#include "confdefs.h" + +#include +#include +#include + +int +main (void) +{ + +#ifndef _XOPEN_SOURCE +make an error +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13768: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:13771: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13774: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13777: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + { echo "$as_me:13784: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 +echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;} + CPPFLAGS="$cf_save_xopen_cppflags" +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" ;; esac if test -n "$cf_xopen_source" ; then +for cf_add_cflags in $cf_xopen_source +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 + +echo "${as_me:-configure}:13806: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 + +echo "${as_me:-configure}:13818: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_xopen_source +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -13565,7 +13903,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}:13568: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:13906: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -13575,7 +13913,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}:13578: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:13916: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -13585,20 +13923,22 @@ 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}:13588: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:13926: 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" fi +done + fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:13598: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:13938: 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 13601 "configure" +#line 13941 "configure" #include "confdefs.h" #include int @@ -13613,16 +13953,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13616: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13956: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13619: \$? = $ac_status" >&5 + echo "$as_me:13959: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13622: \"$ac_try\"") >&5 + { (eval echo "$as_me:13962: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13625: \$? = $ac_status" >&5 + echo "$as_me:13965: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -13631,12 +13971,12 @@ cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:13634: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:13974: 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 13639 "configure" +#line 13979 "configure" #include "confdefs.h" #include int @@ -13651,16 +13991,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13654: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13994: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13657: \$? = $ac_status" >&5 + echo "$as_me:13997: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13660: \"$ac_try\"") >&5 + { (eval echo "$as_me:14000: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13663: \$? = $ac_status" >&5 + echo "$as_me:14003: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -13671,19 +14011,19 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_XOPEN_SOURCE_set_ok" = no then - { echo "$as_me:13674: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:14014: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:13679: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:14019: 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 13686 "configure" +#line 14026 "configure" #include "confdefs.h" #include @@ -13697,21 +14037,22 @@ main (void) #ifndef _XOPEN_SOURCE make an error #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13705: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14046: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13708: \$? = $ac_status" >&5 + echo "$as_me:14049: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13711: \"$ac_try\"") >&5 + { (eval echo "$as_me:14052: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13714: \$? = $ac_status" >&5 + echo "$as_me:14055: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -13723,7 +14064,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 13726 "configure" +#line 14067 "configure" #include "confdefs.h" #include @@ -13734,24 +14075,25 @@ int main (void) { -#ifdef _XOPEN_SOURCE +#ifndef _XOPEN_SOURCE make an error #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13745: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14087: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13748: \$? = $ac_status" >&5 + echo "$as_me:14090: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13751: \"$ac_try\"") >&5 + { (eval echo "$as_me:14093: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13754: \$? = $ac_status" >&5 + echo "$as_me:14096: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -13760,13 +14102,13 @@ cat "conftest.$ac_ext" >&5 cf_cv_xopen_source=$cf_XOPEN_SOURCE 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:13769: result: $cf_cv_xopen_source" >&5 +echo "$as_me:14111: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -13781,12 +14123,38 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" +for cf_add_cflags in $cf_temp_xopen_source +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_temp_xopen_source +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -13879,6 +14247,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + fi fi @@ -13892,7 +14262,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:13895: checking for special C compiler options needed for large files" >&5 + echo "$as_me:14265: checking for special C compiler options needed for large files" >&5 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13904,7 +14274,7 @@ else # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. cat >"conftest.$ac_ext" <<_ACEOF -#line 13907 "configure" +#line 14277 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -13924,16 +14294,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13927: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14297: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13930: \$? = $ac_status" >&5 + echo "$as_me:14300: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13933: \"$ac_try\"") >&5 + { (eval echo "$as_me:14303: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13936: \$? = $ac_status" >&5 + echo "$as_me:14306: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -13943,16 +14313,16 @@ fi rm -f "conftest.$ac_objext" CC="$CC -n32" rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13946: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14316: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13949: \$? = $ac_status" >&5 + echo "$as_me:14319: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13952: \"$ac_try\"") >&5 + { (eval echo "$as_me:14322: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13955: \$? = $ac_status" >&5 + echo "$as_me:14325: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -13966,13 +14336,13 @@ rm -f "conftest.$ac_objext" rm -f "conftest.$ac_ext" fi fi -echo "$as_me:13969: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:14339: result: $ac_cv_sys_largefile_CC" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:13975: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:14345: checking for _FILE_OFFSET_BITS value needed for large files" >&5 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13980,7 +14350,7 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >"conftest.$ac_ext" <<_ACEOF -#line 13983 "configure" +#line 14353 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -14000,16 +14370,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14003: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14373: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14006: \$? = $ac_status" >&5 + echo "$as_me:14376: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14009: \"$ac_try\"") >&5 + { (eval echo "$as_me:14379: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14012: \$? = $ac_status" >&5 + echo "$as_me:14382: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14018,7 +14388,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 14021 "configure" +#line 14391 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -14039,16 +14409,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14042: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14412: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14045: \$? = $ac_status" >&5 + echo "$as_me:14415: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14048: \"$ac_try\"") >&5 + { (eval echo "$as_me:14418: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14051: \$? = $ac_status" >&5 + echo "$as_me:14421: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -14059,7 +14429,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14062: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:14432: result: $ac_cv_sys_file_offset_bits" >&5 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 if test "$ac_cv_sys_file_offset_bits" != no; then @@ -14069,7 +14439,7 @@ EOF fi rm -rf conftest* - echo "$as_me:14072: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:14442: checking for _LARGE_FILES value needed for large files" >&5 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14077,7 +14447,7 @@ else while :; do ac_cv_sys_large_files=no cat >"conftest.$ac_ext" <<_ACEOF -#line 14080 "configure" +#line 14450 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -14097,16 +14467,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14100: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14470: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14103: \$? = $ac_status" >&5 + echo "$as_me:14473: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14106: \"$ac_try\"") >&5 + { (eval echo "$as_me:14476: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14109: \$? = $ac_status" >&5 + echo "$as_me:14479: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14115,7 +14485,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 14118 "configure" +#line 14488 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -14136,16 +14506,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14139: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14509: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14142: \$? = $ac_status" >&5 + echo "$as_me:14512: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14145: \"$ac_try\"") >&5 + { (eval echo "$as_me:14515: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14148: \$? = $ac_status" >&5 + echo "$as_me:14518: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_large_files=1; break else @@ -14156,7 +14526,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14159: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:14529: result: $ac_cv_sys_large_files" >&5 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 if test "$ac_cv_sys_large_files" != no; then @@ -14169,7 +14539,7 @@ rm -rf conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:14172: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:14542: checking for _LARGEFILE_SOURCE value needed for large files" >&5 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14177,7 +14547,7 @@ else while :; do ac_cv_sys_largefile_source=no cat >"conftest.$ac_ext" <<_ACEOF -#line 14180 "configure" +#line 14550 "configure" #include "confdefs.h" #include int @@ -14189,16 +14559,16 @@ return !fseeko; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14192: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14562: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14195: \$? = $ac_status" >&5 + echo "$as_me:14565: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14198: \"$ac_try\"") >&5 + { (eval echo "$as_me:14568: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14201: \$? = $ac_status" >&5 + echo "$as_me:14571: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14207,7 +14577,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 14210 "configure" +#line 14580 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include @@ -14220,16 +14590,16 @@ return !fseeko; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14223: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14593: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14226: \$? = $ac_status" >&5 + echo "$as_me:14596: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14229: \"$ac_try\"") >&5 + { (eval echo "$as_me:14599: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14232: \$? = $ac_status" >&5 + echo "$as_me:14602: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_largefile_source=1; break else @@ -14240,7 +14610,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14243: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:14613: result: $ac_cv_sys_largefile_source" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 if test "$ac_cv_sys_largefile_source" != no; then @@ -14254,13 +14624,13 @@ rm -rf conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -echo "$as_me:14257: checking for fseeko" >&5 +echo "$as_me:14627: checking for fseeko" >&5 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 if test "${ac_cv_func_fseeko+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14263 "configure" +#line 14633 "configure" #include "confdefs.h" #include int @@ -14272,16 +14642,16 @@ return fseeko && fseeko (stdin, 0, 0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14275: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14645: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14278: \$? = $ac_status" >&5 + echo "$as_me:14648: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14281: \"$ac_try\"") >&5 + { (eval echo "$as_me:14651: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14284: \$? = $ac_status" >&5 + echo "$as_me:14654: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_fseeko=yes else @@ -14291,7 +14661,7 @@ ac_cv_func_fseeko=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14294: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:14664: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -14330,14 +14700,14 @@ fi fi - echo "$as_me:14333: checking whether to use struct dirent64" >&5 + echo "$as_me:14703: checking whether to use struct dirent64" >&5 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 if test "${cf_cv_struct_dirent64+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14340 "configure" +#line 14710 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types" @@ -14360,16 +14730,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14363: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14733: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14366: \$? = $ac_status" >&5 + echo "$as_me:14736: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14369: \"$ac_try\"") >&5 + { (eval echo "$as_me:14739: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14372: \$? = $ac_status" >&5 + echo "$as_me:14742: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_struct_dirent64=yes else @@ -14380,7 +14750,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14383: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:14753: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF @@ -14390,7 +14760,7 @@ EOF fi ### Enable compiling-in rcs id's -echo "$as_me:14393: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:14763: checking if RCS identifiers should be compiled-in" >&5 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 # Check whether --with-rcs-ids or --without-rcs-ids was given. @@ -14400,7 +14770,7 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:14403: result: $with_rcs_ids" >&5 +echo "$as_me:14773: result: $with_rcs_ids" >&5 echo "${ECHO_T}$with_rcs_ids" >&6 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF @@ -14410,7 +14780,7 @@ EOF ############################################################################### ### Note that some functions (such as const) are normally disabled anyway. -echo "$as_me:14413: checking if you want to build with function extensions" >&5 +echo "$as_me:14783: checking if you want to build with function extensions" >&5 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. @@ -14420,7 +14790,7 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:14423: result: $with_ext_funcs" >&5 +echo "$as_me:14793: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "$with_ext_funcs" = yes ; then NCURSES_EXT_FUNCS=1 @@ -14438,7 +14808,7 @@ else fi ### use option --enable-const to turn on use of const beyond that in XSI. -echo "$as_me:14441: checking for extended use of const keyword" >&5 +echo "$as_me:14811: checking for extended use of const keyword" >&5 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 # Check whether --enable-const or --disable-const was given. @@ -14448,7 +14818,7 @@ if test "${enable_const+set}" = set; then else with_ext_const=no fi; -echo "$as_me:14451: result: $with_ext_const" >&5 +echo "$as_me:14821: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "$with_ext_const" = yes ; then @@ -14458,7 +14828,7 @@ fi ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:14461: checking if you want all development code" >&5 +echo "$as_me:14831: checking if you want all development code" >&5 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 # Check whether --with-develop or --without-develop was given. @@ -14468,7 +14838,7 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:14471: result: $with_develop" >&5 +echo "$as_me:14841: result: $with_develop" >&5 echo "${ECHO_T}$with_develop" >&6 ############################################################################### @@ -14477,7 +14847,7 @@ echo "${ECHO_T}$with_develop" >&6 # This is still experimental (20080329), but should ultimately be moved to # the script-block --with-normal, etc. -echo "$as_me:14480: checking if you want to link with the pthread library" >&5 +echo "$as_me:14850: checking if you want to link with the pthread library" >&5 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 # Check whether --with-pthread or --without-pthread was given. @@ -14487,27 +14857,27 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:14490: result: $with_pthread" >&5 +echo "$as_me:14860: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:14494: checking for pthread.h" >&5 + echo "$as_me:14864: checking for pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 if test "${ac_cv_header_pthread_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14500 "configure" +#line 14870 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:14504: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:14874: \"$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:14510: \$? = $ac_status" >&5 + echo "$as_me:14880: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14526,7 +14896,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:14529: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:14899: result: $ac_cv_header_pthread_h" >&5 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 if test "$ac_cv_header_pthread_h" = yes; then @@ -14536,7 +14906,7 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:14539: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:14909: checking if we can link with the $cf_lib_pthread library" >&5 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -14557,7 +14927,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 14560 "configure" +#line 14930 "configure" #include "confdefs.h" #include @@ -14574,16 +14944,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14577: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14947: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14580: \$? = $ac_status" >&5 + echo "$as_me:14950: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14583: \"$ac_try\"") >&5 + { (eval echo "$as_me:14953: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14586: \$? = $ac_status" >&5 + echo "$as_me:14956: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then with_pthread=yes else @@ -14593,7 +14963,7 @@ with_pthread=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:14596: result: $with_pthread" >&5 + echo "$as_me:14966: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done @@ -14621,7 +14991,7 @@ cat >>confdefs.h <<\EOF EOF else - { { echo "$as_me:14624: error: Cannot link with pthread library" >&5 + { { echo "$as_me:14994: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -14630,7 +15000,7 @@ fi fi -echo "$as_me:14633: checking if you want to use weak-symbols for pthreads" >&5 +echo "$as_me:15003: checking if you want to use weak-symbols for pthreads" >&5 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. @@ -14640,18 +15010,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; -echo "$as_me:14643: result: $use_weak_symbols" >&5 +echo "$as_me:15013: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "$use_weak_symbols" = yes ; then -echo "$as_me:14647: checking if $CC supports weak symbols" >&5 +echo "$as_me:15017: checking if $CC supports weak symbols" >&5 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 if test "${cf_cv_weak_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14654 "configure" +#line 15024 "configure" #include "confdefs.h" #include @@ -14677,16 +15047,16 @@ weak_symbol(fopen); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14680: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15050: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14683: \$? = $ac_status" >&5 + echo "$as_me:15053: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14686: \"$ac_try\"") >&5 + { (eval echo "$as_me:15056: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14689: \$? = $ac_status" >&5 + echo "$as_me:15059: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_weak_symbols=yes else @@ -14697,7 +15067,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14700: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:15070: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -14726,13 +15096,13 @@ EOF fi # OpenSUSE is installing ncurses6, using reentrant option. -echo "$as_me:14729: checking for _nc_TABSIZE" >&5 +echo "$as_me:15099: checking for _nc_TABSIZE" >&5 echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6 if test "${ac_cv_func__nc_TABSIZE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14735 "configure" +#line 15105 "configure" #include "confdefs.h" #define _nc_TABSIZE autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -14763,16 +15133,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14766: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15136: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14769: \$? = $ac_status" >&5 + echo "$as_me:15139: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14772: \"$ac_try\"") >&5 + { (eval echo "$as_me:15142: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14775: \$? = $ac_status" >&5 + echo "$as_me:15145: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func__nc_TABSIZE=yes else @@ -14782,7 +15152,7 @@ ac_cv_func__nc_TABSIZE=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14785: result: $ac_cv_func__nc_TABSIZE" >&5 +echo "$as_me:15155: result: $ac_cv_func__nc_TABSIZE" >&5 echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6 if test "$ac_cv_func__nc_TABSIZE" = yes; then assume_reentrant=yes @@ -14794,7 +15164,7 @@ fi # opaque outside of that, so there is no --enable-opaque option. We can use # this option without --with-pthreads, but this will be always set for # pthreads. -echo "$as_me:14797: checking if you want experimental reentrant code" >&5 +echo "$as_me:15167: checking if you want experimental reentrant code" >&5 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 # Check whether --enable-reentrant or --disable-reentrant was given. @@ -14804,7 +15174,7 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=$assume_reentrant fi; -echo "$as_me:14807: result: $with_reentrant" >&5 +echo "$as_me:15177: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "$with_reentrant" = yes ; then cf_cv_enable_reentrant=1 @@ -14827,7 +15197,7 @@ fi ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:14830: checking for prefix used to wrap public variables" >&5 + echo "$as_me:15200: checking for prefix used to wrap public variables" >&5 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 # Check whether --with-wrap-prefix or --without-wrap-prefix was given. @@ -14837,7 +15207,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:14840: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:15210: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -14851,7 +15221,7 @@ EOF ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:14854: checking if you want to see long compiling messages" >&5 +echo "$as_me:15224: 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. @@ -14885,10 +15255,10 @@ else ECHO_CC='' fi; -echo "$as_me:14888: result: $enableval" >&5 +echo "$as_me:15258: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:14891: checking if you want to use C11 _Noreturn feature" >&5 +echo "$as_me:15261: checking if you want to use C11 _Noreturn feature" >&5 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. @@ -14905,17 +15275,17 @@ else enable_stdnoreturn=no fi; -echo "$as_me:14908: result: $enable_stdnoreturn" >&5 +echo "$as_me:15278: result: $enable_stdnoreturn" >&5 echo "${ECHO_T}$enable_stdnoreturn" >&6 if test $enable_stdnoreturn = yes; then -echo "$as_me:14912: checking for C11 _Noreturn feature" >&5 +echo "$as_me:15282: checking for C11 _Noreturn feature" >&5 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 if test "${cf_cv_c11_noreturn+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14918 "configure" +#line 15288 "configure" #include "confdefs.h" #include @@ -14932,16 +15302,16 @@ if (feof(stdin)) giveup() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14935: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15305: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14938: \$? = $ac_status" >&5 + echo "$as_me:15308: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14941: \"$ac_try\"") >&5 + { (eval echo "$as_me:15311: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14944: \$? = $ac_status" >&5 + echo "$as_me:15314: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_c11_noreturn=yes else @@ -14952,7 +15322,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14955: result: $cf_cv_c11_noreturn" >&5 +echo "$as_me:15325: result: $cf_cv_c11_noreturn" >&5 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 else cf_cv_c11_noreturn=no, @@ -14980,14 +15350,16 @@ if test "$GCC" = yes || test "$GXX" = yes then case $CFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 - -echo "${as_me:-configure}:14985: testing repairing CFLAGS: $CFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $CFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -15002,15 +15374,22 @@ echo "${as_me:-configure}:14985: testing repairing CFLAGS: $CFLAGS ..." 1>&5 ;; esac done - CFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + if test "x$CFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 -echo "${as_me:-configure}:15008: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15381: testing repairing CFLAGS: $CFLAGS ..." 1>&5 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:15012: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15386: testing ... fixed $CFLAGS ..." 1>&5 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +echo "${as_me:-configure}:15390: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi ;; esac fi @@ -15019,14 +15398,16 @@ if test "$GCC" = yes || test "$GXX" = yes then case $CPPFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 - -echo "${as_me:-configure}:15024: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $CPPFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -15041,15 +15422,22 @@ echo "${as_me:-configure}:15024: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 ;; esac done - CPPFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + if test "x$CPPFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +echo "${as_me:-configure}:15429: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 -echo "${as_me:-configure}:15047: testing ... fixed $CPPFLAGS ..." 1>&5 + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:15434: testing ... fixed $CPPFLAGS ..." 1>&5 -echo "${as_me:-configure}:15051: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:15438: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi ;; esac fi @@ -15058,14 +15446,16 @@ if test "$GCC" = yes || test "$GXX" = yes then case $LDFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 - -echo "${as_me:-configure}:15063: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $LDFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -15080,20 +15470,27 @@ echo "${as_me:-configure}:15063: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 ;; esac done - LDFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + if test "x$LDFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 + +echo "${as_me:-configure}:15477: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 -echo "${as_me:-configure}:15086: testing ... fixed $LDFLAGS ..." 1>&5 + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:15482: testing ... fixed $LDFLAGS ..." 1>&5 -echo "${as_me:-configure}:15090: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:15486: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi ;; esac fi -echo "$as_me:15096: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:15493: 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. @@ -15110,7 +15507,7 @@ else enable_warnings=no fi; -echo "$as_me:15113: result: $enable_warnings" >&5 +echo "$as_me:15510: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then @@ -15134,7 +15531,7 @@ do done cat >"conftest.$ac_ext" <<_ACEOF -#line 15137 "configure" +#line 15534 "configure" #include "confdefs.h" #include @@ -15149,26 +15546,26 @@ String foo = malloc(1); free((void*)foo) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15152: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15549: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15155: \$? = $ac_status" >&5 + echo "$as_me:15552: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15158: \"$ac_try\"") >&5 + { (eval echo "$as_me:15555: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15161: \$? = $ac_status" >&5 + echo "$as_me:15558: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then -echo "$as_me:15164: checking for X11/Xt const-feature" >&5 +echo "$as_me:15561: checking for X11/Xt const-feature" >&5 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 if test "${cf_cv_const_x_string+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15171 "configure" +#line 15568 "configure" #include "confdefs.h" #define _CONST_X_STRING /* X11R7.8 (perhaps) */ @@ -15185,16 +15582,16 @@ String foo = malloc(1); *foo = 0 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15188: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15585: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15191: \$? = $ac_status" >&5 + echo "$as_me:15588: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15194: \"$ac_try\"") >&5 + { (eval echo "$as_me:15591: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15197: \$? = $ac_status" >&5 + echo "$as_me:15594: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_const_x_string=no @@ -15209,7 +15606,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15212: result: $cf_cv_const_x_string" >&5 +echo "$as_me:15609: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -15238,7 +15635,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi cat > "conftest.$ac_ext" <&5 + { echo "$as_me:15654: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -15270,12 +15667,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:15273: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:15670: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15276: \$? = $ac_status" >&5 + echo "$as_me:15673: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:15278: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:15675: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -15283,7 +15680,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:15286: checking for $CC warning options..." >&5 + { echo "$as_me:15683: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -15306,12 +15703,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:15309: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:15706: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15312: \$? = $ac_status" >&5 + echo "$as_me:15709: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:15314: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:15711: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -15319,7 +15716,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:15322: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:15719: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -15329,7 +15726,7 @@ echo "${as_me:-configure}:15322: 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}:15332: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:15729: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -15362,10 +15759,10 @@ cat > conftest.i <&5 + { echo "$as_me:15762: 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:15814: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15420: \$? = $ac_status" >&5 + echo "$as_me:15817: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:15422: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:15819: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -15482,12 +15879,12 @@ fi if test "x$enable_warnings" = "xyes"; then - ADAFLAGS="$ADAFLAGS -gnatg" + ADAFLAGS="$ADAFLAGS -gnatwa -gnatyg" fi ### use option --enable-assertions to turn on generation of assertion code -echo "$as_me:15490: checking if you want to enable runtime assertions" >&5 +echo "$as_me:15887: checking if you want to enable runtime assertions" >&5 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 # Check whether --enable-assertions or --disable-assertions was given. @@ -15497,7 +15894,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:15500: result: $with_assertions" >&5 +echo "$as_me:15897: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -15550,7 +15947,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:15553: checking whether to add trace feature to all models" >&5 +echo "$as_me:15950: checking whether to add trace feature to all models" >&5 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 # Check whether --with-trace or --without-trace was given. @@ -15560,7 +15957,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:15563: result: $cf_with_trace" >&5 +echo "$as_me:15960: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "$cf_with_trace" = yes ; then @@ -15668,7 +16065,7 @@ else ADA_TRACE=FALSE fi -echo "$as_me:15671: checking if we want to use GNAT projects" >&5 +echo "$as_me:16068: checking if we want to use GNAT projects" >&5 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 # Check whether --enable-gnat-projects or --disable-gnat-projects was given. @@ -15685,21 +16082,129 @@ else enable_gnat_projects=yes fi; -echo "$as_me:15688: result: $enable_gnat_projects" >&5 +echo "$as_me:16085: result: $enable_gnat_projects" >&5 echo "${ECHO_T}$enable_gnat_projects" >&6 ### Checks for libraries. case $cf_cv_system_name in (*mingw32*) + +echo "$as_me:16092: checking if ssp library is needed" >&5 +echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6 +if test "${cf_cv_need_libssp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat >"conftest.$ac_ext" <<_ACEOF +#line 16099 "configure" +#include "confdefs.h" + +#include +#include + +int +main (void) +{ + + DIR *dp = opendir("."); + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:16116: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:16119: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16122: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16125: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libssp=no +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + cf_save_LIBS="$LIBS" + LIBS="$LIBS -lssp" + cat >"conftest.$ac_ext" <<_ACEOF +#line 16135 "configure" +#include "confdefs.h" + +#include +#include + +int +main (void) +{ + + DIR *dp = opendir("."); + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:16152: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:16155: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16158: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16161: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libssp=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_need_libssp=maybe +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" + +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +fi +echo "$as_me:16175: result: $cf_cv_need_libssp" >&5 +echo "${ECHO_T}$cf_cv_need_libssp" >&6 + +if test "x$cf_cv_need_libssp" = xyes +then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lssp; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + +fi + ;; (*) -echo "$as_me:15696: checking for gettimeofday" >&5 +echo "$as_me:16201: checking for gettimeofday" >&5 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 if test "${ac_cv_func_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15702 "configure" +#line 16207 "configure" #include "confdefs.h" #define gettimeofday autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15730,16 +16235,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15733: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16238: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15736: \$? = $ac_status" >&5 + echo "$as_me:16241: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15739: \"$ac_try\"") >&5 + { (eval echo "$as_me:16244: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15742: \$? = $ac_status" >&5 + echo "$as_me:16247: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gettimeofday=yes else @@ -15749,7 +16254,7 @@ ac_cv_func_gettimeofday=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15752: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:16257: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test "$ac_cv_func_gettimeofday" = yes; then cat >>confdefs.h <<\EOF @@ -15758,7 +16263,7 @@ EOF else -echo "$as_me:15761: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:16266: checking for gettimeofday in -lbsd" >&5 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15766,7 +16271,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15769 "configure" +#line 16274 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15785,16 +16290,16 @@ gettimeofday (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15788: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16293: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15791: \$? = $ac_status" >&5 + echo "$as_me:16296: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15794: \"$ac_try\"") >&5 + { (eval echo "$as_me:16299: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15797: \$? = $ac_status" >&5 + echo "$as_me:16302: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -15805,7 +16310,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15808: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:16313: result: $ac_cv_lib_bsd_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 if test "$ac_cv_lib_bsd_gettimeofday" = yes; then @@ -15821,13 +16326,13 @@ fi esac ### Checks for header files. -echo "$as_me:15824: checking for ANSI C header files" >&5 +echo "$as_me:16329: 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 15830 "configure" +#line 16335 "configure" #include "confdefs.h" #include #include @@ -15835,13 +16340,13 @@ else #include _ACEOF -if { (eval echo "$as_me:15838: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:16343: \"$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:15844: \$? = $ac_status" >&5 + echo "$as_me:16349: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15863,7 +16368,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 15866 "configure" +#line 16371 "configure" #include "confdefs.h" #include @@ -15881,7 +16386,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 15884 "configure" +#line 16389 "configure" #include "confdefs.h" #include @@ -15902,7 +16407,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >"conftest.$ac_ext" <<_ACEOF -#line 15905 "configure" +#line 16410 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -15928,15 +16433,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:15931: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16436: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15934: \$? = $ac_status" >&5 + echo "$as_me:16439: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:15936: \"$ac_try\"") >&5 + { (eval echo "$as_me:16441: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15939: \$? = $ac_status" >&5 + echo "$as_me:16444: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -15949,7 +16454,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi fi -echo "$as_me:15952: result: $ac_cv_header_stdc" >&5 +echo "$as_me:16457: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -15965,28 +16470,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:15968: checking for $ac_header" >&5 +echo "$as_me:16473: 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 15974 "configure" +#line 16479 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15980: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16485: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15983: \$? = $ac_status" >&5 + echo "$as_me:16488: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15986: \"$ac_try\"") >&5 + { (eval echo "$as_me:16491: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15989: \$? = $ac_status" >&5 + echo "$as_me:16494: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -15996,7 +16501,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15999: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:16504: 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:16514: checking for signed char" >&5 echo $ECHO_N "checking for signed char... $ECHO_C" >&6 if test "${ac_cv_type_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16015 "configure" +#line 16520 "configure" #include "confdefs.h" $ac_includes_default int @@ -16027,16 +16532,16 @@ if (sizeof (signed char)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16030: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16535: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16033: \$? = $ac_status" >&5 + echo "$as_me:16538: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16036: \"$ac_try\"") >&5 + { (eval echo "$as_me:16541: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16039: \$? = $ac_status" >&5 + echo "$as_me:16544: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_signed_char=yes else @@ -16046,10 +16551,10 @@ ac_cv_type_signed_char=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16049: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:16554: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:16052: checking size of signed char" >&5 +echo "$as_me:16557: checking size of signed char" >&5 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 if test "${ac_cv_sizeof_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16058,7 +16563,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 16061 "configure" +#line 16566 "configure" #include "confdefs.h" $ac_includes_default int @@ -16070,21 +16575,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16073: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16578: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16076: \$? = $ac_status" >&5 + echo "$as_me:16581: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16079: \"$ac_try\"") >&5 + { (eval echo "$as_me:16584: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16082: \$? = $ac_status" >&5 + echo "$as_me:16587: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 16087 "configure" +#line 16592 "configure" #include "confdefs.h" $ac_includes_default int @@ -16096,16 +16601,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16099: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16604: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16102: \$? = $ac_status" >&5 + echo "$as_me:16607: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16105: \"$ac_try\"") >&5 + { (eval echo "$as_me:16610: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16108: \$? = $ac_status" >&5 + echo "$as_me:16613: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -16121,7 +16626,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 16124 "configure" +#line 16629 "configure" #include "confdefs.h" $ac_includes_default int @@ -16133,16 +16638,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16136: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16641: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16139: \$? = $ac_status" >&5 + echo "$as_me:16644: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16142: \"$ac_try\"") >&5 + { (eval echo "$as_me:16647: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16145: \$? = $ac_status" >&5 + echo "$as_me:16650: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -16158,7 +16663,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 16161 "configure" +#line 16666 "configure" #include "confdefs.h" $ac_includes_default int @@ -16170,16 +16675,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16173: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16678: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16176: \$? = $ac_status" >&5 + echo "$as_me:16681: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16179: \"$ac_try\"") >&5 + { (eval echo "$as_me:16684: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16182: \$? = $ac_status" >&5 + echo "$as_me:16687: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -16192,12 +16697,12 @@ done ac_cv_sizeof_signed_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:16195: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:16700: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >"conftest.$ac_ext" <<_ACEOF -#line 16200 "configure" +#line 16705 "configure" #include "confdefs.h" $ac_includes_default int @@ -16213,15 +16718,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:16216: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16721: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16219: \$? = $ac_status" >&5 + echo "$as_me:16724: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:16221: \"$ac_try\"") >&5 + { (eval echo "$as_me:16726: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16224: \$? = $ac_status" >&5 + echo "$as_me:16729: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_signed_char=`cat conftest.val` else @@ -16237,19 +16742,19 @@ else ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:16240: result: $ac_cv_sizeof_signed_char" >&5 +echo "$as_me:16745: result: $ac_cv_sizeof_signed_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 cat >>confdefs.h <&5 +echo "$as_me:16751: 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 16252 "configure" +#line 16757 "configure" #include "confdefs.h" #include #include @@ -16257,13 +16762,13 @@ else #include _ACEOF -if { (eval echo "$as_me:16260: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:16765: \"$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:16266: \$? = $ac_status" >&5 + echo "$as_me:16771: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16285,7 +16790,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 16288 "configure" +#line 16793 "configure" #include "confdefs.h" #include @@ -16303,7 +16808,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 16306 "configure" +#line 16811 "configure" #include "confdefs.h" #include @@ -16324,7 +16829,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >"conftest.$ac_ext" <<_ACEOF -#line 16327 "configure" +#line 16832 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -16350,15 +16855,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:16353: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16858: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16356: \$? = $ac_status" >&5 + echo "$as_me:16861: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:16358: \"$ac_try\"") >&5 + { (eval echo "$as_me:16863: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16361: \$? = $ac_status" >&5 + echo "$as_me:16866: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -16371,7 +16876,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi fi -echo "$as_me:16374: result: $ac_cv_header_stdc" >&5 +echo "$as_me:16879: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -16384,13 +16889,13 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:16387: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:16892: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16393 "configure" +#line 16898 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -16405,16 +16910,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16408: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16913: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16411: \$? = $ac_status" >&5 + echo "$as_me:16916: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16414: \"$ac_try\"") >&5 + { (eval echo "$as_me:16919: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16417: \$? = $ac_status" >&5 + echo "$as_me:16922: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -16424,7 +16929,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16427: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:16932: 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:16945: checking for opendir in -ldir" >&5 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 if test "${ac_cv_lib_dir_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16445,7 +16950,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16448 "configure" +#line 16953 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16464,16 +16969,16 @@ opendir (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16467: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16972: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16470: \$? = $ac_status" >&5 + echo "$as_me:16975: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16473: \"$ac_try\"") >&5 + { (eval echo "$as_me:16978: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16476: \$? = $ac_status" >&5 + echo "$as_me:16981: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dir_opendir=yes else @@ -16484,14 +16989,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16487: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:16992: result: $ac_cv_lib_dir_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 if test "$ac_cv_lib_dir_opendir" = yes; then LIBS="$LIBS -ldir" fi else - echo "$as_me:16494: checking for opendir in -lx" >&5 + echo "$as_me:16999: checking for opendir in -lx" >&5 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 if test "${ac_cv_lib_x_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16499,7 +17004,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16502 "configure" +#line 17007 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16518,16 +17023,16 @@ opendir (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16521: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17026: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16524: \$? = $ac_status" >&5 + echo "$as_me:17029: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16527: \"$ac_try\"") >&5 + { (eval echo "$as_me:17032: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16530: \$? = $ac_status" >&5 + echo "$as_me:17035: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_x_opendir=yes else @@ -16538,7 +17043,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16541: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:17046: result: $ac_cv_lib_x_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 if test "$ac_cv_lib_x_opendir" = yes; then LIBS="$LIBS -lx" @@ -16546,13 +17051,13 @@ fi fi -echo "$as_me:16549: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:17054: 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 16555 "configure" +#line 17060 "configure" #include "confdefs.h" #include #include @@ -16568,16 +17073,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16571: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17076: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16574: \$? = $ac_status" >&5 + echo "$as_me:17079: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16577: \"$ac_try\"") >&5 + { (eval echo "$as_me:17082: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16580: \$? = $ac_status" >&5 + echo "$as_me:17085: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_header_time=yes else @@ -16587,7 +17092,7 @@ ac_cv_header_time=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16590: result: $ac_cv_header_time" >&5 +echo "$as_me:17095: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -16605,13 +17110,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" -echo "$as_me:16608: checking for an ANSI C-conforming const" >&5 +echo "$as_me:17113: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16614 "configure" +#line 17119 "configure" #include "confdefs.h" int @@ -16669,16 +17174,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16672: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17177: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16675: \$? = $ac_status" >&5 + echo "$as_me:17180: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16678: \"$ac_try\"") >&5 + { (eval echo "$as_me:17183: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16681: \$? = $ac_status" >&5 + echo "$as_me:17186: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_c_const=yes else @@ -16688,7 +17193,7 @@ ac_cv_c_const=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16691: result: $ac_cv_c_const" >&5 +echo "$as_me:17196: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -16700,7 +17205,7 @@ fi ### Checks for external-data -echo "$as_me:16703: checking if data-only library module links" >&5 +echo "$as_me:17208: checking if data-only library module links" >&5 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 if test "${cf_cv_link_dataonly+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16708,20 +17213,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:17219: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16717: \$? = $ac_status" >&5 + echo "$as_me:17222: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then mv conftest.o data.o && \ ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null fi rm -f conftest.$ac_ext data.o cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:17242: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16740: \$? = $ac_status" >&5 + echo "$as_me:17245: \$? = $ac_status" >&5 (exit "$ac_status"); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -16750,7 +17255,7 @@ EOF cf_cv_link_dataonly=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 16753 "configure" +#line 17258 "configure" #include "confdefs.h" int main(void) @@ -16761,15 +17266,15 @@ else _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:16764: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17269: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16767: \$? = $ac_status" >&5 + echo "$as_me:17272: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:16769: \"$ac_try\"") >&5 + { (eval echo "$as_me:17274: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16772: \$? = $ac_status" >&5 + echo "$as_me:17277: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_link_dataonly=yes else @@ -16784,7 +17289,7 @@ fi fi -echo "$as_me:16787: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:17292: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -16803,23 +17308,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:16806: checking for $ac_header" >&5 +echo "$as_me:17311: 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 16812 "configure" +#line 17317 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:16816: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:17321: \"$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:16822: \$? = $ac_status" >&5 + echo "$as_me:17327: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16838,7 +17343,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:16841: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:17346: 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:17356: checking for working mkstemp" >&5 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 if test "${cf_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16859,7 +17364,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 16862 "configure" +#line 17367 "configure" #include "confdefs.h" #include @@ -16900,15 +17405,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:16903: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17408: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16906: \$? = $ac_status" >&5 + echo "$as_me:17411: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:16908: \"$ac_try\"") >&5 + { (eval echo "$as_me:17413: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16911: \$? = $ac_status" >&5 + echo "$as_me:17416: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_mkstemp=yes @@ -16923,16 +17428,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:16926: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:17431: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "x$cf_cv_func_mkstemp" = xmaybe ; then - echo "$as_me:16929: checking for mkstemp" >&5 + echo "$as_me:17434: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 if test "${ac_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16935 "configure" +#line 17440 "configure" #include "confdefs.h" #define mkstemp autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -16963,16 +17468,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16966: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17471: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16969: \$? = $ac_status" >&5 + echo "$as_me:17474: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16972: \"$ac_try\"") >&5 + { (eval echo "$as_me:17477: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16975: \$? = $ac_status" >&5 + echo "$as_me:17480: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_mkstemp=yes else @@ -16982,7 +17487,7 @@ ac_cv_func_mkstemp=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16985: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:17490: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -17011,7 +17516,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./- unset cf_TEMP_gnat # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. set dummy $cf_prog_gnat; ac_word=$2 -echo "$as_me:17014: checking for $ac_word" >&5 +echo "$as_me:17519: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17028,7 +17533,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" - echo "$as_me:17031: found $ac_dir/$ac_word" >&5 + echo "$as_me:17536: found $ac_dir/$ac_word" >&5 break fi done @@ -17040,10 +17545,10 @@ fi cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat if test -n "$cf_TEMP_gnat"; then - echo "$as_me:17043: result: $cf_TEMP_gnat" >&5 + echo "$as_me:17548: result: $cf_TEMP_gnat" >&5 echo "${ECHO_T}$cf_TEMP_gnat" >&6 else - echo "$as_me:17046: result: no" >&5 + echo "$as_me:17551: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -17053,7 +17558,7 @@ fi unset cf_cv_gnat_version unset cf_TEMP_gnat -echo "$as_me:17056: checking for $cf_prog_gnat version" >&5 +echo "$as_me:17561: checking for $cf_prog_gnat version" >&5 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 if test "${cf_cv_gnat_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17064,7 +17569,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` fi -echo "$as_me:17067: result: $cf_cv_gnat_version" >&5 +echo "$as_me:17572: result: $cf_cv_gnat_version" >&5 echo "${ECHO_T}$cf_cv_gnat_version" >&6 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version @@ -17093,7 +17598,7 @@ else cd conftest.src for cf_gprconfig in Ada C do - echo "$as_me:17096: checking for gprconfig name for $cf_gprconfig" >&5 + echo "$as_me:17601: checking for gprconfig name for $cf_gprconfig" >&5 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 if test "$cf_gprconfig" = C then @@ -17112,10 +17617,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 if test -n "$cf_gprconfig_value" then eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" - echo "$as_me:17115: result: $cf_gprconfig_value" >&5 + echo "$as_me:17620: result: $cf_gprconfig_value" >&5 echo "${ECHO_T}$cf_gprconfig_value" >&6 else - echo "$as_me:17118: result: missing" >&5 + echo "$as_me:17623: result: missing" >&5 echo "${ECHO_T}missing" >&6 cf_ada_config="#" break @@ -17128,7 +17633,7 @@ echo "${ECHO_T}missing" >&6 if test "x$cf_ada_config" != "x#" then -echo "$as_me:17131: checking for gnat version" >&5 +echo "$as_me:17636: checking for gnat version" >&5 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 if test "${cf_cv_gnat_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17139,7 +17644,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` fi -echo "$as_me:17142: result: $cf_cv_gnat_version" >&5 +echo "$as_me:17647: result: $cf_cv_gnat_version" >&5 echo "${ECHO_T}$cf_cv_gnat_version" >&6 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no @@ -17148,7 +17653,7 @@ case "$cf_cv_gnat_version" in cf_cv_prog_gnat_correct=yes ;; (*) - { echo "$as_me:17151: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:17656: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} cf_cv_prog_gnat_correct=no ;; @@ -17156,7 +17661,7 @@ esac # Extract the first word of "m4", so it can be a program name with args. set dummy m4; ac_word=$2 -echo "$as_me:17159: checking for $ac_word" >&5 +echo "$as_me:17664: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_M4_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17171,7 +17676,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_M4_exists="yes" -echo "$as_me:17174: found $ac_dir/$ac_word" >&5 +echo "$as_me:17679: found $ac_dir/$ac_word" >&5 break done @@ -17180,20 +17685,20 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:17183: result: $M4_exists" >&5 + echo "$as_me:17688: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:17186: result: no" >&5 + echo "$as_me:17691: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$ac_cv_prog_M4_exists" = no; then cf_cv_prog_gnat_correct=no - { echo "$as_me:17192: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + { echo "$as_me:17697: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:17196: checking if GNAT works" >&5 + echo "$as_me:17701: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf ./conftest* ./*~conftest* @@ -17221,7 +17726,7 @@ else fi rm -rf ./conftest* ./*~conftest* - echo "$as_me:17224: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:17729: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi else @@ -17231,7 +17736,7 @@ fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:17234: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:17739: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -17248,10 +17753,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:17251: result: $ADAFLAGS" >&5 + echo "$as_me:17756: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:17254: checking if GNATPREP supports -T option" >&5 +echo "$as_me:17759: checking if GNATPREP supports -T option" >&5 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 if test "${cf_cv_gnatprep_opt_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17261,11 +17766,11 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:17264: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:17769: result: $cf_cv_gnatprep_opt_t" >&5 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" -echo "$as_me:17268: checking if GNAT supports generics" >&5 +echo "$as_me:17773: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case "$cf_cv_gnat_version" in (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) @@ -17275,7 +17780,7 @@ case "$cf_cv_gnat_version" in cf_gnat_generics=no ;; esac -echo "$as_me:17278: result: $cf_gnat_generics" >&5 +echo "$as_me:17783: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -17287,7 +17792,7 @@ else cf_generic_objects= fi -echo "$as_me:17290: checking if GNAT supports SIGINT" >&5 +echo "$as_me:17795: checking if GNAT supports SIGINT" >&5 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 if test "${cf_cv_gnat_sigint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17335,7 +17840,7 @@ fi rm -rf ./conftest* ./*~conftest* fi -echo "$as_me:17338: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:17843: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test "$cf_cv_gnat_sigint" = yes ; then @@ -17348,7 +17853,7 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:17351: checking if GNAT supports project files" >&5 +echo "$as_me:17856: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case "$cf_cv_gnat_version" in (3.[0-9]*) @@ -17411,15 +17916,15 @@ CF_EOF esac ;; esac -echo "$as_me:17414: result: $cf_gnat_projects" >&5 +echo "$as_me:17919: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 fi # enable_gnat_projects if test "$cf_gnat_projects" = yes then - echo "$as_me:17420: checking if GNAT supports libraries" >&5 + echo "$as_me:17925: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:17422: result: $cf_gnat_libraries" >&5 + echo "$as_me:17927: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -17439,7 +17944,7 @@ then then USE_GNAT_MAKE_GPR="" else - { echo "$as_me:17442: WARNING: use old makefile rules since tools are missing" >&5 + { echo "$as_me:17947: WARNING: use old makefile rules since tools are missing" >&5 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} fi fi @@ -17451,7 +17956,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:17454: checking for ada-compiler" >&5 +echo "$as_me:17959: checking for ada-compiler" >&5 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 # Check whether --with-ada-compiler or --without-ada-compiler was given. @@ -17462,12 +17967,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:17465: result: $cf_ada_compiler" >&5 +echo "$as_me:17970: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:17470: checking for ada-include" >&5 +echo "$as_me:17975: checking for ada-include" >&5 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 # Check whether --with-ada-include or --without-ada-include was given. @@ -17503,7 +18008,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:17506: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:18011: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -17512,10 +18017,10 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:17515: result: $ADA_INCLUDE" >&5 +echo "$as_me:18020: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:17518: checking for ada-objects" >&5 +echo "$as_me:18023: checking for ada-objects" >&5 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 # Check whether --with-ada-objects or --without-ada-objects was given. @@ -17551,7 +18056,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:17554: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:18059: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -17560,10 +18065,10 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:17563: result: $ADA_OBJECTS" >&5 +echo "$as_me:18068: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:17566: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:18071: checking if an Ada95 shared-library should be built" >&5 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. @@ -17573,14 +18078,14 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:17576: result: $with_ada_sharedlib" >&5 +echo "$as_me:18081: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 if test "x$with_ada_sharedlib" != xno then if test "x$cf_gnat_projects" != xyes then - { echo "$as_me:17583: WARNING: disabling shared-library since GNAT projects are not supported" >&5 + { echo "$as_me:18088: WARNING: disabling shared-library since GNAT projects are not supported" >&5 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} with_ada_sharedlib=no fi @@ -17600,7 +18105,7 @@ fi # allow the Ada binding to be renamed -echo "$as_me:17603: checking for ada-libname" >&5 +echo "$as_me:18108: checking for ada-libname" >&5 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 # Check whether --with-ada-libname or --without-ada-libname was given. @@ -17616,16 +18121,16 @@ case "x$ADA_LIBNAME" in ;; esac -echo "$as_me:17619: result: $ADA_LIBNAME" >&5 +echo "$as_me:18124: result: $ADA_LIBNAME" >&5 echo "${ECHO_T}$ADA_LIBNAME" >&6 else - { { echo "$as_me:17623: error: No usable Ada compiler found" >&5 + { { echo "$as_me:18128: error: No usable Ada compiler found" >&5 echo "$as_me: error: No usable Ada compiler found" >&2;} { (exit 1); exit 1; }; } fi else - { { echo "$as_me:17628: error: The Ada compiler is needed for this package" >&5 + { { echo "$as_me:18133: error: The Ada compiler is needed for this package" >&5 echo "$as_me: error: The Ada compiler is needed for this package" >&2;} { (exit 1); exit 1; }; } fi @@ -17665,7 +18170,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:17668: checking default library suffix" >&5 +echo "$as_me:18173: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -17676,10 +18181,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 (shared) DFT_ARG_SUFFIX='' ;; esac test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" -echo "$as_me:17679: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:18184: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:17682: checking default library-dependency suffix" >&5 +echo "$as_me:18187: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -17762,10 +18267,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" fi -echo "$as_me:17765: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:18270: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:17768: checking default object directory" >&5 +echo "$as_me:18273: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -17781,7 +18286,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:17784: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:18289: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 ### Set up low-level terminfo dependencies for makefiles. @@ -17923,7 +18428,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:17926: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:18431: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -18102,7 +18607,7 @@ cat >>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:18105: error: ambiguous option: $1 + { { echo "$as_me:18610: 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;} @@ -18121,7 +18626,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:18124: error: unrecognized option: $1 + -*) { { echo "$as_me:18629: 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;} @@ -18195,7 +18700,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; - *) { { echo "$as_me:18198: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:18703: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -18555,7 +19060,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:18558: creating $ac_file" >&5 + { echo "$as_me:19063: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -18573,7 +19078,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:18576: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:19081: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -18586,7 +19091,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:18589: error: cannot find input file: $f" >&5 + { { echo "$as_me:19094: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -18602,7 +19107,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:18605: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:19110: 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;} @@ -18611,7 +19116,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:18614: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:19119: 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;} @@ -18648,7 +19153,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:18651: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:19156: 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;} @@ -18659,7 +19164,7 @@ $ac_seen" >&2;} ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:18662: WARNING: Some variables may not be substituted: + { echo "$as_me:19167: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -18708,7 +19213,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:18711: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:19216: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -18719,7 +19224,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:18722: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:19227: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -18732,7 +19237,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:18735: error: cannot find input file: $f" >&5 + { { echo "$as_me:19240: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -18790,7 +19295,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:18793: $ac_file is unchanged" >&5 + { echo "$as_me:19298: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \