X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=Ada95%2Fconfigure;h=127fd8968a193bef66479167a3ae7bb6a9f24038;hb=8f4cd91a25f1569f73651062aaaf5fb969182eab;hp=27d681a8cfe06877a8fcdb068fba03082befd7bd;hpb=9b51794524995304d8788e42aacb36feede9364f;p=ncurses.git diff --git a/Ada95/configure b/Ada95/configure index 27d681a8..127fd896 100755 --- a/Ada95/configure +++ b/Ada95/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.83 . +# From configure.in Revision: 1.84 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20210509. # @@ -3279,83 +3279,110 @@ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 ;; esac -PKG_CONFIG_LIBDIR=no +cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[ ]*,,'` # 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 && cf_search_path=yes fi; -case x$PKG_CONFIG_LIBDIR in +case x$cf_search_path in (x/*) ;; (xyes) + cf_search_path= + test -n "$verbose" && echo " auto..." 1>&6 + +echo "${as_me:-configure}:3299: testing auto... ..." 1>&5 + # Look for the library directory using the same prefix as the executable - if test "x$PKG_CONFIG" = xnone + echo "$as_me:3302: 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,/[^/]*/[^/]*$,,'` + # 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 + + # 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 - # If you don't like using the default architecture, you have to specify the - # intended library directory and corresponding compiler/linker options. - # - # This case allows for Debian's 2014-flavor of multiarch, along with the - # most common variations before that point. Some other variants spell the - # directory differently, e.g., "pkg-config", and put it in unusual places. - # pkg-config has always been poorly standardized, which is ironic... - case x`(arch) 2>/dev/null` in - (*64) - cf_search_path="\ - $cf_path/lib/*64-linux-gnu \ - $cf_path/share \ - $cf_path/lib64 \ - $cf_path/lib32 \ - $cf_path/lib" - ;; - (*) - cf_search_path="\ - $cf_path/lib/*-linux-gnu \ - $cf_path/share \ - $cf_path/lib32 \ - $cf_path/lib \ - $cf_path/libdata" - ;; - esac + echo "$as_me:3329: result: $cf_search_path" >&5 +echo "${ECHO_T}$cf_search_path" >&6 + + ;; +(*) + ;; +esac - test -n "$verbose" && echo " list..." 1>&6 +echo "$as_me:3337: 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 + if test -d "$cf_config" + then + cf_pkg_config_path=$cf_config + break + fi +done +echo "$as_me:3348: result: $cf_pkg_config_path" >&5 +echo "${ECHO_T}$cf_pkg_config_path" >&6 -echo "${as_me:-configure}:3332: testing list... ..." 1>&5 +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 -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" +then + echo "$as_me:3358: 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 - 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" - then - PKG_CONFIG_LIBDIR=$cf_config/pkgconfig - echo "$as_me:3343: checking done" >&5 -echo $ECHO_N "checking done... $ECHO_C" >&6 + case $cf_config in + $cf_libdir/pkgconfig) + PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig break - fi + ;; + *) + test -z "$cf_backup" && cf_backup=$cf_config + ;; + esac done - ;; -(*) - ;; -esac - -if test "x$PKG_CONFIG_LIBDIR" != xno ; then - echo "$as_me:3354: result: $PKG_CONFIG_LIBDIR" >&5 + test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup + echo "$as_me:3381: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 fi -echo "$as_me:3358: checking if you want to build test-programs" >&5 +echo "$as_me:3385: 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 +3392,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:3395: 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:3398: 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 +3405,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:3408: 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:3412: 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 +3436,7 @@ else fi fi -echo "$as_me:3412: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3439: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -3427,7 +3454,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:3457: 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 +3474,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:3477: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:3454: result: no" >&5 + echo "$as_me:3481: 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:3486: 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 +3538,7 @@ CF_EOF rm -rf conftest* fi -echo "$as_me:3514: result: $cf_cv_make_PHONY" >&5 +echo "$as_me:3541: result: $cf_cv_make_PHONY" >&5 echo "${ECHO_T}$cf_cv_make_PHONY" >&6 MAKE_NO_PHONY="#" MAKE_PHONY="#" @@ -3522,7 +3549,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:3552: 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 +3564,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:3567: found $ac_dir/$ac_word" >&5 break done @@ -3545,10 +3572,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:3548: result: $CTAGS" >&5 + echo "$as_me:3575: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:3551: result: no" >&5 + echo "$as_me:3578: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3559,7 +3586,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:3589: 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 +3601,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:3604: found $ac_dir/$ac_word" >&5 break done @@ -3582,10 +3609,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:3585: result: $ETAGS" >&5 + echo "$as_me:3612: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:3588: result: no" >&5 + echo "$as_me:3615: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3594,7 +3621,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:3624: 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 +3636,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:3639: found $ac_dir/$ac_word" >&5 break done @@ -3618,17 +3645,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:3648: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:3624: result: no" >&5 + echo "$as_me:3651: 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:3658: 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 +3670,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:3673: found $ac_dir/$ac_word" >&5 break done @@ -3652,10 +3679,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:3682: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:3658: result: no" >&5 + echo "$as_me:3685: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3675,7 +3702,7 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:3678: checking for makeflags variable" >&5 +echo "$as_me:3705: 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 +3732,7 @@ CF_EOF ;; (*) -echo "${as_me:-configure}:3708: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 +echo "${as_me:-configure}:3735: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ;; esac @@ -3713,13 +3740,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:3743: 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:3749: 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 +3761,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:3764: found $ac_dir/$ac_word" >&5 break done @@ -3742,10 +3769,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:3745: result: $RANLIB" >&5 + echo "$as_me:3772: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:3748: result: no" >&5 + echo "$as_me:3775: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3754,7 +3781,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:3784: 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 +3796,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:3799: found $ac_dir/$ac_word" >&5 break done @@ -3778,10 +3805,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:3808: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:3784: result: no" >&5 + echo "$as_me:3811: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3793,7 +3820,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:3823: 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 +3835,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:3838: found $ac_dir/$ac_word" >&5 break done @@ -3816,10 +3843,10 @@ fi fi LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$as_me:3819: result: $LD" >&5 + echo "$as_me:3846: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:3822: result: no" >&5 + echo "$as_me:3849: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3828,7 +3855,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:3858: 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 +3870,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:3873: found $ac_dir/$ac_word" >&5 break done @@ -3852,10 +3879,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:3882: result: $ac_ct_LD" >&5 echo "${ECHO_T}$ac_ct_LD" >&6 else - echo "$as_me:3858: result: no" >&5 + echo "$as_me:3885: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3867,7 +3894,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:3897: 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 +3909,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:3912: found $ac_dir/$ac_word" >&5 break done @@ -3890,10 +3917,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:3893: result: $AR" >&5 + echo "$as_me:3920: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:3896: result: no" >&5 + echo "$as_me:3923: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3902,7 +3929,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:3932: 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 +3944,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:3947: found $ac_dir/$ac_word" >&5 break done @@ -3926,10 +3953,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:3956: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:3932: result: no" >&5 + echo "$as_me:3959: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3941,7 +3968,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:3971: 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 +3983,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:3986: found $ac_dir/$ac_word" >&5 break done @@ -3964,10 +3991,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:3967: result: $AR" >&5 + echo "$as_me:3994: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:3970: result: no" >&5 + echo "$as_me:3997: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3976,7 +4003,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:4006: 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 +4018,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:4021: found $ac_dir/$ac_word" >&5 break done @@ -4000,10 +4027,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:4030: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4006: result: no" >&5 + echo "$as_me:4033: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4012,7 +4039,7 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:4015: checking for options to update archives" >&5 +echo "$as_me:4042: 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 +4076,13 @@ else rm -f conftest.a cat >"conftest.$ac_ext" <&5 + if { (eval echo "$as_me:4082: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4058: \$? = $ac_status" >&5 + echo "$as_me:4085: \$? = $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 +4093,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}:4096: testing cannot compile test-program ..." 1>&5 break fi @@ -4076,7 +4103,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:4106: result: $cf_cv_ar_flags" >&5 echo "${ECHO_T}$cf_cv_ar_flags" >&6 if test -n "$ARFLAGS" ; then @@ -4087,17 +4114,17 @@ else ARFLAGS=$cf_cv_ar_flags fi - echo "$as_me:4090: checking for PATH separator" >&5 + echo "$as_me:4117: 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:4124: 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:4127: 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 +4137,7 @@ if test "${with_install_prefix+set}" = set; then ;; esac fi; -echo "$as_me:4113: result: $DESTDIR" >&5 +echo "$as_me:4140: result: $DESTDIR" >&5 echo "${ECHO_T}$DESTDIR" >&6 ############################################################################### @@ -4138,7 +4165,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:4168: 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 +4180,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_BUILD_CC="$ac_prog" -echo "$as_me:4156: found $ac_dir/$ac_word" >&5 +echo "$as_me:4183: found $ac_dir/$ac_word" >&5 break done @@ -4161,10 +4188,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:4191: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 else - echo "$as_me:4167: result: no" >&5 + echo "$as_me:4194: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4173,12 +4200,12 @@ done test -n "$BUILD_CC" || BUILD_CC="none" fi; - echo "$as_me:4176: checking for native build C compiler" >&5 + echo "$as_me:4203: 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:4205: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 - echo "$as_me:4181: checking for native build C preprocessor" >&5 + echo "$as_me:4208: 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 +4215,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:4218: result: $BUILD_CPP" >&5 echo "${ECHO_T}$BUILD_CPP" >&6 - echo "$as_me:4194: checking for native build C flags" >&5 + echo "$as_me:4221: 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 +4226,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:4229: 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:4232: 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 +4237,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:4240: result: $BUILD_CPPFLAGS" >&5 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - echo "$as_me:4216: checking for native build linker-flags" >&5 + echo "$as_me:4243: 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 +4248,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:4251: result: $BUILD_LDFLAGS" >&5 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - echo "$as_me:4227: checking for native build linker-libraries" >&5 + echo "$as_me:4254: 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 +4259,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:4262: result: $BUILD_LIBS" >&5 echo "${ECHO_T}$BUILD_LIBS" >&6 # this assumes we're on Unix. @@ -4242,7 +4269,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:4272: 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 +4294,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:4297: 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 +4304,27 @@ if test "${with_shared+set}" = set; then else with_shared=no fi; -echo "$as_me:4280: result: $with_shared" >&5 +echo "$as_me:4307: 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:4311: 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:4314: 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:4319: 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:4322: 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:4327: 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 +4334,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:4337: 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 +4365,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:4368: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -4374,7 +4401,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 4404 "configure" #include "confdefs.h" #include int @@ -4386,16 +4413,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4389: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4416: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4392: \$? = $ac_status" >&5 + echo "$as_me:4419: \$? = $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:4422: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4398: \$? = $ac_status" >&5 + echo "$as_me:4425: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4412,7 +4439,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}:4442: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -4448,7 +4475,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}:4478: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -4463,13 +4490,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:4493: 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:4496: 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:4499: 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 +4629,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 4605 "configure" +#line 4632 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -4614,37 +4641,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:4644: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4620: \$? = $ac_status" >&5 + echo "$as_me:4647: \$? = $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:4650: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4626: \$? = $ac_status" >&5 + echo "$as_me:4653: \$? = $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 4659 "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:4666: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4642: \$? = $ac_status" >&5 + echo "$as_me:4669: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:4644: \"$ac_try\"") >&5 + { (eval echo "$as_me:4671: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4647: \$? = $ac_status" >&5 + echo "$as_me:4674: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -4677,57 +4704,36 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" 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/=.*//'` -cf_old_cflag="$CFLAGS" - -case "$CFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CFLAGS" != "$cf_old_cflag" ; -then +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_new_cflag" -fi + CFLAGS="$cf_old_cflag" +done cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` -cf_old_cflag="$CPPFLAGS" - -case "$CPPFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CPPFLAGS" != "$cf_old_cflag" ; -then - - CPPFLAGS="$cf_new_cflag" -fi +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) @@ -4820,6 +4826,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -4837,7 +4845,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 4840 "configure" +#line 4848 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -4849,37 +4857,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4852: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4860: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4855: \$? = $ac_status" >&5 + echo "$as_me:4863: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4858: \"$ac_try\"") >&5 + { (eval echo "$as_me:4866: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4861: \$? = $ac_status" >&5 + echo "$as_me:4869: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 4867 "configure" +#line 4875 "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:4874: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4882: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4877: \$? = $ac_status" >&5 + echo "$as_me:4885: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:4879: \"$ac_try\"") >&5 + { (eval echo "$as_me:4887: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4882: \$? = $ac_status" >&5 + echo "$as_me:4890: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -4896,7 +4904,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:4899: result: $cf_have_ncuconfig" >&5 + echo "$as_me:4907: 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" @@ -4912,7 +4920,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:4915: checking for terminfo header" >&5 +echo "$as_me:4923: 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 @@ -4930,7 +4938,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 4933 "configure" +#line 4941 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -4945,16 +4953,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4948: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4956: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4951: \$? = $ac_status" >&5 + echo "$as_me:4959: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4954: \"$ac_try\"") >&5 + { (eval echo "$as_me:4962: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4957: \$? = $ac_status" >&5 + echo "$as_me:4965: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -4970,7 +4978,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:4973: result: $cf_cv_term_header" >&5 +echo "$as_me:4981: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -5005,7 +5013,7 @@ esac fi else - echo "$as_me:5008: result: no" >&5 + echo "$as_me:5016: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -5021,7 +5029,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:5024: checking for $ac_word" >&5 +echo "$as_me:5032: 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 @@ -5036,7 +5044,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:5039: found $ac_dir/$ac_word" >&5 +echo "$as_me:5047: found $ac_dir/$ac_word" >&5 break done @@ -5044,10 +5052,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:5047: result: $NCURSES_CONFIG" >&5 + echo "$as_me:5055: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:5050: result: no" >&5 + echo "$as_me:5058: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5060,7 +5068,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:5063: checking for $ac_word" >&5 +echo "$as_me:5071: 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 @@ -5075,7 +5083,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:5078: found $ac_dir/$ac_word" >&5 +echo "$as_me:5086: found $ac_dir/$ac_word" >&5 break done @@ -5083,10 +5091,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:5086: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:5094: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:5089: result: no" >&5 + echo "$as_me:5097: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5101,57 +5109,36 @@ fi 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/=.*//'` -cf_old_cflag="$CFLAGS" - -case "$CFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CFLAGS" != "$cf_old_cflag" ; -then +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_new_cflag" -fi + CFLAGS="$cf_old_cflag" +done cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` -cf_old_cflag="$CPPFLAGS" - -case "$CPPFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CPPFLAGS" != "$cf_old_cflag" ; -then - - CPPFLAGS="$cf_new_cflag" -fi +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) @@ -5244,6 +5231,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -5262,7 +5251,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:5265: checking if we have identified curses headers" >&5 +echo "$as_me:5254: 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 @@ -5274,7 +5263,7 @@ for cf_header in \ curses.h ncurses/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 5277 "configure" +#line 5266 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -5286,16 +5275,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5289: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5278: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5292: \$? = $ac_status" >&5 + echo "$as_me:5281: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5295: \"$ac_try\"") >&5 + { (eval echo "$as_me:5284: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5298: \$? = $ac_status" >&5 + echo "$as_me:5287: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -5306,11 +5295,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5309: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:5298: 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:5313: error: No curses header-files found" >&5 + { { echo "$as_me:5302: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -5320,23 +5309,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:5323: checking for $ac_header" >&5 +echo "$as_me:5312: 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 5329 "configure" +#line 5318 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5333: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:5322: \"$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:5339: \$? = $ac_status" >&5 + echo "$as_me:5328: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5355,7 +5344,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:5358: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:5347: 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 5414 "configure" +#line 5403 "configure" #include "confdefs.h" #include int @@ -5423,16 +5412,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5426: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5415: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5429: \$? = $ac_status" >&5 + echo "$as_me:5418: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5432: \"$ac_try\"") >&5 + { (eval echo "$as_me:5421: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5435: \$? = $ac_status" >&5 + echo "$as_me:5424: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5449,7 +5438,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}:5452: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5441: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5468,7 +5457,7 @@ fi } -echo "$as_me:5471: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:5460: 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 @@ -5480,7 +5469,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 5483 "configure" +#line 5472 "configure" #include "confdefs.h" #include <$cf_header> @@ -5504,16 +5493,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5507: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5496: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5510: \$? = $ac_status" >&5 + echo "$as_me:5499: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5513: \"$ac_try\"") >&5 + { (eval echo "$as_me:5502: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5516: \$? = $ac_status" >&5 + echo "$as_me:5505: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -5528,14 +5517,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5531: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:5520: 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:5538: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:5527: 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 @@ -5656,7 +5645,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 5659 "configure" +#line 5648 "configure" #include "confdefs.h" #include int @@ -5668,16 +5657,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5671: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5660: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5674: \$? = $ac_status" >&5 + echo "$as_me:5663: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5677: \"$ac_try\"") >&5 + { (eval echo "$as_me:5666: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5680: \$? = $ac_status" >&5 + echo "$as_me:5669: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5694,7 +5683,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}:5697: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5686: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5717,7 +5706,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 5720 "configure" +#line 5709 "configure" #include "confdefs.h" #include <$cf_header> @@ -5741,16 +5730,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5744: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5733: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5747: \$? = $ac_status" >&5 + echo "$as_me:5736: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5750: \"$ac_try\"") >&5 + { (eval echo "$as_me:5739: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5753: \$? = $ac_status" >&5 + echo "$as_me:5742: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -5771,12 +5760,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:5774: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5763: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:5779: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:5768: 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%/[^/]*$%%'` @@ -5812,7 +5801,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 5815 "configure" +#line 5804 "configure" #include "confdefs.h" #include int @@ -5824,16 +5813,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5827: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5816: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5830: \$? = $ac_status" >&5 + echo "$as_me:5819: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5833: \"$ac_try\"") >&5 + { (eval echo "$as_me:5822: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5836: \$? = $ac_status" >&5 + echo "$as_me:5825: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5850,7 +5839,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}:5853: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5842: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5898,7 +5887,7 @@ EOF ;; esac -echo "$as_me:5901: checking for terminfo header" >&5 +echo "$as_me:5890: 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 @@ -5916,7 +5905,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 5919 "configure" +#line 5908 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -5931,16 +5920,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5934: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5923: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5937: \$? = $ac_status" >&5 + echo "$as_me:5926: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5940: \"$ac_try\"") >&5 + { (eval echo "$as_me:5929: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5943: \$? = $ac_status" >&5 + echo "$as_me:5932: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -5956,7 +5945,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5959: result: $cf_cv_term_header" >&5 +echo "$as_me:5948: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -5994,7 +5983,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:5997: checking for ncurses version" >&5 +echo "$as_me:5986: 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 @@ -6020,10 +6009,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:6023: \"$cf_try\"") >&5 + { (eval echo "$as_me:6012: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:6026: \$? = $ac_status" >&5 + echo "$as_me:6015: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -6033,7 +6022,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 6036 "configure" +#line 6025 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -6058,15 +6047,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:6061: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6050: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6064: \$? = $ac_status" >&5 + echo "$as_me:6053: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:6066: \"$ac_try\"") >&5 + { (eval echo "$as_me:6055: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6069: \$? = $ac_status" >&5 + echo "$as_me:6058: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -6080,7 +6069,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:6083: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:6072: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -6093,7 +6082,7 @@ cf_nculib_root=ncurses # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:6096: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:6085: 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 @@ -6101,7 +6090,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6104 "configure" +#line 6093 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6120,16 +6109,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6123: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6112: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6126: \$? = $ac_status" >&5 + echo "$as_me:6115: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6129: \"$ac_try\"") >&5 + { (eval echo "$as_me:6118: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6132: \$? = $ac_status" >&5 + echo "$as_me:6121: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -6140,10 +6129,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6143: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:6132: 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:6146: checking for initscr in -lgpm" >&5 + echo "$as_me:6135: 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 @@ -6151,7 +6140,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6154 "configure" +#line 6143 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6170,16 +6159,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6173: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6162: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6176: \$? = $ac_status" >&5 + echo "$as_me:6165: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6179: \"$ac_try\"") >&5 + { (eval echo "$as_me:6168: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6182: \$? = $ac_status" >&5 + echo "$as_me:6171: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -6190,7 +6179,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6193: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:6182: 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" @@ -6203,9 +6192,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:6208: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:6197: 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 @@ -6213,7 +6202,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6216 "configure" +#line 6205 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6232,16 +6221,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6235: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6224: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6238: \$? = $ac_status" >&5 + echo "$as_me:6227: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6241: \"$ac_try\"") >&5 + { (eval echo "$as_me:6230: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6244: \$? = $ac_status" >&5 + echo "$as_me:6233: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -6252,7 +6241,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6255: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:6244: 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" @@ -6301,13 +6290,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:6304: checking for initscr" >&5 + echo "$as_me:6293: 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 6310 "configure" +#line 6299 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -6338,16 +6327,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6341: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6330: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6344: \$? = $ac_status" >&5 + echo "$as_me:6333: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6347: \"$ac_try\"") >&5 + { (eval echo "$as_me:6336: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6350: \$? = $ac_status" >&5 + echo "$as_me:6339: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -6357,18 +6346,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:6360: result: $ac_cv_func_initscr" >&5 +echo "$as_me:6349: 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:6367: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:6356: 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 6371 "configure" +#line 6360 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6380,25 +6369,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6383: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6372: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6386: \$? = $ac_status" >&5 + echo "$as_me:6375: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6389: \"$ac_try\"") >&5 + { (eval echo "$as_me:6378: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6392: \$? = $ac_status" >&5 + echo "$as_me:6381: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:6394: result: yes" >&5 + echo "$as_me:6383: 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:6401: result: no" >&5 +echo "$as_me:6390: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -6466,11 +6455,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:6469: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:6458: 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 6473 "configure" +#line 6462 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6482,25 +6471,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6485: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6474: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6488: \$? = $ac_status" >&5 + echo "$as_me:6477: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6491: \"$ac_try\"") >&5 + { (eval echo "$as_me:6480: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6494: \$? = $ac_status" >&5 + echo "$as_me:6483: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:6496: result: yes" >&5 + echo "$as_me:6485: 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:6503: result: no" >&5 +echo "$as_me:6492: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -6515,7 +6504,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:6518: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:6507: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -6523,7 +6512,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:6526: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:6515: 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 @@ -6533,7 +6522,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 6536 "configure" +#line 6525 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6545,23 +6534,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6548: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6537: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6551: \$? = $ac_status" >&5 + echo "$as_me:6540: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6554: \"$ac_try\"") >&5 + { (eval echo "$as_me:6543: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6557: \$? = $ac_status" >&5 + echo "$as_me:6546: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:6559: result: yes" >&5 + echo "$as_me:6548: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:6564: result: no" >&5 +echo "$as_me:6553: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -6579,7 +6568,7 @@ else NCURSES_CONFIG=none fi -echo "$as_me:6582: checking if you want wide-character code" >&5 +echo "$as_me:6571: 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. @@ -6589,30 +6578,30 @@ if test "${enable_widec+set}" = set; then else with_widec=no fi; -echo "$as_me:6592: result: $with_widec" >&5 +echo "$as_me:6581: 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:6599: checking for $ac_header" >&5 +echo "$as_me:6588: 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 6605 "configure" +#line 6594 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:6609: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6598: \"$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:6615: \$? = $ac_status" >&5 + echo "$as_me:6604: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6631,7 +6620,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6634: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:6623: 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:6633: 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 @@ -6649,7 +6638,7 @@ else cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6652 "configure" +#line 6641 "configure" #include "confdefs.h" #include @@ -6667,16 +6656,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6670: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6659: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6673: \$? = $ac_status" >&5 + echo "$as_me:6662: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6676: \"$ac_try\"") >&5 + { (eval echo "$as_me:6665: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6679: \$? = $ac_status" >&5 + echo "$as_me:6668: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_utf8_lib=yes else @@ -6688,12 +6677,12 @@ cat "conftest.$ac_ext" >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:6691: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:6680: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6696 "configure" +#line 6685 "configure" #include "confdefs.h" #include @@ -6706,16 +6695,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6709: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6698: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6712: \$? = $ac_status" >&5 + echo "$as_me:6701: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6715: \"$ac_try\"") >&5 + { (eval echo "$as_me:6704: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6718: \$? = $ac_status" >&5 + echo "$as_me:6707: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -6729,7 +6718,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lutf8 $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6732 "configure" +#line 6721 "configure" #include "confdefs.h" #include @@ -6742,16 +6731,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6745: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6734: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6748: \$? = $ac_status" >&5 + echo "$as_me:6737: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6751: \"$ac_try\"") >&5 + { (eval echo "$as_me:6740: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6754: \$? = $ac_status" >&5 + echo "$as_me:6743: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -6768,9 +6757,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:6771: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:6760: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:6773: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:6762: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -6861,7 +6850,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}:6864: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:6853: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -6869,7 +6858,7 @@ echo "${as_me:-configure}:6864: testing ... testing $cf_cv_header_path_utf8 ..." CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" cat >"conftest.$ac_ext" <<_ACEOF -#line 6872 "configure" +#line 6861 "configure" #include "confdefs.h" #include @@ -6882,21 +6871,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6885: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6874: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6888: \$? = $ac_status" >&5 + echo "$as_me:6877: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6891: \"$ac_try\"") >&5 + { (eval echo "$as_me:6880: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6894: \$? = $ac_status" >&5 + echo "$as_me:6883: \$? = $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}:6899: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:6888: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -6914,7 +6903,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:6917: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:6906: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -6989,13 +6978,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}:6992: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:6981: 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 6998 "configure" +#line 6987 "configure" #include "confdefs.h" #include @@ -7008,21 +6997,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7011: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7000: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7014: \$? = $ac_status" >&5 + echo "$as_me:7003: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7017: \"$ac_try\"") >&5 + { (eval echo "$as_me:7006: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7020: \$? = $ac_status" >&5 + echo "$as_me:7009: \$? = $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}:7025: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7014: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -7064,7 +7053,7 @@ fi fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:7067: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:7056: 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 @@ -7102,7 +7091,7 @@ if test -n "$cf_cv_header_path_utf8" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 7105 "configure" +#line 7094 "configure" #include "confdefs.h" #include int @@ -7114,16 +7103,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7117: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7106: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7120: \$? = $ac_status" >&5 + echo "$as_me:7109: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7123: \"$ac_try\"") >&5 + { (eval echo "$as_me:7112: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7126: \$? = $ac_status" >&5 + echo "$as_me:7115: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -7140,7 +7129,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}:7143: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7132: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7176,7 +7165,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}:7179: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7168: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7206,13 +7195,13 @@ cf_ncuconfig_root=ncursesw cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:7209: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:7198: 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:7212: result: yes" >&5 + echo "$as_me:7201: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:7215: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:7204: 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 @@ -7345,7 +7334,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 7348 "configure" +#line 7337 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7357,37 +7346,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7360: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7349: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7363: \$? = $ac_status" >&5 + echo "$as_me:7352: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7366: \"$ac_try\"") >&5 + { (eval echo "$as_me:7355: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7369: \$? = $ac_status" >&5 + echo "$as_me:7358: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 7375 "configure" +#line 7364 "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:7382: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7371: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7385: \$? = $ac_status" >&5 + echo "$as_me:7374: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:7387: \"$ac_try\"") >&5 + { (eval echo "$as_me:7376: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7390: \$? = $ac_status" >&5 + echo "$as_me:7379: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -7420,57 +7409,36 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" 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/=.*//'` -cf_old_cflag="$CFLAGS" - -case "$CFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CFLAGS" != "$cf_old_cflag" ; -then +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_new_cflag" -fi + CFLAGS="$cf_old_cflag" +done cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` -cf_old_cflag="$CPPFLAGS" - -case "$CPPFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CPPFLAGS" != "$cf_old_cflag" ; -then - - CPPFLAGS="$cf_new_cflag" -fi +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) @@ -7563,6 +7531,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -7580,7 +7550,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 7583 "configure" +#line 7553 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7592,37 +7562,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7595: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7565: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7598: \$? = $ac_status" >&5 + echo "$as_me:7568: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7601: \"$ac_try\"") >&5 + { (eval echo "$as_me:7571: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7604: \$? = $ac_status" >&5 + echo "$as_me:7574: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 7610 "configure" +#line 7580 "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:7617: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7587: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7620: \$? = $ac_status" >&5 + echo "$as_me:7590: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:7622: \"$ac_try\"") >&5 + { (eval echo "$as_me:7592: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7625: \$? = $ac_status" >&5 + echo "$as_me:7595: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -7639,7 +7609,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:7642: result: $cf_have_ncuconfig" >&5 + echo "$as_me:7612: 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" @@ -7655,7 +7625,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:7658: checking for terminfo header" >&5 +echo "$as_me:7628: 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 @@ -7673,7 +7643,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 7676 "configure" +#line 7646 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -7688,16 +7658,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7691: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7661: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7694: \$? = $ac_status" >&5 + echo "$as_me:7664: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7697: \"$ac_try\"") >&5 + { (eval echo "$as_me:7667: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7700: \$? = $ac_status" >&5 + echo "$as_me:7670: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -7713,7 +7683,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:7716: result: $cf_cv_term_header" >&5 +echo "$as_me:7686: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -7748,7 +7718,7 @@ esac fi else - echo "$as_me:7751: result: no" >&5 + echo "$as_me:7721: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -7764,7 +7734,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:7767: checking for $ac_word" >&5 +echo "$as_me:7737: 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 @@ -7779,7 +7749,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:7782: found $ac_dir/$ac_word" >&5 +echo "$as_me:7752: found $ac_dir/$ac_word" >&5 break done @@ -7787,10 +7757,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:7790: result: $NCURSES_CONFIG" >&5 + echo "$as_me:7760: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:7793: result: no" >&5 + echo "$as_me:7763: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7803,7 +7773,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:7806: checking for $ac_word" >&5 +echo "$as_me:7776: 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 @@ -7818,7 +7788,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:7821: found $ac_dir/$ac_word" >&5 +echo "$as_me:7791: found $ac_dir/$ac_word" >&5 break done @@ -7826,10 +7796,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:7829: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:7799: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:7832: result: no" >&5 + echo "$as_me:7802: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7844,57 +7814,36 @@ fi 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/=.*//'` -cf_old_cflag="$CFLAGS" - -case "$CFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CFLAGS" != "$cf_old_cflag" ; -then +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_new_cflag" -fi + CFLAGS="$cf_old_cflag" +done cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` -cf_old_cflag="$CPPFLAGS" - -case "$CPPFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CPPFLAGS" != "$cf_old_cflag" ; -then - - CPPFLAGS="$cf_new_cflag" -fi +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) @@ -7987,6 +7936,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -8005,7 +7956,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:8008: checking if we have identified curses headers" >&5 +echo "$as_me:7959: 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 @@ -8017,7 +7968,7 @@ for cf_header in \ curses.h ncursesw/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 8020 "configure" +#line 7971 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -8029,16 +7980,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8032: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7983: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8035: \$? = $ac_status" >&5 + echo "$as_me:7986: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8038: \"$ac_try\"") >&5 + { (eval echo "$as_me:7989: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8041: \$? = $ac_status" >&5 + echo "$as_me:7992: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -8049,11 +8000,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8052: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:8003: 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:8056: error: No curses header-files found" >&5 + { { echo "$as_me:8007: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -8063,23 +8014,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:8066: checking for $ac_header" >&5 +echo "$as_me:8017: 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 8072 "configure" +#line 8023 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:8076: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:8027: \"$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:8082: \$? = $ac_status" >&5 + echo "$as_me:8033: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -8098,7 +8049,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:8101: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:8052: 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 8157 "configure" +#line 8108 "configure" #include "confdefs.h" #include int @@ -8166,16 +8117,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8169: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8120: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8172: \$? = $ac_status" >&5 + echo "$as_me:8123: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8175: \"$ac_try\"") >&5 + { (eval echo "$as_me:8126: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8178: \$? = $ac_status" >&5 + echo "$as_me:8129: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8192,7 +8143,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}:8195: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8146: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8211,7 +8162,7 @@ fi } -echo "$as_me:8214: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:8165: 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 @@ -8223,7 +8174,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 8226 "configure" +#line 8177 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -8255,16 +8206,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8258: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8209: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8261: \$? = $ac_status" >&5 + echo "$as_me:8212: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8264: \"$ac_try\"") >&5 + { (eval echo "$as_me:8215: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8267: \$? = $ac_status" >&5 + echo "$as_me:8218: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -8279,14 +8230,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8282: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:8233: 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:8289: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:8240: 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 @@ -8407,7 +8358,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 8410 "configure" +#line 8361 "configure" #include "confdefs.h" #include int @@ -8419,16 +8370,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8422: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8373: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8425: \$? = $ac_status" >&5 + echo "$as_me:8376: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8428: \"$ac_try\"") >&5 + { (eval echo "$as_me:8379: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8431: \$? = $ac_status" >&5 + echo "$as_me:8382: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8445,7 +8396,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}:8448: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8399: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8468,7 +8419,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 8471 "configure" +#line 8422 "configure" #include "confdefs.h" #include <$cf_header> @@ -8492,16 +8443,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8495: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8446: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8498: \$? = $ac_status" >&5 + echo "$as_me:8449: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8501: \"$ac_try\"") >&5 + { (eval echo "$as_me:8452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8504: \$? = $ac_status" >&5 + echo "$as_me:8455: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -8522,12 +8473,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:8525: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8476: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:8530: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:8481: 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%/[^/]*$%%'` @@ -8563,7 +8514,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 8566 "configure" +#line 8517 "configure" #include "confdefs.h" #include int @@ -8575,16 +8526,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8578: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8529: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8581: \$? = $ac_status" >&5 + echo "$as_me:8532: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8584: \"$ac_try\"") >&5 + { (eval echo "$as_me:8535: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8587: \$? = $ac_status" >&5 + echo "$as_me:8538: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8601,7 +8552,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}:8604: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8555: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8649,7 +8600,7 @@ EOF ;; esac -echo "$as_me:8652: checking for terminfo header" >&5 +echo "$as_me:8603: 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 @@ -8667,7 +8618,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 8670 "configure" +#line 8621 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -8682,16 +8633,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8685: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8636: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8688: \$? = $ac_status" >&5 + echo "$as_me:8639: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8691: \"$ac_try\"") >&5 + { (eval echo "$as_me:8642: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8694: \$? = $ac_status" >&5 + echo "$as_me:8645: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -8707,7 +8658,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8710: result: $cf_cv_term_header" >&5 +echo "$as_me:8661: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -8745,7 +8696,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:8748: checking for ncurses version" >&5 +echo "$as_me:8699: 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 @@ -8771,10 +8722,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:8774: \"$cf_try\"") >&5 + { (eval echo "$as_me:8725: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:8777: \$? = $ac_status" >&5 + echo "$as_me:8728: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -8784,7 +8735,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 8787 "configure" +#line 8738 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -8809,15 +8760,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:8812: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8763: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8815: \$? = $ac_status" >&5 + echo "$as_me:8766: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:8817: \"$ac_try\"") >&5 + { (eval echo "$as_me:8768: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8820: \$? = $ac_status" >&5 + echo "$as_me:8771: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -8831,7 +8782,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:8834: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:8785: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -8844,7 +8795,7 @@ cf_nculib_root=ncursesw # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:8847: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:8798: 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 @@ -8852,7 +8803,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 8855 "configure" +#line 8806 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8871,16 +8822,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8874: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8825: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8877: \$? = $ac_status" >&5 + echo "$as_me:8828: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8880: \"$ac_try\"") >&5 + { (eval echo "$as_me:8831: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8883: \$? = $ac_status" >&5 + echo "$as_me:8834: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -8891,10 +8842,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8894: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:8845: 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:8897: checking for initscr in -lgpm" >&5 + echo "$as_me:8848: 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 @@ -8902,7 +8853,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 8905 "configure" +#line 8856 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8921,16 +8872,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8924: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8875: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8927: \$? = $ac_status" >&5 + echo "$as_me:8878: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8930: \"$ac_try\"") >&5 + { (eval echo "$as_me:8881: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8933: \$? = $ac_status" >&5 + echo "$as_me:8884: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -8941,7 +8892,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8944: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:8895: 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" @@ -8954,9 +8905,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:8959: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:8910: 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 @@ -8964,7 +8915,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 8967 "configure" +#line 8918 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8983,16 +8934,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8986: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8937: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8989: \$? = $ac_status" >&5 + echo "$as_me:8940: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8992: \"$ac_try\"") >&5 + { (eval echo "$as_me:8943: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8995: \$? = $ac_status" >&5 + echo "$as_me:8946: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -9003,7 +8954,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9006: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:8957: 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" @@ -9052,13 +9003,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:9055: checking for initscr" >&5 + echo "$as_me:9006: 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 9061 "configure" +#line 9012 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -9089,16 +9040,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9092: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9043: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9095: \$? = $ac_status" >&5 + echo "$as_me:9046: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9098: \"$ac_try\"") >&5 + { (eval echo "$as_me:9049: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9101: \$? = $ac_status" >&5 + echo "$as_me:9052: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -9108,18 +9059,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:9111: result: $ac_cv_func_initscr" >&5 +echo "$as_me:9062: 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:9118: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:9069: 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 9122 "configure" +#line 9073 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9131,25 +9082,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9134: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9085: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9137: \$? = $ac_status" >&5 + echo "$as_me:9088: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9140: \"$ac_try\"") >&5 + { (eval echo "$as_me:9091: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9143: \$? = $ac_status" >&5 + echo "$as_me:9094: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:9145: result: yes" >&5 + echo "$as_me:9096: 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:9152: result: no" >&5 +echo "$as_me:9103: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -9217,11 +9168,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:9220: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:9171: 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 9224 "configure" +#line 9175 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9233,25 +9184,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9236: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9187: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9239: \$? = $ac_status" >&5 + echo "$as_me:9190: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9242: \"$ac_try\"") >&5 + { (eval echo "$as_me:9193: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9245: \$? = $ac_status" >&5 + echo "$as_me:9196: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:9247: result: yes" >&5 + echo "$as_me:9198: 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:9254: result: no" >&5 +echo "$as_me:9205: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -9266,7 +9217,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:9269: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:9220: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -9274,7 +9225,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:9277: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:9228: 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 @@ -9284,7 +9235,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 9287 "configure" +#line 9238 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9296,23 +9247,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9299: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9250: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9302: \$? = $ac_status" >&5 + echo "$as_me:9253: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9305: \"$ac_try\"") >&5 + { (eval echo "$as_me:9256: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9308: \$? = $ac_status" >&5 + echo "$as_me:9259: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:9310: result: yes" >&5 + echo "$as_me:9261: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:9315: result: no" >&5 +echo "$as_me:9266: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -9336,13 +9287,13 @@ cf_ncuconfig_root=ncurses cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:9339: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:9290: 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:9342: result: yes" >&5 + echo "$as_me:9293: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:9345: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:9296: 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 @@ -9475,7 +9426,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 9478 "configure" +#line 9429 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9487,37 +9438,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:9441: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9493: \$? = $ac_status" >&5 + echo "$as_me:9444: \$? = $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:9447: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9499: \$? = $ac_status" >&5 + echo "$as_me:9450: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 9505 "configure" +#line 9456 "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:9463: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9515: \$? = $ac_status" >&5 + echo "$as_me:9466: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:9517: \"$ac_try\"") >&5 + { (eval echo "$as_me:9468: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9520: \$? = $ac_status" >&5 + echo "$as_me:9471: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -9550,57 +9501,36 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" 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/=.*//'` -cf_old_cflag="$CFLAGS" - -case "$CFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CFLAGS" != "$cf_old_cflag" ; -then +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_new_cflag" -fi + CFLAGS="$cf_old_cflag" +done cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` -cf_old_cflag="$CPPFLAGS" - -case "$CPPFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CPPFLAGS" != "$cf_old_cflag" ; -then - - CPPFLAGS="$cf_new_cflag" -fi +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) @@ -9693,6 +9623,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -9710,7 +9642,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 9713 "configure" +#line 9645 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9722,37 +9654,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9725: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9657: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9728: \$? = $ac_status" >&5 + echo "$as_me:9660: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9731: \"$ac_try\"") >&5 + { (eval echo "$as_me:9663: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9734: \$? = $ac_status" >&5 + echo "$as_me:9666: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 9740 "configure" +#line 9672 "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:9747: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9679: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9750: \$? = $ac_status" >&5 + echo "$as_me:9682: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:9752: \"$ac_try\"") >&5 + { (eval echo "$as_me:9684: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9755: \$? = $ac_status" >&5 + echo "$as_me:9687: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -9769,7 +9701,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:9772: result: $cf_have_ncuconfig" >&5 + echo "$as_me:9704: 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" @@ -9785,7 +9717,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:9788: checking for terminfo header" >&5 +echo "$as_me:9720: 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 @@ -9803,7 +9735,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 9806 "configure" +#line 9738 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -9818,16 +9750,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9821: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9753: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9824: \$? = $ac_status" >&5 + echo "$as_me:9756: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9827: \"$ac_try\"") >&5 + { (eval echo "$as_me:9759: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9830: \$? = $ac_status" >&5 + echo "$as_me:9762: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -9843,7 +9775,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:9846: result: $cf_cv_term_header" >&5 +echo "$as_me:9778: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -9878,7 +9810,7 @@ esac fi else - echo "$as_me:9881: result: no" >&5 + echo "$as_me:9813: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -9894,7 +9826,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:9897: checking for $ac_word" >&5 +echo "$as_me:9829: 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 @@ -9909,7 +9841,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:9912: found $ac_dir/$ac_word" >&5 +echo "$as_me:9844: found $ac_dir/$ac_word" >&5 break done @@ -9917,10 +9849,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:9920: result: $NCURSES_CONFIG" >&5 + echo "$as_me:9852: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:9923: result: no" >&5 + echo "$as_me:9855: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9933,7 +9865,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:9936: checking for $ac_word" >&5 +echo "$as_me:9868: 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 @@ -9948,7 +9880,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:9951: found $ac_dir/$ac_word" >&5 +echo "$as_me:9883: found $ac_dir/$ac_word" >&5 break done @@ -9956,10 +9888,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:9959: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:9891: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:9962: result: no" >&5 + echo "$as_me:9894: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9974,57 +9906,36 @@ fi 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/=.*//'` -cf_old_cflag="$CFLAGS" - -case "$CFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CFLAGS" != "$cf_old_cflag" ; -then +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_new_cflag" -fi + CFLAGS="$cf_old_cflag" +done cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` -cf_old_cflag="$CPPFLAGS" - -case "$CPPFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CPPFLAGS" != "$cf_old_cflag" ; -then - - CPPFLAGS="$cf_new_cflag" -fi +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) @@ -10117,6 +10028,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -10135,7 +10048,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:10138: checking if we have identified curses headers" >&5 +echo "$as_me:10051: 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 @@ -10147,7 +10060,7 @@ for cf_header in \ curses.h ncurses/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 10150 "configure" +#line 10063 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -10159,16 +10072,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10162: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10075: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10165: \$? = $ac_status" >&5 + echo "$as_me:10078: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10168: \"$ac_try\"") >&5 + { (eval echo "$as_me:10081: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10171: \$? = $ac_status" >&5 + echo "$as_me:10084: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -10179,11 +10092,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:10182: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:10095: 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:10186: error: No curses header-files found" >&5 + { { echo "$as_me:10099: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -10193,23 +10106,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:10196: checking for $ac_header" >&5 +echo "$as_me:10109: 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 10202 "configure" +#line 10115 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:10206: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:10119: \"$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:10212: \$? = $ac_status" >&5 + echo "$as_me:10125: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -10228,7 +10141,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:10231: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:10144: 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 10287 "configure" +#line 10200 "configure" #include "confdefs.h" #include int @@ -10296,16 +10209,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10299: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10212: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10302: \$? = $ac_status" >&5 + echo "$as_me:10215: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10305: \"$ac_try\"") >&5 + { (eval echo "$as_me:10218: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10308: \$? = $ac_status" >&5 + echo "$as_me:10221: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -10322,7 +10235,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}:10325: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10238: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10341,7 +10254,7 @@ fi } -echo "$as_me:10344: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:10257: 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 @@ -10353,7 +10266,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 10356 "configure" +#line 10269 "configure" #include "confdefs.h" #include <$cf_header> @@ -10377,16 +10290,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10380: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10293: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10383: \$? = $ac_status" >&5 + echo "$as_me:10296: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10386: \"$ac_try\"") >&5 + { (eval echo "$as_me:10299: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10389: \$? = $ac_status" >&5 + echo "$as_me:10302: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -10401,14 +10314,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:10404: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:10317: 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:10411: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:10324: 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 @@ -10529,7 +10442,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 10532 "configure" +#line 10445 "configure" #include "confdefs.h" #include int @@ -10541,16 +10454,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10544: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10457: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10547: \$? = $ac_status" >&5 + echo "$as_me:10460: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10550: \"$ac_try\"") >&5 + { (eval echo "$as_me:10463: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10553: \$? = $ac_status" >&5 + echo "$as_me:10466: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -10567,7 +10480,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}:10570: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10483: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10590,7 +10503,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 10593 "configure" +#line 10506 "configure" #include "confdefs.h" #include <$cf_header> @@ -10614,16 +10527,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10617: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10530: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10620: \$? = $ac_status" >&5 + echo "$as_me:10533: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10623: \"$ac_try\"") >&5 + { (eval echo "$as_me:10536: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10626: \$? = $ac_status" >&5 + echo "$as_me:10539: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -10644,12 +10557,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:10647: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10560: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:10652: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:10565: 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%/[^/]*$%%'` @@ -10685,7 +10598,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 10688 "configure" +#line 10601 "configure" #include "confdefs.h" #include int @@ -10697,16 +10610,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10700: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10613: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10703: \$? = $ac_status" >&5 + echo "$as_me:10616: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10706: \"$ac_try\"") >&5 + { (eval echo "$as_me:10619: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10709: \$? = $ac_status" >&5 + echo "$as_me:10622: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -10723,7 +10636,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}:10726: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10639: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10771,7 +10684,7 @@ EOF ;; esac -echo "$as_me:10774: checking for terminfo header" >&5 +echo "$as_me:10687: 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 @@ -10789,7 +10702,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 10792 "configure" +#line 10705 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -10804,16 +10717,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10807: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10720: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10810: \$? = $ac_status" >&5 + echo "$as_me:10723: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10813: \"$ac_try\"") >&5 + { (eval echo "$as_me:10726: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10816: \$? = $ac_status" >&5 + echo "$as_me:10729: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -10829,7 +10742,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:10832: result: $cf_cv_term_header" >&5 +echo "$as_me:10745: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -10867,7 +10780,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:10870: checking for ncurses version" >&5 +echo "$as_me:10783: 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 @@ -10893,10 +10806,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:10896: \"$cf_try\"") >&5 + { (eval echo "$as_me:10809: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:10899: \$? = $ac_status" >&5 + echo "$as_me:10812: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -10906,7 +10819,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 10909 "configure" +#line 10822 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -10931,15 +10844,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:10934: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10847: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10937: \$? = $ac_status" >&5 + echo "$as_me:10850: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:10939: \"$ac_try\"") >&5 + { (eval echo "$as_me:10852: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10942: \$? = $ac_status" >&5 + echo "$as_me:10855: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -10953,7 +10866,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:10956: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:10869: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -10966,7 +10879,7 @@ cf_nculib_root=ncurses # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:10969: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:10882: 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 @@ -10974,7 +10887,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10977 "configure" +#line 10890 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10993,16 +10906,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10996: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10909: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10999: \$? = $ac_status" >&5 + echo "$as_me:10912: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11002: \"$ac_try\"") >&5 + { (eval echo "$as_me:10915: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11005: \$? = $ac_status" >&5 + echo "$as_me:10918: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -11013,10 +10926,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11016: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:10929: 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:11019: checking for initscr in -lgpm" >&5 + echo "$as_me:10932: 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 @@ -11024,7 +10937,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11027 "configure" +#line 10940 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11043,16 +10956,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11046: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10959: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11049: \$? = $ac_status" >&5 + echo "$as_me:10962: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11052: \"$ac_try\"") >&5 + { (eval echo "$as_me:10965: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11055: \$? = $ac_status" >&5 + echo "$as_me:10968: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -11063,7 +10976,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11066: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:10979: 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" @@ -11076,9 +10989,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:11081: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:10994: 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 @@ -11086,7 +10999,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11089 "configure" +#line 11002 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11105,16 +11018,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11108: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11021: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11111: \$? = $ac_status" >&5 + echo "$as_me:11024: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11114: \"$ac_try\"") >&5 + { (eval echo "$as_me:11027: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11117: \$? = $ac_status" >&5 + echo "$as_me:11030: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -11125,7 +11038,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11128: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:11041: 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" @@ -11174,13 +11087,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:11177: checking for initscr" >&5 + echo "$as_me:11090: 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 11183 "configure" +#line 11096 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -11211,16 +11124,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11214: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11127: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11217: \$? = $ac_status" >&5 + echo "$as_me:11130: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11220: \"$ac_try\"") >&5 + { (eval echo "$as_me:11133: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11223: \$? = $ac_status" >&5 + echo "$as_me:11136: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -11230,18 +11143,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:11233: result: $ac_cv_func_initscr" >&5 +echo "$as_me:11146: 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:11240: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:11153: 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 11244 "configure" +#line 11157 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11253,25 +11166,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11256: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11169: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11259: \$? = $ac_status" >&5 + echo "$as_me:11172: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11262: \"$ac_try\"") >&5 + { (eval echo "$as_me:11175: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11265: \$? = $ac_status" >&5 + echo "$as_me:11178: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:11267: result: yes" >&5 + echo "$as_me:11180: 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:11274: result: no" >&5 +echo "$as_me:11187: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -11339,11 +11252,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:11342: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:11255: 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 11346 "configure" +#line 11259 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11355,25 +11268,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11358: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11271: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11361: \$? = $ac_status" >&5 + echo "$as_me:11274: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11364: \"$ac_try\"") >&5 + { (eval echo "$as_me:11277: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11367: \$? = $ac_status" >&5 + echo "$as_me:11280: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:11369: result: yes" >&5 + echo "$as_me:11282: 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:11376: result: no" >&5 +echo "$as_me:11289: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -11388,7 +11301,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:11391: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:11304: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -11396,7 +11309,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:11399: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:11312: 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 @@ -11406,7 +11319,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 11409 "configure" +#line 11322 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11418,23 +11331,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11421: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11334: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11424: \$? = $ac_status" >&5 + echo "$as_me:11337: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11427: \"$ac_try\"") >&5 + { (eval echo "$as_me:11340: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11430: \$? = $ac_status" >&5 + echo "$as_me:11343: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:11432: result: yes" >&5 + echo "$as_me:11345: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:11437: result: no" >&5 +echo "$as_me:11350: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -11487,10 +11400,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:11490: \"$cf_try\"") >&5 + { (eval echo "$as_me:11403: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:11493: \$? = $ac_status" >&5 + echo "$as_me:11406: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ ][ ]*//" conftest.out` @@ -11508,10 +11421,10 @@ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} cf_cv_timestamp=`date` -echo "$as_me:11511: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 +echo "$as_me:11424: 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:11514: checking if you want to have a library-prefix" >&5 +echo "$as_me:11427: 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. @@ -11521,7 +11434,7 @@ if test "${with_lib_prefix+set}" = set; then else with_lib_prefix=auto fi; -echo "$as_me:11524: result: $with_lib_prefix" >&5 +echo "$as_me:11437: result: $with_lib_prefix" >&5 echo "${ECHO_T}$with_lib_prefix" >&6 if test "$with_lib_prefix" = auto @@ -11559,7 +11472,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:11562: checking for default loader flags" >&5 +echo "$as_me:11475: 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='' ;; @@ -11567,13 +11480,13 @@ case $DFT_LWR_MODEL in (profile) LD_MODEL='-pg';; (shared) LD_MODEL='' ;; esac -echo "$as_me:11570: result: $LD_MODEL" >&5 +echo "$as_me:11483: 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:11576: checking for an rpath option" >&5 + echo "$as_me:11489: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case "$cf_cv_system_name" in (irix*) @@ -11604,12 +11517,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 (*) ;; esac - echo "$as_me:11607: result: $LD_RPATH_OPT" >&5 + echo "$as_me:11520: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:11612: checking if we need a space after rpath option" >&5 + echo "$as_me:11525: 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" @@ -11630,7 +11543,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 11633 "configure" +#line 11546 "configure" #include "confdefs.h" int @@ -11642,16 +11555,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11645: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11558: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11648: \$? = $ac_status" >&5 + echo "$as_me:11561: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11651: \"$ac_try\"") >&5 + { (eval echo "$as_me:11564: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11654: \$? = $ac_status" >&5 + echo "$as_me:11567: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_space=no else @@ -11661,7 +11574,7 @@ cf_rpath_space=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:11664: result: $cf_rpath_space" >&5 + echo "$as_me:11577: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; @@ -11683,7 +11596,7 @@ fi cf_ld_rpath_opt= test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - echo "$as_me:11686: checking if release/abi version should be used for shared libs" >&5 + echo "$as_me:11599: 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. @@ -11698,9 +11611,9 @@ if test "${with_shlib_version+set}" = set; then cf_cv_shlib_version=$withval ;; (*) - echo "$as_me:11701: result: $withval" >&5 + echo "$as_me:11614: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 - { { echo "$as_me:11703: error: option value must be one of: rel, abi, or auto" >&5 + { { echo "$as_me:11616: 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; }; } ;; @@ -11709,7 +11622,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:11712: result: $cf_cv_shlib_version" >&5 + echo "$as_me:11625: result: $cf_cv_shlib_version" >&5 echo "${ECHO_T}$cf_cv_shlib_version" >&6 cf_cv_rm_so_locs=no @@ -11732,14 +11645,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 if test "$cf_try_fPIC" = yes then - echo "$as_me:11735: checking which $CC option to use" >&5 + echo "$as_me:11648: 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 11742 "configure" +#line 11655 "configure" #include "confdefs.h" #include int @@ -11751,16 +11664,16 @@ int x = 1 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11754: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11667: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11757: \$? = $ac_status" >&5 + echo "$as_me:11670: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11760: \"$ac_try\"") >&5 + { (eval echo "$as_me:11673: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11763: \$? = $ac_status" >&5 + echo "$as_me:11676: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -11769,7 +11682,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" done - echo "$as_me:11772: result: $CC_SHARED_OPTS" >&5 + echo "$as_me:11685: result: $CC_SHARED_OPTS" >&5 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 CFLAGS="$cf_save_CFLAGS" fi @@ -11840,7 +11753,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:11843: checking if ld -search_paths_first works" >&5 + echo "$as_me:11756: 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 @@ -11849,7 +11762,7 @@ else cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" cat >"conftest.$ac_ext" <<_ACEOF -#line 11852 "configure" +#line 11765 "configure" #include "confdefs.h" int @@ -11861,16 +11774,16 @@ int i; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11864: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11777: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11867: \$? = $ac_status" >&5 + echo "$as_me:11780: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11870: \"$ac_try\"") >&5 + { (eval echo "$as_me:11783: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11873: \$? = $ac_status" >&5 + echo "$as_me:11786: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ldflags_search_paths_first=yes else @@ -11881,7 +11794,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LDFLAGS=$cf_save_LDFLAGS fi -echo "$as_me:11884: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "$as_me:11797: 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" @@ -12231,7 +12144,7 @@ CF_EOF do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12234 "configure" +#line 12147 "configure" #include "confdefs.h" #include int @@ -12243,16 +12156,16 @@ printf("Hello\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12246: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12159: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12249: \$? = $ac_status" >&5 + echo "$as_me:12162: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12252: \"$ac_try\"") >&5 + { (eval echo "$as_me:12165: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12255: \$? = $ac_status" >&5 + echo "$as_me:12168: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -12289,7 +12202,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes ;; (*) - { echo "$as_me:12292: WARNING: ignored --with-shlib-version" >&5 + { echo "$as_me:12205: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac @@ -12299,7 +12212,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[]) { @@ -12311,18 +12224,18 @@ EOF for cf_opt in $cf_try_cflags do CFLAGS="$cf_save_CFLAGS -$cf_opt" - echo "$as_me:12314: checking if CFLAGS option -$cf_opt works" >&5 + echo "$as_me:12227: 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:12316: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:12229: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12319: \$? = $ac_status" >&5 + echo "$as_me:12232: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - echo "$as_me:12321: result: yes" >&5 + echo "$as_me:12234: result: yes" >&5 echo "${ECHO_T}yes" >&6 cf_save_CFLAGS="$CFLAGS" else - echo "$as_me:12325: result: no" >&5 + echo "$as_me:12238: result: no" >&5 echo "${ECHO_T}no" >&6 fi done @@ -12337,17 +12250,17 @@ echo "${ECHO_T}no" >&6 test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 -echo "${as_me:-configure}:12340: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 +echo "${as_me:-configure}:12253: 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}:12344: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:12257: 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:12350: checking if you want to link sample programs with rpath option" >&5 + echo "$as_me:12263: 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. @@ -12357,7 +12270,7 @@ if test "${enable_rpath_link+set}" = set; then else with_rpath_link=yes fi; - echo "$as_me:12360: result: $with_rpath_link" >&5 + echo "$as_me:12273: result: $with_rpath_link" >&5 echo "${ECHO_T}$with_rpath_link" >&6 if test "$with_rpath_link" = no then @@ -12370,7 +12283,7 @@ fi ### use option --enable-broken-linker to force on use of broken-linker support -echo "$as_me:12373: checking if you want broken-linker support code" >&5 +echo "$as_me:12286: 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. @@ -12380,7 +12293,7 @@ if test "${enable_broken_linker+set}" = set; then else with_broken_linker=no fi; -echo "$as_me:12383: result: $with_broken_linker" >&5 +echo "$as_me:12296: result: $with_broken_linker" >&5 echo "${ECHO_T}$with_broken_linker" >&6 : "${BROKEN_LINKER:=0}" @@ -12395,14 +12308,14 @@ fi # Check to define _XOPEN_SOURCE "automatically" -echo "$as_me:12398: checking if the POSIX test-macros are already defined" >&5 +echo "$as_me:12311: 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 12405 "configure" +#line 12318 "configure" #include "confdefs.h" #include int @@ -12421,16 +12334,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12424: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12337: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12427: \$? = $ac_status" >&5 + echo "$as_me:12340: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12430: \"$ac_try\"") >&5 + { (eval echo "$as_me:12343: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12433: \$? = $ac_status" >&5 + echo "$as_me:12346: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_visible=no else @@ -12441,7 +12354,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12444: result: $cf_cv_posix_visible" >&5 +echo "$as_me:12357: result: $cf_cv_posix_visible" >&5 echo "${ECHO_T}$cf_cv_posix_visible" >&6 if test "$cf_cv_posix_visible" = no; then @@ -12486,14 +12399,14 @@ case "$host_os" in cf_gnu_xopen_source=$cf_XOPEN_SOURCE -echo "$as_me:12489: checking if this is the GNU C library" >&5 +echo "$as_me:12402: 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 12496 "configure" +#line 12409 "configure" #include "confdefs.h" #include int @@ -12512,16 +12425,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12515: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12428: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12518: \$? = $ac_status" >&5 + echo "$as_me:12431: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12521: \"$ac_try\"") >&5 + { (eval echo "$as_me:12434: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12524: \$? = $ac_status" >&5 + echo "$as_me:12437: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library=yes else @@ -12532,7 +12445,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12535: result: $cf_cv_gnu_library" >&5 +echo "$as_me:12448: result: $cf_cv_gnu_library" >&5 echo "${ECHO_T}$cf_cv_gnu_library" >&6 if test x$cf_cv_gnu_library = xyes; then @@ -12540,7 +12453,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:12543: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo "$as_me:12456: 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 @@ -12552,7 +12465,7 @@ else CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 12555 "configure" +#line 12468 "configure" #include "confdefs.h" #include int @@ -12571,16 +12484,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12574: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12487: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12577: \$? = $ac_status" >&5 + echo "$as_me:12490: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12580: \"$ac_try\"") >&5 + { (eval echo "$as_me:12493: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12583: \$? = $ac_status" >&5 + echo "$as_me:12496: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library_219=yes else @@ -12592,12 +12505,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save" fi -echo "$as_me:12595: result: $cf_cv_gnu_library_219" >&5 +echo "$as_me:12508: 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:12600: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo "$as_me:12513: 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 @@ -12702,7 +12615,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 12705 "configure" +#line 12618 "configure" #include "confdefs.h" #include @@ -12722,16 +12635,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12725: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12638: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12728: \$? = $ac_status" >&5 + echo "$as_me:12641: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12731: \"$ac_try\"") >&5 + { (eval echo "$as_me:12644: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12734: \$? = $ac_status" >&5 + echo "$as_me:12647: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_dftsrc_219=yes else @@ -12742,7 +12655,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12745: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "$as_me:12658: 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 @@ -12751,14 +12664,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 if test "x$cf_cv_gnu_dftsrc_219" != xyes; then - echo "$as_me:12754: checking if we must define _GNU_SOURCE" >&5 + echo "$as_me:12667: 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 12761 "configure" +#line 12674 "configure" #include "confdefs.h" #include int @@ -12773,16 +12686,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12776: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12689: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12779: \$? = $ac_status" >&5 + echo "$as_me:12692: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12782: \"$ac_try\"") >&5 + { (eval echo "$as_me:12695: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12785: \$? = $ac_status" >&5 + echo "$as_me:12698: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -12889,7 +12802,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 12892 "configure" +#line 12805 "configure" #include "confdefs.h" #include int @@ -12904,16 +12817,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12907: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12820: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12910: \$? = $ac_status" >&5 + echo "$as_me:12823: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12913: \"$ac_try\"") >&5 + { (eval echo "$as_me:12826: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12916: \$? = $ac_status" >&5 + echo "$as_me:12829: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -12928,12 +12841,12 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12931: result: $cf_cv_gnu_source" >&5 +echo "$as_me:12844: 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:12936: checking if we should also define _DEFAULT_SOURCE" >&5 + echo "$as_me:12849: 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 @@ -12943,7 +12856,7 @@ else CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 12946 "configure" +#line 12859 "configure" #include "confdefs.h" #include int @@ -12958,16 +12871,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12961: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12874: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12964: \$? = $ac_status" >&5 + echo "$as_me:12877: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12967: \"$ac_try\"") >&5 + { (eval echo "$as_me:12880: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12970: \$? = $ac_status" >&5 + echo "$as_me:12883: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_default_source=no else @@ -12978,7 +12891,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12981: result: $cf_cv_default_source" >&5 +echo "$as_me:12894: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 if test "$cf_cv_default_source" = yes then @@ -13015,16 +12928,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:13018: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:12931: 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}:13024: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:12937: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13027 "configure" +#line 12940 "configure" #include "confdefs.h" #include int @@ -13039,16 +12952,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13042: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12955: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13045: \$? = $ac_status" >&5 + echo "$as_me:12958: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13048: \"$ac_try\"") >&5 + { (eval echo "$as_me:12961: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13051: \$? = $ac_status" >&5 + echo "$as_me:12964: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -13069,7 +12982,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 13072 "configure" +#line 12985 "configure" #include "confdefs.h" #include int @@ -13084,16 +12997,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13087: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13000: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13090: \$? = $ac_status" >&5 + echo "$as_me:13003: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13093: \"$ac_try\"") >&5 + { (eval echo "$as_me:13006: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13096: \$? = $ac_status" >&5 + echo "$as_me:13009: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13104,7 +13017,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:13107: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:13020: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -13112,10 +13025,10 @@ echo "${as_me:-configure}:13107: testing ifdef from value $cf_POSIX_C_SOURCE ... test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:13115: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:13028: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13118 "configure" +#line 13031 "configure" #include "confdefs.h" #include int @@ -13130,16 +13043,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13133: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13046: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13136: \$? = $ac_status" >&5 + echo "$as_me:13049: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13139: \"$ac_try\"") >&5 + { (eval echo "$as_me:13052: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13142: \$? = $ac_status" >&5 + echo "$as_me:13055: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13155,7 +13068,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13158: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:13071: 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 @@ -13272,7 +13185,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:13275: WARNING: this system does not provide usable locale support" >&5 + { echo "$as_me:13188: 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 @@ -13304,14 +13217,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} ;; (*) -echo "$as_me:13307: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:13220: 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 13314 "configure" +#line 13227 "configure" #include "confdefs.h" #include @@ -13330,16 +13243,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13333: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13246: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13336: \$? = $ac_status" >&5 + echo "$as_me:13249: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13339: \"$ac_try\"") >&5 + { (eval echo "$as_me:13252: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13342: \$? = $ac_status" >&5 + echo "$as_me:13255: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -13351,7 +13264,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 13354 "configure" +#line 13267 "configure" #include "confdefs.h" #include @@ -13370,16 +13283,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13373: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13286: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13376: \$? = $ac_status" >&5 + echo "$as_me:13289: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13379: \"$ac_try\"") >&5 + { (eval echo "$as_me:13292: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13382: \$? = $ac_status" >&5 + echo "$as_me:13295: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -13394,7 +13307,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13397: result: $cf_cv_xopen_source" >&5 +echo "$as_me:13310: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -13411,57 +13324,36 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ 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/=.*//'` -cf_old_cflag="$CFLAGS" - -case "$CFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CFLAGS" != "$cf_old_cflag" ; -then +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_new_cflag" -fi + CFLAGS="$cf_old_cflag" +done cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` -cf_old_cflag="$CPPFLAGS" - -case "$CPPFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CPPFLAGS" != "$cf_old_cflag" ; -then - - CPPFLAGS="$cf_new_cflag" -fi +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) @@ -13554,6 +13446,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + fi if test "$cf_cv_posix_visible" = no; then @@ -13571,16 +13465,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:13574: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:13468: 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}:13580: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:13474: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13583 "configure" +#line 13477 "configure" #include "confdefs.h" #include int @@ -13595,16 +13489,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13598: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13492: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13601: \$? = $ac_status" >&5 + echo "$as_me:13495: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13604: \"$ac_try\"") >&5 + { (eval echo "$as_me:13498: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13607: \$? = $ac_status" >&5 + echo "$as_me:13501: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -13625,7 +13519,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 13628 "configure" +#line 13522 "configure" #include "confdefs.h" #include int @@ -13640,16 +13534,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13643: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13537: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13646: \$? = $ac_status" >&5 + echo "$as_me:13540: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13649: \"$ac_try\"") >&5 + { (eval echo "$as_me:13543: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13652: \$? = $ac_status" >&5 + echo "$as_me:13546: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13660,7 +13554,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:13663: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:13557: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -13668,10 +13562,10 @@ echo "${as_me:-configure}:13663: testing ifdef from value $cf_POSIX_C_SOURCE ... test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:13671: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:13565: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13674 "configure" +#line 13568 "configure" #include "confdefs.h" #include int @@ -13686,16 +13580,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13689: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13583: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13692: \$? = $ac_status" >&5 + echo "$as_me:13586: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13695: \"$ac_try\"") >&5 + { (eval echo "$as_me:13589: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13698: \$? = $ac_status" >&5 + echo "$as_me:13592: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13711,7 +13605,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13714: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:13608: 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 @@ -13827,63 +13721,42 @@ 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/=.*//'` -cf_old_cflag="$CFLAGS" - -case "$CFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CFLAGS" != "$cf_old_cflag" ; -then +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}:13850: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 +echo "${as_me:-configure}:13734: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 - CFLAGS="$cf_new_cflag" -fi + CFLAGS="$cf_old_cflag" +done cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` -cf_old_cflag="$CPPFLAGS" - -case "$CPPFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CPPFLAGS" != "$cf_old_cflag" ; -then +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}:13874: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 - - CPPFLAGS="$cf_new_cflag" -fi +echo "${as_me:-configure}:13746: 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) @@ -13958,7 +13831,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}:13961: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:13834: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -13968,7 +13841,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}:13971: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:13844: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -13978,20 +13851,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}:13981: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:13854: 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:13991: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:13866: 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 13994 "configure" +#line 13869 "configure" #include "confdefs.h" #include int @@ -14006,16 +13881,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14009: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13884: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14012: \$? = $ac_status" >&5 + echo "$as_me:13887: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14015: \"$ac_try\"") >&5 + { (eval echo "$as_me:13890: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14018: \$? = $ac_status" >&5 + echo "$as_me:13893: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -14024,12 +13899,12 @@ cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:14027: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:13902: 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 14032 "configure" +#line 13907 "configure" #include "confdefs.h" #include int @@ -14044,16 +13919,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14047: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13922: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14050: \$? = $ac_status" >&5 + echo "$as_me:13925: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14053: \"$ac_try\"") >&5 + { (eval echo "$as_me:13928: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14056: \$? = $ac_status" >&5 + echo "$as_me:13931: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -14064,19 +13939,19 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_XOPEN_SOURCE_set_ok" = no then - { echo "$as_me:14067: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:13942: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:14072: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:13947: 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 14079 "configure" +#line 13954 "configure" #include "confdefs.h" #include @@ -14095,16 +13970,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14098: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13973: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14101: \$? = $ac_status" >&5 + echo "$as_me:13976: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14104: \"$ac_try\"") >&5 + { (eval echo "$as_me:13979: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14107: \$? = $ac_status" >&5 + echo "$as_me:13982: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -14116,7 +13991,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 14119 "configure" +#line 13994 "configure" #include "confdefs.h" #include @@ -14135,16 +14010,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14138: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14013: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14141: \$? = $ac_status" >&5 + echo "$as_me:14016: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14144: \"$ac_try\"") >&5 + { (eval echo "$as_me:14019: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14147: \$? = $ac_status" >&5 + echo "$as_me:14022: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -14159,7 +14034,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14162: result: $cf_cv_xopen_source" >&5 +echo "$as_me:14037: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -14176,57 +14051,36 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ 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/=.*//'` -cf_old_cflag="$CFLAGS" - -case "$CFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CFLAGS" != "$cf_old_cflag" ; -then +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_new_cflag" -fi + CFLAGS="$cf_old_cflag" +done cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` -cf_old_cflag="$CPPFLAGS" - -case "$CPPFLAGS" in -(*$cf_add_cflags=*) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"` - ;; -(*$cf_add_cflags\ *) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"` - ;; -(*$cf_add_cflags) - cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"` - ;; -esac - -if test "$CPPFLAGS" != "$cf_old_cflag" ; -then - - CPPFLAGS="$cf_new_cflag" -fi +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) @@ -14319,6 +14173,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + fi fi @@ -14332,7 +14188,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:14335: checking for special C compiler options needed for large files" >&5 + echo "$as_me:14191: 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 @@ -14344,7 +14200,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 14347 "configure" +#line 14203 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -14364,16 +14220,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14367: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14223: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14370: \$? = $ac_status" >&5 + echo "$as_me:14226: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14373: \"$ac_try\"") >&5 + { (eval echo "$as_me:14229: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14376: \$? = $ac_status" >&5 + echo "$as_me:14232: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14383,16 +14239,16 @@ fi rm -f "conftest.$ac_objext" CC="$CC -n32" rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14386: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14242: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14389: \$? = $ac_status" >&5 + echo "$as_me:14245: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14392: \"$ac_try\"") >&5 + { (eval echo "$as_me:14248: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14395: \$? = $ac_status" >&5 + echo "$as_me:14251: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -14406,13 +14262,13 @@ rm -f "conftest.$ac_objext" rm -f "conftest.$ac_ext" fi fi -echo "$as_me:14409: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:14265: 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:14415: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:14271: 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 @@ -14420,7 +14276,7 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >"conftest.$ac_ext" <<_ACEOF -#line 14423 "configure" +#line 14279 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -14440,16 +14296,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14443: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14299: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14446: \$? = $ac_status" >&5 + echo "$as_me:14302: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14449: \"$ac_try\"") >&5 + { (eval echo "$as_me:14305: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14452: \$? = $ac_status" >&5 + echo "$as_me:14308: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14458,7 +14314,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 14461 "configure" +#line 14317 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -14479,16 +14335,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14482: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14338: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14485: \$? = $ac_status" >&5 + echo "$as_me:14341: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14488: \"$ac_try\"") >&5 + { (eval echo "$as_me:14344: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14491: \$? = $ac_status" >&5 + echo "$as_me:14347: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -14499,7 +14355,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14502: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:14358: 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 @@ -14509,7 +14365,7 @@ EOF fi rm -rf conftest* - echo "$as_me:14512: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:14368: 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 @@ -14517,7 +14373,7 @@ else while :; do ac_cv_sys_large_files=no cat >"conftest.$ac_ext" <<_ACEOF -#line 14520 "configure" +#line 14376 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -14537,16 +14393,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14540: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14396: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14543: \$? = $ac_status" >&5 + echo "$as_me:14399: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14546: \"$ac_try\"") >&5 + { (eval echo "$as_me:14402: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14549: \$? = $ac_status" >&5 + echo "$as_me:14405: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14555,7 +14411,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 14558 "configure" +#line 14414 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -14576,16 +14432,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14579: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14435: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14582: \$? = $ac_status" >&5 + echo "$as_me:14438: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14585: \"$ac_try\"") >&5 + { (eval echo "$as_me:14441: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14588: \$? = $ac_status" >&5 + echo "$as_me:14444: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_large_files=1; break else @@ -14596,7 +14452,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14599: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:14455: 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 @@ -14609,7 +14465,7 @@ rm -rf conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:14612: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:14468: 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 @@ -14617,7 +14473,7 @@ else while :; do ac_cv_sys_largefile_source=no cat >"conftest.$ac_ext" <<_ACEOF -#line 14620 "configure" +#line 14476 "configure" #include "confdefs.h" #include int @@ -14629,16 +14485,16 @@ return !fseeko; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14632: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14488: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14635: \$? = $ac_status" >&5 + echo "$as_me:14491: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14638: \"$ac_try\"") >&5 + { (eval echo "$as_me:14494: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14641: \$? = $ac_status" >&5 + echo "$as_me:14497: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14647,7 +14503,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 14650 "configure" +#line 14506 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include @@ -14660,16 +14516,16 @@ return !fseeko; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14519: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14666: \$? = $ac_status" >&5 + echo "$as_me:14522: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14669: \"$ac_try\"") >&5 + { (eval echo "$as_me:14525: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14672: \$? = $ac_status" >&5 + echo "$as_me:14528: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_largefile_source=1; break else @@ -14680,7 +14536,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14683: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:14539: 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 @@ -14694,13 +14550,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:14697: checking for fseeko" >&5 +echo "$as_me:14553: 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 14703 "configure" +#line 14559 "configure" #include "confdefs.h" #include int @@ -14712,16 +14568,16 @@ return fseeko && fseeko (stdin, 0, 0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14715: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14571: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14718: \$? = $ac_status" >&5 + echo "$as_me:14574: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14721: \"$ac_try\"") >&5 + { (eval echo "$as_me:14577: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14724: \$? = $ac_status" >&5 + echo "$as_me:14580: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_fseeko=yes else @@ -14731,7 +14587,7 @@ ac_cv_func_fseeko=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14734: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:14590: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -14770,14 +14626,14 @@ fi fi - echo "$as_me:14773: checking whether to use struct dirent64" >&5 + echo "$as_me:14629: 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 14780 "configure" +#line 14636 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types" @@ -14800,16 +14656,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14803: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14659: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14806: \$? = $ac_status" >&5 + echo "$as_me:14662: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14809: \"$ac_try\"") >&5 + { (eval echo "$as_me:14665: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14812: \$? = $ac_status" >&5 + echo "$as_me:14668: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_struct_dirent64=yes else @@ -14820,7 +14676,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14823: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:14679: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF @@ -14830,7 +14686,7 @@ EOF fi ### Enable compiling-in rcs id's -echo "$as_me:14833: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:14689: 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. @@ -14840,7 +14696,7 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:14843: result: $with_rcs_ids" >&5 +echo "$as_me:14699: result: $with_rcs_ids" >&5 echo "${ECHO_T}$with_rcs_ids" >&6 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF @@ -14850,7 +14706,7 @@ EOF ############################################################################### ### Note that some functions (such as const) are normally disabled anyway. -echo "$as_me:14853: checking if you want to build with function extensions" >&5 +echo "$as_me:14709: 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. @@ -14860,7 +14716,7 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:14863: result: $with_ext_funcs" >&5 +echo "$as_me:14719: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "$with_ext_funcs" = yes ; then NCURSES_EXT_FUNCS=1 @@ -14878,7 +14734,7 @@ else fi ### use option --enable-const to turn on use of const beyond that in XSI. -echo "$as_me:14881: checking for extended use of const keyword" >&5 +echo "$as_me:14737: 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. @@ -14888,7 +14744,7 @@ if test "${enable_const+set}" = set; then else with_ext_const=no fi; -echo "$as_me:14891: result: $with_ext_const" >&5 +echo "$as_me:14747: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "$with_ext_const" = yes ; then @@ -14898,7 +14754,7 @@ fi ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:14901: checking if you want all development code" >&5 +echo "$as_me:14757: 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. @@ -14908,7 +14764,7 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:14911: result: $with_develop" >&5 +echo "$as_me:14767: result: $with_develop" >&5 echo "${ECHO_T}$with_develop" >&6 ############################################################################### @@ -14917,7 +14773,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:14920: checking if you want to link with the pthread library" >&5 +echo "$as_me:14776: 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. @@ -14927,27 +14783,27 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:14930: result: $with_pthread" >&5 +echo "$as_me:14786: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:14934: checking for pthread.h" >&5 + echo "$as_me:14790: 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 14940 "configure" +#line 14796 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:14944: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:14800: \"$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:14950: \$? = $ac_status" >&5 + echo "$as_me:14806: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14966,7 +14822,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:14969: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:14825: 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 @@ -14976,7 +14832,7 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:14979: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:14835: 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" @@ -14997,7 +14853,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 15000 "configure" +#line 14856 "configure" #include "confdefs.h" #include @@ -15014,16 +14870,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15017: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14873: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15020: \$? = $ac_status" >&5 + echo "$as_me:14876: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15023: \"$ac_try\"") >&5 + { (eval echo "$as_me:14879: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15026: \$? = $ac_status" >&5 + echo "$as_me:14882: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then with_pthread=yes else @@ -15033,7 +14889,7 @@ with_pthread=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:15036: result: $with_pthread" >&5 + echo "$as_me:14892: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done @@ -15061,7 +14917,7 @@ cat >>confdefs.h <<\EOF EOF else - { { echo "$as_me:15064: error: Cannot link with pthread library" >&5 + { { echo "$as_me:14920: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -15070,7 +14926,7 @@ fi fi -echo "$as_me:15073: checking if you want to use weak-symbols for pthreads" >&5 +echo "$as_me:14929: 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. @@ -15080,18 +14936,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; -echo "$as_me:15083: result: $use_weak_symbols" >&5 +echo "$as_me:14939: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "$use_weak_symbols" = yes ; then -echo "$as_me:15087: checking if $CC supports weak symbols" >&5 +echo "$as_me:14943: 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 15094 "configure" +#line 14950 "configure" #include "confdefs.h" #include @@ -15117,16 +14973,16 @@ weak_symbol(fopen); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15120: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14976: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15123: \$? = $ac_status" >&5 + echo "$as_me:14979: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15126: \"$ac_try\"") >&5 + { (eval echo "$as_me:14982: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15129: \$? = $ac_status" >&5 + echo "$as_me:14985: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_weak_symbols=yes else @@ -15137,7 +14993,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15140: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:14996: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -15166,13 +15022,13 @@ EOF fi # OpenSUSE is installing ncurses6, using reentrant option. -echo "$as_me:15169: checking for _nc_TABSIZE" >&5 +echo "$as_me:15025: 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 15175 "configure" +#line 15031 "configure" #include "confdefs.h" #define _nc_TABSIZE autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15203,16 +15059,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15206: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15062: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15209: \$? = $ac_status" >&5 + echo "$as_me:15065: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15212: \"$ac_try\"") >&5 + { (eval echo "$as_me:15068: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15215: \$? = $ac_status" >&5 + echo "$as_me:15071: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func__nc_TABSIZE=yes else @@ -15222,7 +15078,7 @@ ac_cv_func__nc_TABSIZE=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15225: result: $ac_cv_func__nc_TABSIZE" >&5 +echo "$as_me:15081: 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 @@ -15234,7 +15090,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:15237: checking if you want experimental reentrant code" >&5 +echo "$as_me:15093: 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. @@ -15244,7 +15100,7 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=$assume_reentrant fi; -echo "$as_me:15247: result: $with_reentrant" >&5 +echo "$as_me:15103: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "$with_reentrant" = yes ; then cf_cv_enable_reentrant=1 @@ -15267,7 +15123,7 @@ fi ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:15270: checking for prefix used to wrap public variables" >&5 + echo "$as_me:15126: 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. @@ -15277,7 +15133,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:15280: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:15136: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -15291,7 +15147,7 @@ EOF ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:15294: checking if you want to see long compiling messages" >&5 +echo "$as_me:15150: 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. @@ -15325,10 +15181,10 @@ else ECHO_CC='' fi; -echo "$as_me:15328: result: $enableval" >&5 +echo "$as_me:15184: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:15331: checking if you want to use C11 _Noreturn feature" >&5 +echo "$as_me:15187: 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. @@ -15345,17 +15201,17 @@ else enable_stdnoreturn=no fi; -echo "$as_me:15348: result: $enable_stdnoreturn" >&5 +echo "$as_me:15204: result: $enable_stdnoreturn" >&5 echo "${ECHO_T}$enable_stdnoreturn" >&6 if test $enable_stdnoreturn = yes; then -echo "$as_me:15352: checking for C11 _Noreturn feature" >&5 +echo "$as_me:15208: 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 15358 "configure" +#line 15214 "configure" #include "confdefs.h" #include @@ -15372,16 +15228,16 @@ if (feof(stdin)) giveup() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15375: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15231: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15378: \$? = $ac_status" >&5 + echo "$as_me:15234: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15381: \"$ac_try\"") >&5 + { (eval echo "$as_me:15237: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15384: \$? = $ac_status" >&5 + echo "$as_me:15240: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_c11_noreturn=yes else @@ -15392,7 +15248,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15395: result: $cf_cv_c11_noreturn" >&5 +echo "$as_me:15251: result: $cf_cv_c11_noreturn" >&5 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 else cf_cv_c11_noreturn=no, @@ -15422,7 +15278,7 @@ then (*-Werror=*) test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 -echo "${as_me:-configure}:15425: testing repairing CFLAGS: $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15281: testing repairing CFLAGS: $CFLAGS ..." 1>&5 cf_temp_flags= for cf_temp_scan in $CFLAGS @@ -15445,11 +15301,11 @@ echo "${as_me:-configure}:15425: testing repairing CFLAGS: $CFLAGS ..." 1>&5 CFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:15448: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15304: testing ... fixed $CFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:15452: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15308: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ;; esac @@ -15461,7 +15317,7 @@ then (*-Werror=*) test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:15464: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:15320: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 cf_temp_flags= for cf_temp_scan in $CPPFLAGS @@ -15484,11 +15340,11 @@ echo "${as_me:-configure}:15464: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:15487: testing ... fixed $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:15343: testing ... fixed $CPPFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:15491: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15347: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ;; esac @@ -15500,7 +15356,7 @@ then (*-Werror=*) test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 -echo "${as_me:-configure}:15503: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:15359: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 cf_temp_flags= for cf_temp_scan in $LDFLAGS @@ -15523,17 +15379,17 @@ echo "${as_me:-configure}:15503: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 LDFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 -echo "${as_me:-configure}:15526: testing ... fixed $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:15382: testing ... fixed $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:15530: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15386: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ;; esac fi -echo "$as_me:15536: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:15392: 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. @@ -15550,7 +15406,7 @@ else enable_warnings=no fi; -echo "$as_me:15553: result: $enable_warnings" >&5 +echo "$as_me:15409: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then @@ -15574,7 +15430,7 @@ do done cat >"conftest.$ac_ext" <<_ACEOF -#line 15577 "configure" +#line 15433 "configure" #include "confdefs.h" #include @@ -15589,26 +15445,26 @@ String foo = malloc(1); free((void*)foo) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15592: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15448: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15595: \$? = $ac_status" >&5 + echo "$as_me:15451: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15598: \"$ac_try\"") >&5 + { (eval echo "$as_me:15454: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15601: \$? = $ac_status" >&5 + echo "$as_me:15457: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then -echo "$as_me:15604: checking for X11/Xt const-feature" >&5 +echo "$as_me:15460: 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 15611 "configure" +#line 15467 "configure" #include "confdefs.h" #define _CONST_X_STRING /* X11R7.8 (perhaps) */ @@ -15625,16 +15481,16 @@ String foo = malloc(1); *foo = 0 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15628: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15484: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15631: \$? = $ac_status" >&5 + echo "$as_me:15487: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15634: \"$ac_try\"") >&5 + { (eval echo "$as_me:15490: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15637: \$? = $ac_status" >&5 + echo "$as_me:15493: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_const_x_string=no @@ -15649,7 +15505,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15652: result: $cf_cv_const_x_string" >&5 +echo "$as_me:15508: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -15678,7 +15534,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi cat > "conftest.$ac_ext" <&5 + { echo "$as_me:15553: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -15710,12 +15566,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:15713: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:15569: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15716: \$? = $ac_status" >&5 + echo "$as_me:15572: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:15718: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:15574: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -15723,7 +15579,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:15726: checking for $CC warning options..." >&5 + { echo "$as_me:15582: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -15746,12 +15602,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:15749: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:15605: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15752: \$? = $ac_status" >&5 + echo "$as_me:15608: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:15754: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:15610: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -15759,7 +15615,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}:15762: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:15618: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -15769,7 +15625,7 @@ echo "${as_me:-configure}:15762: 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}:15772: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:15628: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -15802,10 +15658,10 @@ cat > conftest.i <&5 + { echo "$as_me:15661: 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:15713: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15860: \$? = $ac_status" >&5 + echo "$as_me:15716: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:15862: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:15718: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -15927,7 +15783,7 @@ if test "x$enable_warnings" = "xyes"; then fi ### use option --enable-assertions to turn on generation of assertion code -echo "$as_me:15930: checking if you want to enable runtime assertions" >&5 +echo "$as_me:15786: 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. @@ -15937,7 +15793,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:15940: result: $with_assertions" >&5 +echo "$as_me:15796: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -15990,7 +15846,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:15993: checking whether to add trace feature to all models" >&5 +echo "$as_me:15849: 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. @@ -16000,7 +15856,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:16003: result: $cf_with_trace" >&5 +echo "$as_me:15859: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "$cf_with_trace" = yes ; then @@ -16108,7 +15964,7 @@ else ADA_TRACE=FALSE fi -echo "$as_me:16111: checking if we want to use GNAT projects" >&5 +echo "$as_me:15967: 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. @@ -16125,21 +15981,129 @@ else enable_gnat_projects=yes fi; -echo "$as_me:16128: result: $enable_gnat_projects" >&5 +echo "$as_me:15984: 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:15991: 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 15998 "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:16015: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:16018: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16021: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16024: \$? = $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 16034 "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:16051: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:16054: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16057: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16060: \$? = $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:16074: 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:16136: checking for gettimeofday" >&5 +echo "$as_me:16100: 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 16142 "configure" +#line 16106 "configure" #include "confdefs.h" #define gettimeofday autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -16170,16 +16134,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16173: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16137: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16176: \$? = $ac_status" >&5 + echo "$as_me:16140: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16179: \"$ac_try\"") >&5 + { (eval echo "$as_me:16143: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16182: \$? = $ac_status" >&5 + echo "$as_me:16146: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gettimeofday=yes else @@ -16189,7 +16153,7 @@ ac_cv_func_gettimeofday=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16192: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:16156: 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 @@ -16198,7 +16162,7 @@ EOF else -echo "$as_me:16201: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:16165: 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 @@ -16206,7 +16170,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16209 "configure" +#line 16173 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16225,16 +16189,16 @@ gettimeofday (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16228: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16192: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16231: \$? = $ac_status" >&5 + echo "$as_me:16195: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16234: \"$ac_try\"") >&5 + { (eval echo "$as_me:16198: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16237: \$? = $ac_status" >&5 + echo "$as_me:16201: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -16245,7 +16209,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16248: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:16212: 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 @@ -16261,13 +16225,13 @@ fi esac ### Checks for header files. -echo "$as_me:16264: checking for ANSI C header files" >&5 +echo "$as_me:16228: 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 16270 "configure" +#line 16234 "configure" #include "confdefs.h" #include #include @@ -16275,13 +16239,13 @@ else #include _ACEOF -if { (eval echo "$as_me:16278: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:16242: \"$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:16284: \$? = $ac_status" >&5 + echo "$as_me:16248: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16303,7 +16267,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 16306 "configure" +#line 16270 "configure" #include "confdefs.h" #include @@ -16321,7 +16285,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 16324 "configure" +#line 16288 "configure" #include "confdefs.h" #include @@ -16342,7 +16306,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >"conftest.$ac_ext" <<_ACEOF -#line 16345 "configure" +#line 16309 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -16368,15 +16332,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:16371: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16335: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16374: \$? = $ac_status" >&5 + echo "$as_me:16338: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:16376: \"$ac_try\"") >&5 + { (eval echo "$as_me:16340: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16379: \$? = $ac_status" >&5 + echo "$as_me:16343: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -16389,7 +16353,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi fi -echo "$as_me:16392: result: $ac_cv_header_stdc" >&5 +echo "$as_me:16356: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -16405,28 +16369,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:16408: checking for $ac_header" >&5 +echo "$as_me:16372: 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 16414 "configure" +#line 16378 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16420: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16384: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16423: \$? = $ac_status" >&5 + echo "$as_me:16387: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16426: \"$ac_try\"") >&5 + { (eval echo "$as_me:16390: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16429: \$? = $ac_status" >&5 + echo "$as_me:16393: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -16436,7 +16400,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16439: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:16403: 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:16413: 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 16455 "configure" +#line 16419 "configure" #include "confdefs.h" $ac_includes_default int @@ -16467,16 +16431,16 @@ if (sizeof (signed char)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16470: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16434: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16473: \$? = $ac_status" >&5 + echo "$as_me:16437: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16476: \"$ac_try\"") >&5 + { (eval echo "$as_me:16440: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16479: \$? = $ac_status" >&5 + echo "$as_me:16443: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_signed_char=yes else @@ -16486,10 +16450,10 @@ ac_cv_type_signed_char=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16489: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:16453: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:16492: checking size of signed char" >&5 +echo "$as_me:16456: 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 @@ -16498,7 +16462,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 16501 "configure" +#line 16465 "configure" #include "confdefs.h" $ac_includes_default int @@ -16510,21 +16474,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16513: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16477: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16516: \$? = $ac_status" >&5 + echo "$as_me:16480: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16519: \"$ac_try\"") >&5 + { (eval echo "$as_me:16483: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16522: \$? = $ac_status" >&5 + echo "$as_me:16486: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 16527 "configure" +#line 16491 "configure" #include "confdefs.h" $ac_includes_default int @@ -16536,16 +16500,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16539: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16503: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16542: \$? = $ac_status" >&5 + echo "$as_me:16506: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16545: \"$ac_try\"") >&5 + { (eval echo "$as_me:16509: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16548: \$? = $ac_status" >&5 + echo "$as_me:16512: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -16561,7 +16525,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 16564 "configure" +#line 16528 "configure" #include "confdefs.h" $ac_includes_default int @@ -16573,16 +16537,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16576: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16540: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16579: \$? = $ac_status" >&5 + echo "$as_me:16543: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16582: \"$ac_try\"") >&5 + { (eval echo "$as_me:16546: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16585: \$? = $ac_status" >&5 + echo "$as_me:16549: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -16598,7 +16562,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 16601 "configure" +#line 16565 "configure" #include "confdefs.h" $ac_includes_default int @@ -16610,16 +16574,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16613: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16577: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16616: \$? = $ac_status" >&5 + echo "$as_me:16580: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16619: \"$ac_try\"") >&5 + { (eval echo "$as_me:16583: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16622: \$? = $ac_status" >&5 + echo "$as_me:16586: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -16632,12 +16596,12 @@ done ac_cv_sizeof_signed_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:16635: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:16599: 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 16640 "configure" +#line 16604 "configure" #include "confdefs.h" $ac_includes_default int @@ -16653,15 +16617,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:16656: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16620: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16659: \$? = $ac_status" >&5 + echo "$as_me:16623: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:16661: \"$ac_try\"") >&5 + { (eval echo "$as_me:16625: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16664: \$? = $ac_status" >&5 + echo "$as_me:16628: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_signed_char=`cat conftest.val` else @@ -16677,19 +16641,19 @@ else ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:16680: result: $ac_cv_sizeof_signed_char" >&5 +echo "$as_me:16644: result: $ac_cv_sizeof_signed_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 cat >>confdefs.h <&5 +echo "$as_me:16650: 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 16692 "configure" +#line 16656 "configure" #include "confdefs.h" #include #include @@ -16697,13 +16661,13 @@ else #include _ACEOF -if { (eval echo "$as_me:16700: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:16664: \"$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:16706: \$? = $ac_status" >&5 + echo "$as_me:16670: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16725,7 +16689,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 16728 "configure" +#line 16692 "configure" #include "confdefs.h" #include @@ -16743,7 +16707,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 16746 "configure" +#line 16710 "configure" #include "confdefs.h" #include @@ -16764,7 +16728,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >"conftest.$ac_ext" <<_ACEOF -#line 16767 "configure" +#line 16731 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -16790,15 +16754,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:16793: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16757: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16796: \$? = $ac_status" >&5 + echo "$as_me:16760: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:16798: \"$ac_try\"") >&5 + { (eval echo "$as_me:16762: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16801: \$? = $ac_status" >&5 + echo "$as_me:16765: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -16811,7 +16775,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi fi -echo "$as_me:16814: result: $ac_cv_header_stdc" >&5 +echo "$as_me:16778: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -16824,13 +16788,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:16827: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:16791: 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 16833 "configure" +#line 16797 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -16845,16 +16809,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16848: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16812: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16851: \$? = $ac_status" >&5 + echo "$as_me:16815: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16854: \"$ac_try\"") >&5 + { (eval echo "$as_me:16818: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16857: \$? = $ac_status" >&5 + echo "$as_me:16821: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -16864,7 +16828,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16867: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:16831: 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:16844: 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 @@ -16885,7 +16849,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16888 "configure" +#line 16852 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16904,16 +16868,16 @@ opendir (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16907: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16871: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16910: \$? = $ac_status" >&5 + echo "$as_me:16874: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16913: \"$ac_try\"") >&5 + { (eval echo "$as_me:16877: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16916: \$? = $ac_status" >&5 + echo "$as_me:16880: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dir_opendir=yes else @@ -16924,14 +16888,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16927: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:16891: 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:16934: checking for opendir in -lx" >&5 + echo "$as_me:16898: 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 @@ -16939,7 +16903,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16942 "configure" +#line 16906 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16958,16 +16922,16 @@ opendir (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16961: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16925: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16964: \$? = $ac_status" >&5 + echo "$as_me:16928: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16967: \"$ac_try\"") >&5 + { (eval echo "$as_me:16931: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16970: \$? = $ac_status" >&5 + echo "$as_me:16934: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_x_opendir=yes else @@ -16978,7 +16942,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16981: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:16945: 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" @@ -16986,13 +16950,13 @@ fi fi -echo "$as_me:16989: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:16953: 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 16995 "configure" +#line 16959 "configure" #include "confdefs.h" #include #include @@ -17008,16 +16972,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17011: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16975: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17014: \$? = $ac_status" >&5 + echo "$as_me:16978: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17017: \"$ac_try\"") >&5 + { (eval echo "$as_me:16981: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17020: \$? = $ac_status" >&5 + echo "$as_me:16984: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_header_time=yes else @@ -17027,7 +16991,7 @@ ac_cv_header_time=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17030: result: $ac_cv_header_time" >&5 +echo "$as_me:16994: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -17045,13 +17009,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:17048: checking for an ANSI C-conforming const" >&5 +echo "$as_me:17012: 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 17054 "configure" +#line 17018 "configure" #include "confdefs.h" int @@ -17109,16 +17073,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17112: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17076: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17115: \$? = $ac_status" >&5 + echo "$as_me:17079: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17118: \"$ac_try\"") >&5 + { (eval echo "$as_me:17082: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17121: \$? = $ac_status" >&5 + echo "$as_me:17085: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_c_const=yes else @@ -17128,7 +17092,7 @@ ac_cv_c_const=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17131: result: $ac_cv_c_const" >&5 +echo "$as_me:17095: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -17140,7 +17104,7 @@ fi ### Checks for external-data -echo "$as_me:17143: checking if data-only library module links" >&5 +echo "$as_me:17107: 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 @@ -17148,20 +17112,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:17118: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17157: \$? = $ac_status" >&5 + echo "$as_me:17121: \$? = $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:17141: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17180: \$? = $ac_status" >&5 + echo "$as_me:17144: \$? = $ac_status" >&5 (exit "$ac_status"); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -17190,7 +17154,7 @@ EOF cf_cv_link_dataonly=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 17193 "configure" +#line 17157 "configure" #include "confdefs.h" int main(void) @@ -17201,15 +17165,15 @@ else _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:17204: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17168: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17207: \$? = $ac_status" >&5 + echo "$as_me:17171: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:17209: \"$ac_try\"") >&5 + { (eval echo "$as_me:17173: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17212: \$? = $ac_status" >&5 + echo "$as_me:17176: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_link_dataonly=yes else @@ -17224,7 +17188,7 @@ fi fi -echo "$as_me:17227: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:17191: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -17243,23 +17207,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:17246: checking for $ac_header" >&5 +echo "$as_me:17210: 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 17252 "configure" +#line 17216 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17256: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:17220: \"$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:17262: \$? = $ac_status" >&5 + echo "$as_me:17226: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17278,7 +17242,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:17281: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:17245: 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:17255: 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 @@ -17299,7 +17263,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 17302 "configure" +#line 17266 "configure" #include "confdefs.h" #include @@ -17340,15 +17304,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:17343: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17307: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17346: \$? = $ac_status" >&5 + echo "$as_me:17310: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:17348: \"$ac_try\"") >&5 + { (eval echo "$as_me:17312: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17351: \$? = $ac_status" >&5 + echo "$as_me:17315: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_mkstemp=yes @@ -17363,16 +17327,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:17366: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:17330: 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:17369: checking for mkstemp" >&5 + echo "$as_me:17333: 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 17375 "configure" +#line 17339 "configure" #include "confdefs.h" #define mkstemp autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -17403,16 +17367,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17406: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17370: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17409: \$? = $ac_status" >&5 + echo "$as_me:17373: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17412: \"$ac_try\"") >&5 + { (eval echo "$as_me:17376: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17415: \$? = $ac_status" >&5 + echo "$as_me:17379: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_mkstemp=yes else @@ -17422,7 +17386,7 @@ ac_cv_func_mkstemp=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:17425: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:17389: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -17451,7 +17415,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:17454: checking for $ac_word" >&5 +echo "$as_me:17418: 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 @@ -17468,7 +17432,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:17471: found $ac_dir/$ac_word" >&5 + echo "$as_me:17435: found $ac_dir/$ac_word" >&5 break fi done @@ -17480,10 +17444,10 @@ fi cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat if test -n "$cf_TEMP_gnat"; then - echo "$as_me:17483: result: $cf_TEMP_gnat" >&5 + echo "$as_me:17447: result: $cf_TEMP_gnat" >&5 echo "${ECHO_T}$cf_TEMP_gnat" >&6 else - echo "$as_me:17486: result: no" >&5 + echo "$as_me:17450: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -17493,7 +17457,7 @@ fi unset cf_cv_gnat_version unset cf_TEMP_gnat -echo "$as_me:17496: checking for $cf_prog_gnat version" >&5 +echo "$as_me:17460: 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 @@ -17504,7 +17468,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:17507: result: $cf_cv_gnat_version" >&5 +echo "$as_me:17471: 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 @@ -17533,7 +17497,7 @@ else cd conftest.src for cf_gprconfig in Ada C do - echo "$as_me:17536: checking for gprconfig name for $cf_gprconfig" >&5 + echo "$as_me:17500: 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 @@ -17552,10 +17516,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:17555: result: $cf_gprconfig_value" >&5 + echo "$as_me:17519: result: $cf_gprconfig_value" >&5 echo "${ECHO_T}$cf_gprconfig_value" >&6 else - echo "$as_me:17558: result: missing" >&5 + echo "$as_me:17522: result: missing" >&5 echo "${ECHO_T}missing" >&6 cf_ada_config="#" break @@ -17568,7 +17532,7 @@ echo "${ECHO_T}missing" >&6 if test "x$cf_ada_config" != "x#" then -echo "$as_me:17571: checking for gnat version" >&5 +echo "$as_me:17535: 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 @@ -17579,7 +17543,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:17582: result: $cf_cv_gnat_version" >&5 +echo "$as_me:17546: 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 @@ -17588,7 +17552,7 @@ case "$cf_cv_gnat_version" in cf_cv_prog_gnat_correct=yes ;; (*) - { echo "$as_me:17591: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:17555: 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 ;; @@ -17596,7 +17560,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:17599: checking for $ac_word" >&5 +echo "$as_me:17563: 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 @@ -17611,7 +17575,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:17614: found $ac_dir/$ac_word" >&5 +echo "$as_me:17578: found $ac_dir/$ac_word" >&5 break done @@ -17620,20 +17584,20 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:17623: result: $M4_exists" >&5 + echo "$as_me:17587: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:17626: result: no" >&5 + echo "$as_me:17590: 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:17632: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + { echo "$as_me:17596: 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:17636: checking if GNAT works" >&5 + echo "$as_me:17600: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf ./conftest* ./*~conftest* @@ -17661,7 +17625,7 @@ else fi rm -rf ./conftest* ./*~conftest* - echo "$as_me:17664: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:17628: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi else @@ -17671,7 +17635,7 @@ fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:17674: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:17638: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -17688,10 +17652,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:17691: result: $ADAFLAGS" >&5 + echo "$as_me:17655: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:17694: checking if GNATPREP supports -T option" >&5 +echo "$as_me:17658: 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 @@ -17701,11 +17665,11 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:17704: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:17668: 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:17708: checking if GNAT supports generics" >&5 +echo "$as_me:17672: 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]) @@ -17715,7 +17679,7 @@ case "$cf_cv_gnat_version" in cf_gnat_generics=no ;; esac -echo "$as_me:17718: result: $cf_gnat_generics" >&5 +echo "$as_me:17682: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -17727,7 +17691,7 @@ else cf_generic_objects= fi -echo "$as_me:17730: checking if GNAT supports SIGINT" >&5 +echo "$as_me:17694: 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 @@ -17775,7 +17739,7 @@ fi rm -rf ./conftest* ./*~conftest* fi -echo "$as_me:17778: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:17742: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test "$cf_cv_gnat_sigint" = yes ; then @@ -17788,7 +17752,7 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:17791: checking if GNAT supports project files" >&5 +echo "$as_me:17755: 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]*) @@ -17851,15 +17815,15 @@ CF_EOF esac ;; esac -echo "$as_me:17854: result: $cf_gnat_projects" >&5 +echo "$as_me:17818: 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:17860: checking if GNAT supports libraries" >&5 + echo "$as_me:17824: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:17862: result: $cf_gnat_libraries" >&5 + echo "$as_me:17826: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -17879,7 +17843,7 @@ then then USE_GNAT_MAKE_GPR="" else - { echo "$as_me:17882: WARNING: use old makefile rules since tools are missing" >&5 + { echo "$as_me:17846: 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 @@ -17891,7 +17855,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:17894: checking for ada-compiler" >&5 +echo "$as_me:17858: 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. @@ -17902,12 +17866,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:17905: result: $cf_ada_compiler" >&5 +echo "$as_me:17869: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:17910: checking for ada-include" >&5 +echo "$as_me:17874: 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. @@ -17943,7 +17907,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:17946: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:17910: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -17952,10 +17916,10 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:17955: result: $ADA_INCLUDE" >&5 +echo "$as_me:17919: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:17958: checking for ada-objects" >&5 +echo "$as_me:17922: 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. @@ -17991,7 +17955,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:17994: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:17958: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -18000,10 +17964,10 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:18003: result: $ADA_OBJECTS" >&5 +echo "$as_me:17967: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:18006: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:17970: 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. @@ -18013,14 +17977,14 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:18016: result: $with_ada_sharedlib" >&5 +echo "$as_me:17980: 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:18023: WARNING: disabling shared-library since GNAT projects are not supported" >&5 + { echo "$as_me:17987: 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 @@ -18040,7 +18004,7 @@ fi # allow the Ada binding to be renamed -echo "$as_me:18043: checking for ada-libname" >&5 +echo "$as_me:18007: 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. @@ -18056,16 +18020,16 @@ case "x$ADA_LIBNAME" in ;; esac -echo "$as_me:18059: result: $ADA_LIBNAME" >&5 +echo "$as_me:18023: result: $ADA_LIBNAME" >&5 echo "${ECHO_T}$ADA_LIBNAME" >&6 else - { { echo "$as_me:18063: error: No usable Ada compiler found" >&5 + { { echo "$as_me:18027: 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:18068: error: The Ada compiler is needed for this package" >&5 + { { echo "$as_me:18032: 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 @@ -18105,7 +18069,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:18108: checking default library suffix" >&5 +echo "$as_me:18072: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -18116,10 +18080,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:18119: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:18083: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:18122: checking default library-dependency suffix" >&5 +echo "$as_me:18086: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -18202,10 +18166,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:18205: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:18169: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:18208: checking default object directory" >&5 +echo "$as_me:18172: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -18221,7 +18185,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:18224: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:18188: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 ### Set up low-level terminfo dependencies for makefiles. @@ -18363,7 +18327,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:18366: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:18330: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -18542,7 +18506,7 @@ cat >>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:18545: error: ambiguous option: $1 + { { echo "$as_me:18509: 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;} @@ -18561,7 +18525,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:18564: error: unrecognized option: $1 + -*) { { echo "$as_me:18528: 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;} @@ -18635,7 +18599,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:18638: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:18602: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -18995,7 +18959,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:18998: creating $ac_file" >&5 + { echo "$as_me:18962: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -19013,7 +18977,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:19016: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:18980: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -19026,7 +18990,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:19029: error: cannot find input file: $f" >&5 + { { echo "$as_me:18993: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -19042,7 +19006,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:19045: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:19009: 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;} @@ -19051,7 +19015,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:19054: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:19018: 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;} @@ -19088,7 +19052,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:19091: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:19055: 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;} @@ -19099,7 +19063,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:19102: WARNING: Some variables may not be substituted: + { echo "$as_me:19066: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -19148,7 +19112,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:19151: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:19115: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -19159,7 +19123,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:19162: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:19126: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -19172,7 +19136,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:19175: error: cannot find input file: $f" >&5 + { { echo "$as_me:19139: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -19230,7 +19194,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:19233: $ac_file is unchanged" >&5 + { echo "$as_me:19197: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \