X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;ds=sidebyside;f=test%2Fconfigure;h=2471c49bc0197933979144b022d34017abb5d923;hb=d7e564522107d120f566f85f0a9efbac058b4f50;hp=46e9a1048e63ed403beb8e0a39f024e7ed37defd;hpb=643ec2bf782cd02efafe3ccdeaea8920a404645e;p=ncurses.git diff --git a/test/configure b/test/configure index 46e9a104..2471c49b 100755 --- a/test/configure +++ b/test/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20210509. +# Generated by Autoconf 2.52.20221009. # -# Copyright 2003-2020,2021 Thomas E. Dickey +# Copyright 2003-2021,2022 Thomas E. Dickey # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -33,9 +33,9 @@ fi as_me=`echo "$0" |sed 's,.*[\\/],,'` if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr + as_expr="expr" else - as_expr=false + as_expr="false" fi rm -f conf$$ conf$$.exe conf$$.file @@ -50,7 +50,7 @@ if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' fi elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + as_ln_s='ln' else as_ln_s='cp -p' fi @@ -758,7 +758,7 @@ test -n "$ac_init_help" && exit 0 if "$ac_init_version"; then cat <<\EOF -Copyright 2003-2020,2021 Thomas E. Dickey +Copyright 2003-2021,2022 Thomas E. Dickey Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -772,7 +772,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52.20210509. Invocation command line was +generated by GNU Autoconf 2.52.20221009. Invocation command line was $ $0 $@ @@ -3260,9 +3260,9 @@ else #line 3260 "configure" #include "confdefs.h" - #include - #include - #include + #include + #include + #include int main (void) @@ -3294,9 +3294,73 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi echo "$as_me:3295: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 + if test "$cf_cv_need_libm" = yes then -MATH_LIB=-lm + + cf_save_LIBS="$LIBS" + LIBS="$LIBS -lm" + echo "$as_me:3303: checking if -lm is available for math functions" >&5 +echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6 +if test "${cf_cv_have_libm+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >"conftest.$ac_ext" <<_ACEOF +#line 3310 "configure" +#include "confdefs.h" + + #include + #include + #include + +int +main (void) +{ +double x = rand(); printf("result = %g\\n", pow(sin(x),x)) + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:3326: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3329: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:3332: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3335: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_libm=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_have_libm=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +fi +echo "$as_me:3345: result: $cf_cv_have_libm" >&5 +echo "${ECHO_T}$cf_cv_have_libm" >&6 + LIBS="$cf_save_LIBS" + + if test "$cf_cv_have_libm" = yes + then + MATH_LIB=-lm + fi +else + cf_cv_have_libm=yes +fi + +if test "$cf_cv_have_libm" = yes +then + +cat >>confdefs.h <<\EOF +#define HAVE_MATH_FUNCS 1 +EOF + fi top_builddir=`pwd` @@ -3333,7 +3397,7 @@ includesubdir="" cf_cv_screen=curses cf_cv_libtype= -echo "$as_me:3336: checking for fgrep" >&5 +echo "$as_me:3400: checking for fgrep" >&5 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3345,7 +3409,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:3348: checking for $ac_word" >&5 +echo "$as_me:3412: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3362,7 +3426,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_FGREP="$ac_dir/$ac_word" - echo "$as_me:3365: found $ac_dir/$ac_word" >&5 + echo "$as_me:3429: found $ac_dir/$ac_word" >&5 break fi done @@ -3373,10 +3437,10 @@ fi FGREP=$ac_cv_path_FGREP if test -n "$FGREP"; then - echo "$as_me:3376: result: $FGREP" >&5 + echo "$as_me:3440: result: $FGREP" >&5 echo "${ECHO_T}$FGREP" >&6 else - echo "$as_me:3379: result: no" >&5 + echo "$as_me:3443: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3384,16 +3448,16 @@ fi done test -n "$FGREP" || FGREP=": " - test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3387: error: cannot find workable fgrep" >&5 + test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3451: error: cannot find workable fgrep" >&5 echo "$as_me: error: cannot find workable fgrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:3392: result: $ac_cv_path_FGREP" >&5 +echo "$as_me:3456: result: $ac_cv_path_FGREP" >&5 echo "${ECHO_T}$ac_cv_path_FGREP" >&6 FGREP="$ac_cv_path_FGREP" -echo "$as_me:3396: checking if you want to use C11 _Noreturn feature" >&5 +echo "$as_me:3460: 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. @@ -3410,17 +3474,17 @@ else enable_stdnoreturn=no fi; -echo "$as_me:3413: result: $enable_stdnoreturn" >&5 +echo "$as_me:3477: result: $enable_stdnoreturn" >&5 echo "${ECHO_T}$enable_stdnoreturn" >&6 if test $enable_stdnoreturn = yes; then -echo "$as_me:3417: checking for C11 _Noreturn feature" >&5 +echo "$as_me:3481: 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 3423 "configure" +#line 3487 "configure" #include "confdefs.h" #include @@ -3437,16 +3501,16 @@ if (feof(stdin)) giveup() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3440: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3504: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3443: \$? = $ac_status" >&5 + echo "$as_me:3507: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3446: \"$ac_try\"") >&5 + { (eval echo "$as_me:3510: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3449: \$? = $ac_status" >&5 + echo "$as_me:3513: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_c11_noreturn=yes else @@ -3457,7 +3521,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:3460: result: $cf_cv_c11_noreturn" >&5 +echo "$as_me:3524: result: $cf_cv_c11_noreturn" >&5 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 else cf_cv_c11_noreturn=no, @@ -3496,10 +3560,10 @@ cat > conftest.i <&5 + { echo "$as_me:3563: 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:3615: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3554: \$? = $ac_status" >&5 + echo "$as_me:3618: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:3556: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:3620: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -3612,7 +3676,7 @@ fi rm -rf ./conftest* fi -echo "$as_me:3615: checking if you want to work around bogus compiler/loader warnings" >&5 +echo "$as_me:3679: checking if you want to work around bogus compiler/loader warnings" >&5 echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 # Check whether --enable-string-hacks or --disable-string-hacks was given. @@ -3622,7 +3686,7 @@ if test "${enable_string_hacks+set}" = set; then else enable_string_hacks=no fi; -echo "$as_me:3625: result: $enable_string_hacks" >&5 +echo "$as_me:3689: result: $enable_string_hacks" >&5 echo "${ECHO_T}$enable_string_hacks" >&6 if test "x$enable_string_hacks" = "xyes"; then @@ -3631,15 +3695,15 @@ cat >>confdefs.h <<\EOF #define USE_STRING_HACKS 1 EOF - { echo "$as_me:3634: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + { echo "$as_me:3698: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} - echo "$as_me:3636: checking for strlcat" >&5 + echo "$as_me:3700: checking for strlcat" >&5 echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 if test "${ac_cv_func_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3642 "configure" +#line 3706 "configure" #include "confdefs.h" #define strlcat autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -3670,16 +3734,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:3673: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3737: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3676: \$? = $ac_status" >&5 + echo "$as_me:3740: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:3679: \"$ac_try\"") >&5 + { (eval echo "$as_me:3743: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3682: \$? = $ac_status" >&5 + echo "$as_me:3746: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_strlcat=yes else @@ -3689,7 +3753,7 @@ ac_cv_func_strlcat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:3692: result: $ac_cv_func_strlcat" >&5 +echo "$as_me:3756: result: $ac_cv_func_strlcat" >&5 echo "${ECHO_T}$ac_cv_func_strlcat" >&6 if test "$ac_cv_func_strlcat" = yes; then @@ -3699,7 +3763,7 @@ EOF else - echo "$as_me:3702: checking for strlcat in -lbsd" >&5 + echo "$as_me:3766: checking for strlcat in -lbsd" >&5 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3707,7 +3771,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 3710 "configure" +#line 3774 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3726,16 +3790,16 @@ strlcat (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:3729: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3793: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3732: \$? = $ac_status" >&5 + echo "$as_me:3796: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:3735: \"$ac_try\"") >&5 + { (eval echo "$as_me:3799: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3738: \$? = $ac_status" >&5 + echo "$as_me:3802: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_strlcat=yes else @@ -3746,7 +3810,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3749: result: $ac_cv_lib_bsd_strlcat" >&5 +echo "$as_me:3813: result: $ac_cv_lib_bsd_strlcat" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 if test "$ac_cv_lib_bsd_strlcat" = yes; then @@ -3769,23 +3833,23 @@ LIBS="$cf_add_libs" for ac_header in bsd/string.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3772: checking for $ac_header" >&5 +echo "$as_me:3836: 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 3778 "configure" +#line 3842 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3782: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:3846: \"$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:3788: \$? = $ac_status" >&5 + echo "$as_me:3852: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3804,7 +3868,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:3807: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:3871: 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:3892: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3834 "configure" +#line 3898 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -3862,16 +3926,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:3865: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3929: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3868: \$? = $ac_status" >&5 + echo "$as_me:3932: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:3871: \"$ac_try\"") >&5 + { (eval echo "$as_me:3935: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3874: \$? = $ac_status" >&5 + echo "$as_me:3938: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -3881,7 +3945,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:3884: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:3948: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:3960: 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 3903 "configure" +#line 3967 "configure" #include "confdefs.h" #include int @@ -3919,16 +3983,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3922: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3986: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3925: \$? = $ac_status" >&5 + echo "$as_me:3989: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3928: \"$ac_try\"") >&5 + { (eval echo "$as_me:3992: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3931: \$? = $ac_status" >&5 + echo "$as_me:3995: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_visible=no else @@ -3939,7 +4003,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:3942: result: $cf_cv_posix_visible" >&5 +echo "$as_me:4006: result: $cf_cv_posix_visible" >&5 echo "${ECHO_T}$cf_cv_posix_visible" >&6 if test "$cf_cv_posix_visible" = no; then @@ -3980,18 +4044,18 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) +(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) cf_gnu_xopen_source=$cf_XOPEN_SOURCE -echo "$as_me:3987: checking if this is the GNU C library" >&5 +echo "$as_me:4051: 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 3994 "configure" +#line 4058 "configure" #include "confdefs.h" #include int @@ -4010,16 +4074,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4013: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4077: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4016: \$? = $ac_status" >&5 + echo "$as_me:4080: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4019: \"$ac_try\"") >&5 + { (eval echo "$as_me:4083: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4022: \$? = $ac_status" >&5 + echo "$as_me:4086: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library=yes else @@ -4030,7 +4094,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4033: result: $cf_cv_gnu_library" >&5 +echo "$as_me:4097: result: $cf_cv_gnu_library" >&5 echo "${ECHO_T}$cf_cv_gnu_library" >&6 if test x$cf_cv_gnu_library = xyes; then @@ -4038,7 +4102,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:4041: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo "$as_me:4105: 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 @@ -4050,7 +4114,7 @@ else CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 4053 "configure" +#line 4117 "configure" #include "confdefs.h" #include int @@ -4069,16 +4133,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4072: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4136: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4075: \$? = $ac_status" >&5 + echo "$as_me:4139: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4078: \"$ac_try\"") >&5 + { (eval echo "$as_me:4142: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4081: \$? = $ac_status" >&5 + echo "$as_me:4145: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library_219=yes else @@ -4090,12 +4154,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save" fi -echo "$as_me:4093: result: $cf_cv_gnu_library_219" >&5 +echo "$as_me:4157: 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:4098: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo "$as_me:4162: 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 @@ -4200,7 +4264,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 4203 "configure" +#line 4267 "configure" #include "confdefs.h" #include @@ -4220,16 +4284,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4223: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4287: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4226: \$? = $ac_status" >&5 + echo "$as_me:4290: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4229: \"$ac_try\"") >&5 + { (eval echo "$as_me:4293: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4232: \$? = $ac_status" >&5 + echo "$as_me:4296: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_dftsrc_219=yes else @@ -4240,7 +4304,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4243: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "$as_me:4307: 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 @@ -4249,14 +4313,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 if test "x$cf_cv_gnu_dftsrc_219" != xyes; then - echo "$as_me:4252: checking if we must define _GNU_SOURCE" >&5 + echo "$as_me:4316: 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 4259 "configure" +#line 4323 "configure" #include "confdefs.h" #include int @@ -4271,16 +4335,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4274: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4338: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4277: \$? = $ac_status" >&5 + echo "$as_me:4341: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4280: \"$ac_try\"") >&5 + { (eval echo "$as_me:4344: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4283: \$? = $ac_status" >&5 + echo "$as_me:4347: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -4387,7 +4451,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 4390 "configure" +#line 4454 "configure" #include "confdefs.h" #include int @@ -4402,16 +4466,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4405: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4469: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4408: \$? = $ac_status" >&5 + echo "$as_me:4472: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4411: \"$ac_try\"") >&5 + { (eval echo "$as_me:4475: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4414: \$? = $ac_status" >&5 + echo "$as_me:4478: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -4426,12 +4490,12 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4429: result: $cf_cv_gnu_source" >&5 +echo "$as_me:4493: 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:4434: checking if we should also define _DEFAULT_SOURCE" >&5 + echo "$as_me:4498: 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 @@ -4441,7 +4505,7 @@ else CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 4444 "configure" +#line 4508 "configure" #include "confdefs.h" #include int @@ -4456,16 +4520,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4459: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4523: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4462: \$? = $ac_status" >&5 + echo "$as_me:4526: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4465: \"$ac_try\"") >&5 + { (eval echo "$as_me:4529: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4468: \$? = $ac_status" >&5 + echo "$as_me:4532: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_default_source=no else @@ -4476,7 +4540,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4479: result: $cf_cv_default_source" >&5 +echo "$as_me:4543: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 if test "$cf_cv_default_source" = yes then @@ -4513,16 +4577,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:4516: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:4580: 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}:4522: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:4586: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 4525 "configure" +#line 4589 "configure" #include "confdefs.h" #include int @@ -4537,16 +4601,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4540: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4604: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4543: \$? = $ac_status" >&5 + echo "$as_me:4607: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4546: \"$ac_try\"") >&5 + { (eval echo "$as_me:4610: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4549: \$? = $ac_status" >&5 + echo "$as_me:4613: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -4567,7 +4631,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 4570 "configure" +#line 4634 "configure" #include "confdefs.h" #include int @@ -4582,16 +4646,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4585: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4649: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4588: \$? = $ac_status" >&5 + echo "$as_me:4652: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4591: \"$ac_try\"") >&5 + { (eval echo "$as_me:4655: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4594: \$? = $ac_status" >&5 + echo "$as_me:4658: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4602,7 +4666,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:4605: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:4669: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -4610,10 +4674,10 @@ echo "${as_me:-configure}:4605: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:4613: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:4677: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 4616 "configure" +#line 4680 "configure" #include "confdefs.h" #include int @@ -4628,16 +4692,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4631: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4695: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4634: \$? = $ac_status" >&5 + echo "$as_me:4698: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4637: \"$ac_try\"") >&5 + { (eval echo "$as_me:4701: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4640: \$? = $ac_status" >&5 + echo "$as_me:4704: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4653,7 +4717,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4656: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:4720: 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 @@ -4770,7 +4834,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:4773: WARNING: this system does not provide usable locale support" >&5 + { echo "$as_me:4837: 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 @@ -4802,14 +4866,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} ;; (*) -echo "$as_me:4805: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:4869: 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 4812 "configure" +#line 4876 "configure" #include "confdefs.h" #include @@ -4823,21 +4887,22 @@ main (void) #ifndef _XOPEN_SOURCE make an error #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4831: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4896: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4834: \$? = $ac_status" >&5 + echo "$as_me:4899: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4837: \"$ac_try\"") >&5 + { (eval echo "$as_me:4902: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4840: \$? = $ac_status" >&5 + echo "$as_me:4905: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -4849,7 +4914,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 4852 "configure" +#line 4917 "configure" #include "confdefs.h" #include @@ -4860,24 +4925,25 @@ int main (void) { -#ifdef _XOPEN_SOURCE +#ifndef _XOPEN_SOURCE make an error #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4871: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4937: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4874: \$? = $ac_status" >&5 + echo "$as_me:4940: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4877: \"$ac_try\"") >&5 + { (eval echo "$as_me:4943: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4880: \$? = $ac_status" >&5 + echo "$as_me:4946: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -4886,13 +4952,13 @@ cat "conftest.$ac_ext" >&5 cf_cv_xopen_source=$cf_XOPEN_SOURCE fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS="$cf_save" + CPPFLAGS="$cf_save" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4895: result: $cf_cv_xopen_source" >&5 +echo "$as_me:4961: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -4909,57 +4975,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) @@ -5052,8 +5097,12 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + fi + cf_save_xopen_cppflags="$CPPFLAGS" + if test "$cf_cv_posix_visible" = no; then cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE @@ -5069,16 +5118,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:5072: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:5121: 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}:5078: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:5127: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 5081 "configure" +#line 5130 "configure" #include "confdefs.h" #include int @@ -5093,16 +5142,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5096: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5145: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5099: \$? = $ac_status" >&5 + echo "$as_me:5148: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5102: \"$ac_try\"") >&5 + { (eval echo "$as_me:5151: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5105: \$? = $ac_status" >&5 + echo "$as_me:5154: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -5123,7 +5172,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 5126 "configure" +#line 5175 "configure" #include "confdefs.h" #include int @@ -5138,16 +5187,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5141: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5190: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5144: \$? = $ac_status" >&5 + echo "$as_me:5193: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5147: \"$ac_try\"") >&5 + { (eval echo "$as_me:5196: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5150: \$? = $ac_status" >&5 + echo "$as_me:5199: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5158,7 +5207,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:5161: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:5210: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -5166,10 +5215,10 @@ echo "${as_me:-configure}:5161: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:5169: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:5218: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 5172 "configure" +#line 5221 "configure" #include "confdefs.h" #include int @@ -5184,16 +5233,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5187: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5236: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5190: \$? = $ac_status" >&5 + echo "$as_me:5239: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5193: \"$ac_try\"") >&5 + { (eval echo "$as_me:5242: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5196: \$? = $ac_status" >&5 + echo "$as_me:5245: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5209,7 +5258,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5212: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:5261: 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 @@ -5318,6 +5367,53 @@ fi fi # cf_cv_posix_visible + # Some of these niche implementations use copy/paste, double-check... + test -n "$verbose" && echo " checking if _POSIX_C_SOURCE inteferes" 1>&6 + +echo "${as_me:-configure}:5373: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +#line 5376 "configure" +#include "confdefs.h" + +#include +#include +#include + +int +main (void) +{ + +#ifndef _XOPEN_SOURCE +make an error +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5396: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5399: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5402: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5405: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + { echo "$as_me:5412: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 +echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;} + CPPFLAGS="$cf_save_xopen_cppflags" +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" ;; esac @@ -5325,63 +5421,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}:5348: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5434: 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}:5372: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 - - CPPFLAGS="$cf_new_cflag" -fi +echo "${as_me:-configure}:5446: 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) @@ -5456,7 +5531,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}:5459: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:5534: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -5466,7 +5541,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}:5469: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:5544: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -5476,20 +5551,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}:5479: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:5554: 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:5489: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:5566: 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 5492 "configure" +#line 5569 "configure" #include "confdefs.h" #include int @@ -5504,16 +5581,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5507: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5584: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5510: \$? = $ac_status" >&5 + echo "$as_me:5587: \$? = $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:5590: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5516: \$? = $ac_status" >&5 + echo "$as_me:5593: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -5522,12 +5599,12 @@ cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:5525: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:5602: 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 5530 "configure" +#line 5607 "configure" #include "confdefs.h" #include int @@ -5542,16 +5619,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5545: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5622: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5548: \$? = $ac_status" >&5 + echo "$as_me:5625: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5551: \"$ac_try\"") >&5 + { (eval echo "$as_me:5628: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5554: \$? = $ac_status" >&5 + echo "$as_me:5631: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -5562,19 +5639,19 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_XOPEN_SOURCE_set_ok" = no then - { echo "$as_me:5565: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:5642: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:5570: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:5647: 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 5577 "configure" +#line 5654 "configure" #include "confdefs.h" #include @@ -5588,21 +5665,22 @@ main (void) #ifndef _XOPEN_SOURCE make an error #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5596: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5674: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5599: \$? = $ac_status" >&5 + echo "$as_me:5677: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5602: \"$ac_try\"") >&5 + { (eval echo "$as_me:5680: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5605: \$? = $ac_status" >&5 + echo "$as_me:5683: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -5614,7 +5692,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 5617 "configure" +#line 5695 "configure" #include "confdefs.h" #include @@ -5625,24 +5703,25 @@ int main (void) { -#ifdef _XOPEN_SOURCE +#ifndef _XOPEN_SOURCE make an error #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5636: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5715: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5639: \$? = $ac_status" >&5 + echo "$as_me:5718: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5642: \"$ac_try\"") >&5 + { (eval echo "$as_me:5721: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5645: \$? = $ac_status" >&5 + echo "$as_me:5724: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -5651,13 +5730,13 @@ cat "conftest.$ac_ext" >&5 cf_cv_xopen_source=$cf_XOPEN_SOURCE fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS="$cf_save" + CPPFLAGS="$cf_save" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5660: result: $cf_cv_xopen_source" >&5 +echo "$as_me:5739: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -5674,57 +5753,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) @@ -5817,13 +5875,15 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + fi fi fi fi # cf_cv_posix_visible -echo "$as_me:5826: checking for signal global datatype" >&5 +echo "$as_me:5886: checking for signal global datatype" >&5 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 if test "${cf_cv_sig_atomic_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5835,7 +5895,7 @@ else "int" do cat >"conftest.$ac_ext" <<_ACEOF -#line 5838 "configure" +#line 5898 "configure" #include "confdefs.h" #include @@ -5859,16 +5919,16 @@ signal(SIGINT, handler); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5862: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5922: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5865: \$? = $ac_status" >&5 + echo "$as_me:5925: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5868: \"$ac_try\"") >&5 + { (eval echo "$as_me:5928: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5871: \$? = $ac_status" >&5 + echo "$as_me:5931: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -5882,7 +5942,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5885: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:5945: result: $cf_cv_sig_atomic_t" >&5 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <&5 +echo "$as_me:5954: checking if SIGWINCH is defined" >&5 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 if test "${cf_cv_define_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5901 "configure" +#line 5961 "configure" #include "confdefs.h" #include @@ -5913,23 +5973,23 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5916: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5976: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5919: \$? = $ac_status" >&5 + echo "$as_me:5979: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5922: \"$ac_try\"") >&5 + { (eval echo "$as_me:5982: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5925: \$? = $ac_status" >&5 + echo "$as_me:5985: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_define_sigwinch=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 5932 "configure" +#line 5992 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -5947,16 +6007,16 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5950: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6010: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5953: \$? = $ac_status" >&5 + echo "$as_me:6013: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5956: \"$ac_try\"") >&5 + { (eval echo "$as_me:6016: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5959: \$? = $ac_status" >&5 + echo "$as_me:6019: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_define_sigwinch=maybe else @@ -5970,11 +6030,11 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5973: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:6033: result: $cf_cv_define_sigwinch" >&5 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 if test "$cf_cv_define_sigwinch" = maybe ; then -echo "$as_me:5977: checking for actual SIGWINCH definition" >&5 +echo "$as_me:6037: checking for actual SIGWINCH definition" >&5 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 if test "${cf_cv_fixup_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5985,7 +6045,7 @@ cf_sigwinch=32 while test "$cf_sigwinch" != 1 do cat >"conftest.$ac_ext" <<_ACEOF -#line 5988 "configure" +#line 6048 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -6007,16 +6067,16 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6010: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6070: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6013: \$? = $ac_status" >&5 + echo "$as_me:6073: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6016: \"$ac_try\"") >&5 + { (eval echo "$as_me:6076: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6019: \$? = $ac_status" >&5 + echo "$as_me:6079: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -6030,7 +6090,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`" done fi -echo "$as_me:6033: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:6093: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -6040,13 +6100,13 @@ fi # Checks for CODESET support. -echo "$as_me:6043: checking for nl_langinfo and CODESET" >&5 +echo "$as_me:6103: checking for nl_langinfo and CODESET" >&5 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6049 "configure" +#line 6109 "configure" #include "confdefs.h" #include int @@ -6058,16 +6118,16 @@ char* cs = nl_langinfo(CODESET); (void)cs } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6061: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6121: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6064: \$? = $ac_status" >&5 + echo "$as_me:6124: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6067: \"$ac_try\"") >&5 + { (eval echo "$as_me:6127: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6070: \$? = $ac_status" >&5 + echo "$as_me:6130: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then am_cv_langinfo_codeset=yes else @@ -6078,7 +6138,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:6081: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:6141: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test "$am_cv_langinfo_codeset" = yes; then @@ -6088,7 +6148,7 @@ EOF fi -echo "$as_me:6091: checking if you want to use pkg-config" >&5 +echo "$as_me:6151: checking if you want to use pkg-config" >&5 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 # Check whether --with-pkg-config or --without-pkg-config was given. @@ -6098,7 +6158,7 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:6101: result: $cf_pkg_config" >&5 +echo "$as_me:6161: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 case "$cf_pkg_config" in @@ -6110,7 +6170,7 @@ case "$cf_pkg_config" in if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:6113: checking for $ac_word" >&5 +echo "$as_me:6173: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6127,7 +6187,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:6130: found $ac_dir/$ac_word" >&5 + echo "$as_me:6190: found $ac_dir/$ac_word" >&5 break fi done @@ -6138,10 +6198,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:6141: result: $PKG_CONFIG" >&5 + echo "$as_me:6201: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:6144: result: no" >&5 + echo "$as_me:6204: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6150,7 +6210,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:6153: checking for $ac_word" >&5 +echo "$as_me:6213: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6167,7 +6227,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:6170: found $ac_dir/$ac_word" >&5 + echo "$as_me:6230: found $ac_dir/$ac_word" >&5 break fi done @@ -6179,10 +6239,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:6182: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:6242: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:6185: result: no" >&5 + echo "$as_me:6245: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6225,18 +6285,18 @@ case ".$PKG_CONFIG" in PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:6228: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:6288: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } ;; esac elif test "x$cf_pkg_config" != xno ; then - { echo "$as_me:6235: WARNING: pkg-config is not installed" >&5 + { echo "$as_me:6295: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi -echo "$as_me:6239: checking if you want to see long compiling messages" >&5 +echo "$as_me:6299: 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. @@ -6270,10 +6330,10 @@ else ECHO_CC='' fi; -echo "$as_me:6273: result: $enableval" >&5 +echo "$as_me:6333: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:6276: checking for ncurses wrap-prefix" >&5 +echo "$as_me:6336: checking for ncurses wrap-prefix" >&5 echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6 # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given. @@ -6283,10 +6343,10 @@ if test "${with_ncurses_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; -echo "$as_me:6286: result: $NCURSES_WRAP_PREFIX" >&5 +echo "$as_me:6346: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 -echo "$as_me:6289: checking if you want to check for wide-character functions" >&5 +echo "$as_me:6349: checking if you want to check for wide-character functions" >&5 echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -6303,10 +6363,10 @@ else cf_enable_widec=yes fi; -echo "$as_me:6306: result: $cf_enable_widec" >&5 +echo "$as_me:6366: result: $cf_enable_widec" >&5 echo "${ECHO_T}$cf_enable_widec" >&6 -echo "$as_me:6309: checking for specific curses-directory" >&5 +echo "$as_me:6369: 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. @@ -6316,7 +6376,7 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:6319: result: $cf_cv_curses_dir" >&5 +echo "$as_me:6379: 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" @@ -6347,7 +6407,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:6350: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:6410: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -6383,7 +6443,7 @@ if test -n "$cf_cv_curses_dir/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 6386 "configure" +#line 6446 "configure" #include "confdefs.h" #include int @@ -6395,16 +6455,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6398: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6458: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6401: \$? = $ac_status" >&5 + echo "$as_me:6461: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6404: \"$ac_try\"") >&5 + { (eval echo "$as_me:6464: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6407: \$? = $ac_status" >&5 + echo "$as_me:6467: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -6421,7 +6481,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}:6424: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6484: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6457,7 +6517,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}:6460: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6520: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6470,7 +6530,7 @@ fi cf_cv_screen=curses -echo "$as_me:6473: checking for specified curses library type" >&5 +echo "$as_me:6533: checking for specified curses library type" >&5 echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6 # Check whether --with-screen or --without-screen was given. @@ -6514,13 +6574,13 @@ fi; fi; fi; -echo "$as_me:6517: result: $cf_cv_screen" >&5 +echo "$as_me:6577: result: $cf_cv_screen" >&5 echo "${ECHO_T}$cf_cv_screen" >&6 case $cf_cv_screen in (curses|curses_*) -echo "$as_me:6523: checking for extra include directories" >&5 +echo "$as_me:6583: checking for extra include directories" >&5 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6 if test "${cf_cv_curses_incdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6546,7 +6606,7 @@ case "$host_os" in esac fi -echo "$as_me:6549: result: $cf_cv_curses_incdir" >&5 +echo "$as_me:6609: result: $cf_cv_curses_incdir" >&5 echo "${ECHO_T}$cf_cv_curses_incdir" >&6 if test "$cf_cv_curses_incdir" != no then @@ -6556,7 +6616,7 @@ then fi -echo "$as_me:6559: checking if we have identified curses headers" >&5 +echo "$as_me:6619: 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 @@ -6568,7 +6628,7 @@ for cf_header in \ curses.h ncurses/ncurses.h ncurses/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 6571 "configure" +#line 6631 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -6580,16 +6640,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6583: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6643: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6586: \$? = $ac_status" >&5 + echo "$as_me:6646: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6589: \"$ac_try\"") >&5 + { (eval echo "$as_me:6649: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6592: \$? = $ac_status" >&5 + echo "$as_me:6652: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -6600,11 +6660,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:6603: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:6663: 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:6607: error: No curses header-files found" >&5 + { { echo "$as_me:6667: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -6614,23 +6674,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:6617: checking for $ac_header" >&5 +echo "$as_me:6677: 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 6623 "configure" +#line 6683 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:6627: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6687: \"$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:6633: \$? = $ac_status" >&5 + echo "$as_me:6693: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6649,7 +6709,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6652: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:6712: 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:6722: 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 @@ -6677,7 +6737,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 6680 "configure" +#line 6740 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -6692,16 +6752,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6695: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6755: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6698: \$? = $ac_status" >&5 + echo "$as_me:6758: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6701: \"$ac_try\"") >&5 + { (eval echo "$as_me:6761: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6704: \$? = $ac_status" >&5 + echo "$as_me:6764: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -6717,7 +6777,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:6720: result: $cf_cv_term_header" >&5 +echo "$as_me:6780: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -6749,7 +6809,7 @@ EOF ;; esac -echo "$as_me:6752: checking for ncurses version" >&5 +echo "$as_me:6812: 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 @@ -6775,10 +6835,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:6778: \"$cf_try\"") >&5 + { (eval echo "$as_me:6838: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:6781: \$? = $ac_status" >&5 + echo "$as_me:6841: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -6788,7 +6848,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 6791 "configure" +#line 6851 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -6813,15 +6873,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:6816: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6876: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6819: \$? = $ac_status" >&5 + echo "$as_me:6879: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:6821: \"$ac_try\"") >&5 + { (eval echo "$as_me:6881: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6824: \$? = $ac_status" >&5 + echo "$as_me:6884: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -6835,17 +6895,17 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:6838: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:6898: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:6845: checking if we have identified curses libraries" >&5 +echo "$as_me:6905: checking if we have identified curses libraries" >&5 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 6848 "configure" +#line 6908 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6857,16 +6917,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6860: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6920: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6863: \$? = $ac_status" >&5 + echo "$as_me:6923: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6866: \"$ac_try\"") >&5 + { (eval echo "$as_me:6926: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6869: \$? = $ac_status" >&5 + echo "$as_me:6929: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -6875,13 +6935,13 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -echo "$as_me:6878: result: $cf_result" >&5 +echo "$as_me:6938: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then case "$host_os" in (freebsd*) - echo "$as_me:6884: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:6944: 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 @@ -6889,7 +6949,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6892 "configure" +#line 6952 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6908,16 +6968,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6911: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6971: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6914: \$? = $ac_status" >&5 + echo "$as_me:6974: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6917: \"$ac_try\"") >&5 + { (eval echo "$as_me:6977: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6920: \$? = $ac_status" >&5 + echo "$as_me:6980: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -6928,7 +6988,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6931: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:6991: 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 @@ -6958,7 +7018,7 @@ fi # term.h) for cur_colr if test "x$cf_cv_screen" = "xcurses_colr" then - echo "$as_me:6961: checking for initscr in -lcur_colr" >&5 + echo "$as_me:7021: checking for initscr in -lcur_colr" >&5 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6966,7 +7026,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcur_colr $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6969 "configure" +#line 7029 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6985,16 +7045,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6988: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7048: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6991: \$? = $ac_status" >&5 + echo "$as_me:7051: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6994: \"$ac_try\"") >&5 + { (eval echo "$as_me:7054: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6997: \$? = $ac_status" >&5 + echo "$as_me:7057: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_cur_colr_initscr=yes else @@ -7005,7 +7065,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7008: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "$as_me:7068: result: $ac_cv_lib_cur_colr_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 if test "$ac_cv_lib_cur_colr_initscr" = yes; then @@ -7029,7 +7089,7 @@ LIBS="$cf_add_libs" else - echo "$as_me:7032: checking for initscr in -lHcurses" >&5 + echo "$as_me:7092: checking for initscr in -lHcurses" >&5 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7037,7 +7097,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lHcurses $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7040 "configure" +#line 7100 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7056,16 +7116,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7059: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7119: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7062: \$? = $ac_status" >&5 + echo "$as_me:7122: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7065: \"$ac_try\"") >&5 + { (eval echo "$as_me:7125: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7068: \$? = $ac_status" >&5 + echo "$as_me:7128: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Hcurses_initscr=yes else @@ -7076,7 +7136,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7079: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "$as_me:7139: result: $ac_cv_lib_Hcurses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6 if test "$ac_cv_lib_Hcurses_initscr" = yes; then @@ -7134,7 +7194,7 @@ if test -n "/lib64" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7137: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7197: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7163,7 +7223,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7166: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7226: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7194,7 +7254,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7197: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7257: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7229,7 +7289,7 @@ if test -n "/usr/5lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7232: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7292: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7273,13 +7333,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then # because it may be needed to link the test-case for initscr. if test "x$cf_term_lib" = x then - echo "$as_me:7276: checking for tgoto" >&5 + echo "$as_me:7336: checking for tgoto" >&5 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6 if test "${ac_cv_func_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 7282 "configure" +#line 7342 "configure" #include "confdefs.h" #define tgoto autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -7310,16 +7370,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7313: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7373: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7316: \$? = $ac_status" >&5 + echo "$as_me:7376: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7319: \"$ac_try\"") >&5 + { (eval echo "$as_me:7379: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7322: \$? = $ac_status" >&5 + echo "$as_me:7382: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_tgoto=yes else @@ -7329,7 +7389,7 @@ ac_cv_func_tgoto=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:7332: result: $ac_cv_func_tgoto" >&5 +echo "$as_me:7392: result: $ac_cv_func_tgoto" >&5 echo "${ECHO_T}$ac_cv_func_tgoto" >&6 if test "$ac_cv_func_tgoto" = yes; then cf_term_lib=predefined @@ -7338,7 +7398,7 @@ else for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` -echo "$as_me:7341: checking for tgoto in -l$cf_term_lib" >&5 +echo "$as_me:7401: checking for tgoto in -l$cf_term_lib" >&5 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7346,7 +7406,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_term_lib $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7349 "configure" +#line 7409 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7365,16 +7425,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7368: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7428: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7371: \$? = $ac_status" >&5 + echo "$as_me:7431: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7374: \"$ac_try\"") >&5 + { (eval echo "$as_me:7434: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7377: \$? = $ac_status" >&5 + echo "$as_me:7437: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -7385,7 +7445,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7388: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:7448: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -7408,10 +7468,10 @@ fi do LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then - echo "$as_me:7411: checking if we can link with $cf_curs_lib library" >&5 + echo "$as_me:7471: checking if we can link with $cf_curs_lib library" >&5 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 7414 "configure" +#line 7474 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7423,16 +7483,16 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7426: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7486: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7429: \$? = $ac_status" >&5 + echo "$as_me:7489: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7432: \"$ac_try\"") >&5 + { (eval echo "$as_me:7492: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7435: \$? = $ac_status" >&5 + echo "$as_me:7495: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -7441,16 +7501,16 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:7444: result: $cf_result" >&5 + echo "$as_me:7504: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" = yes && break elif test "$cf_curs_lib" = "$cf_term_lib" ; then cf_result=no elif test "$cf_term_lib" != predefined ; then - echo "$as_me:7450: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + echo "$as_me:7510: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 7453 "configure" +#line 7513 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7462,16 +7522,16 @@ initscr(); tgoto((char *)0, 0, 0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7465: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7525: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7468: \$? = $ac_status" >&5 + echo "$as_me:7528: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7471: \"$ac_try\"") >&5 + { (eval echo "$as_me:7531: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7474: \$? = $ac_status" >&5 + echo "$as_me:7534: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=no else @@ -7480,7 +7540,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7483 "configure" +#line 7543 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7492,16 +7552,16 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7495: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7555: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7498: \$? = $ac_status" >&5 + echo "$as_me:7558: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7501: \"$ac_try\"") >&5 + { (eval echo "$as_me:7561: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7504: \$? = $ac_status" >&5 + echo "$as_me:7564: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -7513,13 +7573,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:7516: result: $cf_result" >&5 + echo "$as_me:7576: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" != error && break fi done fi - test "$cf_curs_lib" = unknown && { { echo "$as_me:7522: error: no curses library found" >&5 + test "$cf_curs_lib" = unknown && { { echo "$as_me:7582: error: no curses library found" >&5 echo "$as_me: error: no curses library found" >&2;} { (exit 1); exit 1; }; } fi @@ -7531,23 +7591,23 @@ fi for ac_header in wchar.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:7534: checking for $ac_header" >&5 +echo "$as_me:7594: 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 7540 "configure" +#line 7600 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:7544: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:7604: \"$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:7550: \$? = $ac_status" >&5 + echo "$as_me:7610: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7566,7 +7626,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:7569: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:7629: 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:7639: 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 @@ -7584,7 +7644,7 @@ else cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7587 "configure" +#line 7647 "configure" #include "confdefs.h" #include @@ -7602,16 +7662,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7605: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7665: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7608: \$? = $ac_status" >&5 + echo "$as_me:7668: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7611: \"$ac_try\"") >&5 + { (eval echo "$as_me:7671: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7614: \$? = $ac_status" >&5 + echo "$as_me:7674: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_utf8_lib=yes else @@ -7623,12 +7683,12 @@ cat "conftest.$ac_ext" >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:7626: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:7686: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7631 "configure" +#line 7691 "configure" #include "confdefs.h" #include @@ -7641,16 +7701,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7644: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7704: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7647: \$? = $ac_status" >&5 + echo "$as_me:7707: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7650: \"$ac_try\"") >&5 + { (eval echo "$as_me:7710: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7653: \$? = $ac_status" >&5 + echo "$as_me:7713: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -7664,7 +7724,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lutf8 $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7667 "configure" +#line 7727 "configure" #include "confdefs.h" #include @@ -7677,16 +7737,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7680: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7740: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7683: \$? = $ac_status" >&5 + echo "$as_me:7743: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7686: \"$ac_try\"") >&5 + { (eval echo "$as_me:7746: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7689: \$? = $ac_status" >&5 + echo "$as_me:7749: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -7703,9 +7763,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:7706: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:7766: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:7708: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:7768: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -7796,7 +7856,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}:7799: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7859: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -7804,7 +7864,7 @@ echo "${as_me:-configure}:7799: testing ... testing $cf_cv_header_path_utf8 ..." CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" cat >"conftest.$ac_ext" <<_ACEOF -#line 7807 "configure" +#line 7867 "configure" #include "confdefs.h" #include @@ -7817,21 +7877,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7820: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7880: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7823: \$? = $ac_status" >&5 + echo "$as_me:7883: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7826: \"$ac_try\"") >&5 + { (eval echo "$as_me:7886: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7829: \$? = $ac_status" >&5 + echo "$as_me:7889: \$? = $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}:7834: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7894: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -7849,7 +7909,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:7852: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:7912: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -7924,13 +7984,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}:7927: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7987: 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 7933 "configure" +#line 7993 "configure" #include "confdefs.h" #include @@ -7943,21 +8003,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7946: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8006: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7949: \$? = $ac_status" >&5 + echo "$as_me:8009: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7952: \"$ac_try\"") >&5 + { (eval echo "$as_me:8012: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7955: \$? = $ac_status" >&5 + echo "$as_me:8015: \$? = $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}:7960: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8020: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -7999,7 +8059,7 @@ fi fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:8002: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:8062: 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 @@ -8037,7 +8097,7 @@ if test -n "$cf_cv_header_path_utf8" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 8040 "configure" +#line 8100 "configure" #include "confdefs.h" #include int @@ -8049,16 +8109,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8052: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8112: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8055: \$? = $ac_status" >&5 + echo "$as_me:8115: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8058: \"$ac_try\"") >&5 + { (eval echo "$as_me:8118: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8061: \$? = $ac_status" >&5 + echo "$as_me:8121: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8075,7 +8135,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}:8078: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8138: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8111,7 +8171,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}:8114: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:8174: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -8141,13 +8201,13 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:8144: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:8204: 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:8147: result: yes" >&5 + echo "$as_me:8207: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:8150: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:8210: 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 @@ -8280,7 +8340,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 8283 "configure" +#line 8343 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8292,37 +8352,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8295: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8355: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8298: \$? = $ac_status" >&5 + echo "$as_me:8358: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8301: \"$ac_try\"") >&5 + { (eval echo "$as_me:8361: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8304: \$? = $ac_status" >&5 + echo "$as_me:8364: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 8310 "configure" +#line 8370 "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:8317: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8377: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8320: \$? = $ac_status" >&5 + echo "$as_me:8380: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:8322: \"$ac_try\"") >&5 + { (eval echo "$as_me:8382: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8325: \$? = $ac_status" >&5 + echo "$as_me:8385: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -8355,57 +8415,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) @@ -8498,6 +8537,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -8515,7 +8556,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 8518 "configure" +#line 8559 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8527,37 +8568,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8530: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8571: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8533: \$? = $ac_status" >&5 + echo "$as_me:8574: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8536: \"$ac_try\"") >&5 + { (eval echo "$as_me:8577: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8539: \$? = $ac_status" >&5 + echo "$as_me:8580: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 8545 "configure" +#line 8586 "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:8552: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8593: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8555: \$? = $ac_status" >&5 + echo "$as_me:8596: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:8557: \"$ac_try\"") >&5 + { (eval echo "$as_me:8598: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8560: \$? = $ac_status" >&5 + echo "$as_me:8601: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -8574,7 +8615,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:8577: result: $cf_have_ncuconfig" >&5 + echo "$as_me:8618: 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" @@ -8590,7 +8631,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:8593: checking for terminfo header" >&5 +echo "$as_me:8634: 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 @@ -8608,7 +8649,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 8611 "configure" +#line 8652 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -8623,16 +8664,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8626: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8667: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8629: \$? = $ac_status" >&5 + echo "$as_me:8670: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8632: \"$ac_try\"") >&5 + { (eval echo "$as_me:8673: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8635: \$? = $ac_status" >&5 + echo "$as_me:8676: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -8648,7 +8689,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8651: result: $cf_cv_term_header" >&5 +echo "$as_me:8692: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -8683,7 +8724,7 @@ esac fi else - echo "$as_me:8686: result: no" >&5 + echo "$as_me:8727: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -8699,7 +8740,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:8702: checking for $ac_word" >&5 +echo "$as_me:8743: 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 @@ -8714,7 +8755,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:8717: found $ac_dir/$ac_word" >&5 +echo "$as_me:8758: found $ac_dir/$ac_word" >&5 break done @@ -8722,10 +8763,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:8725: result: $NCURSES_CONFIG" >&5 + echo "$as_me:8766: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:8728: result: no" >&5 + echo "$as_me:8769: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8738,7 +8779,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:8741: checking for $ac_word" >&5 +echo "$as_me:8782: 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 @@ -8753,7 +8794,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:8756: found $ac_dir/$ac_word" >&5 +echo "$as_me:8797: found $ac_dir/$ac_word" >&5 break done @@ -8761,10 +8802,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:8764: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:8805: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:8767: result: no" >&5 + echo "$as_me:8808: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8779,57 +8820,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) @@ -8922,6 +8942,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -8940,7 +8962,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:8943: checking if we have identified curses headers" >&5 +echo "$as_me:8965: 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 @@ -8952,7 +8974,7 @@ for cf_header in \ curses.h $cf_cv_screen/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 8955 "configure" +#line 8977 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -8964,16 +8986,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8967: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8989: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8970: \$? = $ac_status" >&5 + echo "$as_me:8992: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8973: \"$ac_try\"") >&5 + { (eval echo "$as_me:8995: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8976: \$? = $ac_status" >&5 + echo "$as_me:8998: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -8984,11 +9006,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8987: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:9009: 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:8991: error: No curses header-files found" >&5 + { { echo "$as_me:9013: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -8998,23 +9020,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:9001: checking for $ac_header" >&5 +echo "$as_me:9023: 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 9007 "configure" +#line 9029 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:9011: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:9033: \"$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:9017: \$? = $ac_status" >&5 + echo "$as_me:9039: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9033,7 +9055,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:9036: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:9058: 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 9092 "configure" +#line 9114 "configure" #include "confdefs.h" #include int @@ -9101,16 +9123,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9104: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9126: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9107: \$? = $ac_status" >&5 + echo "$as_me:9129: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9110: \"$ac_try\"") >&5 + { (eval echo "$as_me:9132: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9113: \$? = $ac_status" >&5 + echo "$as_me:9135: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -9127,7 +9149,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}:9130: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9152: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9146,7 +9168,7 @@ fi } -echo "$as_me:9149: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:9171: 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 @@ -9158,7 +9180,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 9161 "configure" +#line 9183 "configure" #include "confdefs.h" #include <$cf_header> @@ -9182,16 +9204,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9185: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9207: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9188: \$? = $ac_status" >&5 + echo "$as_me:9210: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9191: \"$ac_try\"") >&5 + { (eval echo "$as_me:9213: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9194: \$? = $ac_status" >&5 + echo "$as_me:9216: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -9206,14 +9228,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:9209: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:9231: 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:9216: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:9238: 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 @@ -9334,7 +9356,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 9337 "configure" +#line 9359 "configure" #include "confdefs.h" #include int @@ -9346,16 +9368,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9349: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9371: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9352: \$? = $ac_status" >&5 + echo "$as_me:9374: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9355: \"$ac_try\"") >&5 + { (eval echo "$as_me:9377: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9358: \$? = $ac_status" >&5 + echo "$as_me:9380: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -9372,7 +9394,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}:9375: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9397: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9395,7 +9417,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 9398 "configure" +#line 9420 "configure" #include "confdefs.h" #include <$cf_header> @@ -9419,16 +9441,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9422: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9444: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9425: \$? = $ac_status" >&5 + echo "$as_me:9447: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9428: \"$ac_try\"") >&5 + { (eval echo "$as_me:9450: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9431: \$? = $ac_status" >&5 + echo "$as_me:9453: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -9449,12 +9471,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:9452: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9474: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:9457: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:9479: 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%/[^/]*$%%'` @@ -9490,7 +9512,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 9493 "configure" +#line 9515 "configure" #include "confdefs.h" #include int @@ -9502,16 +9524,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9505: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9527: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9508: \$? = $ac_status" >&5 + echo "$as_me:9530: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9511: \"$ac_try\"") >&5 + { (eval echo "$as_me:9533: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9514: \$? = $ac_status" >&5 + echo "$as_me:9536: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -9528,7 +9550,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}:9531: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9553: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9576,7 +9598,7 @@ EOF ;; esac -echo "$as_me:9579: checking for terminfo header" >&5 +echo "$as_me:9601: 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 @@ -9594,7 +9616,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 9597 "configure" +#line 9619 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -9609,16 +9631,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9612: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9634: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9615: \$? = $ac_status" >&5 + echo "$as_me:9637: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9618: \"$ac_try\"") >&5 + { (eval echo "$as_me:9640: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9621: \$? = $ac_status" >&5 + echo "$as_me:9643: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -9634,7 +9656,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:9637: result: $cf_cv_term_header" >&5 +echo "$as_me:9659: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -9672,7 +9694,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:9675: checking for ncurses version" >&5 +echo "$as_me:9697: 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 @@ -9698,10 +9720,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:9701: \"$cf_try\"") >&5 + { (eval echo "$as_me:9723: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:9704: \$? = $ac_status" >&5 + echo "$as_me:9726: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -9711,7 +9733,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 9714 "configure" +#line 9736 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -9736,15 +9758,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:9739: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9761: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9742: \$? = $ac_status" >&5 + echo "$as_me:9764: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:9744: \"$ac_try\"") >&5 + { (eval echo "$as_me:9766: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9747: \$? = $ac_status" >&5 + echo "$as_me:9769: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -9758,7 +9780,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:9761: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:9783: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -9771,7 +9793,7 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:9774: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:9796: 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 @@ -9779,7 +9801,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 9782 "configure" +#line 9804 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9798,16 +9820,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9801: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9823: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9804: \$? = $ac_status" >&5 + echo "$as_me:9826: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9807: \"$ac_try\"") >&5 + { (eval echo "$as_me:9829: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9810: \$? = $ac_status" >&5 + echo "$as_me:9832: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -9818,10 +9840,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9821: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:9843: 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:9824: checking for initscr in -lgpm" >&5 + echo "$as_me:9846: 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 @@ -9829,7 +9851,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 9832 "configure" +#line 9854 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9848,16 +9870,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9851: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9873: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9854: \$? = $ac_status" >&5 + echo "$as_me:9876: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9857: \"$ac_try\"") >&5 + { (eval echo "$as_me:9879: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9860: \$? = $ac_status" >&5 + echo "$as_me:9882: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -9868,7 +9890,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9871: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:9893: 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" @@ -9883,7 +9905,7 @@ case "$host_os" in # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:9886: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:9908: 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 @@ -9891,7 +9913,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 9894 "configure" +#line 9916 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9910,16 +9932,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9913: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9935: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9916: \$? = $ac_status" >&5 + echo "$as_me:9938: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9919: \"$ac_try\"") >&5 + { (eval echo "$as_me:9941: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9922: \$? = $ac_status" >&5 + echo "$as_me:9944: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -9930,7 +9952,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9933: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:9955: 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" @@ -9979,13 +10001,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:9982: checking for initscr" >&5 + echo "$as_me:10004: 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 9988 "configure" +#line 10010 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -10016,16 +10038,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10019: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10041: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10022: \$? = $ac_status" >&5 + echo "$as_me:10044: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10025: \"$ac_try\"") >&5 + { (eval echo "$as_me:10047: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10028: \$? = $ac_status" >&5 + echo "$as_me:10050: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -10035,18 +10057,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:10038: result: $ac_cv_func_initscr" >&5 +echo "$as_me:10060: 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:10045: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:10067: 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 10049 "configure" +#line 10071 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10058,25 +10080,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10061: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10083: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10064: \$? = $ac_status" >&5 + echo "$as_me:10086: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10067: \"$ac_try\"") >&5 + { (eval echo "$as_me:10089: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10070: \$? = $ac_status" >&5 + echo "$as_me:10092: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:10072: result: yes" >&5 + echo "$as_me:10094: 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:10079: result: no" >&5 +echo "$as_me:10101: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -10144,11 +10166,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:10147: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:10169: 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 10151 "configure" +#line 10173 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10160,25 +10182,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10163: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10185: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10166: \$? = $ac_status" >&5 + echo "$as_me:10188: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10169: \"$ac_try\"") >&5 + { (eval echo "$as_me:10191: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10172: \$? = $ac_status" >&5 + echo "$as_me:10194: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:10174: result: yes" >&5 + echo "$as_me:10196: 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:10181: result: no" >&5 +echo "$as_me:10203: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -10193,7 +10215,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:10196: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:10218: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -10201,7 +10223,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:10204: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:10226: 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 @@ -10211,7 +10233,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 10214 "configure" +#line 10236 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10223,23 +10245,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10226: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10248: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10229: \$? = $ac_status" >&5 + echo "$as_me:10251: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10232: \"$ac_try\"") >&5 + { (eval echo "$as_me:10254: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10235: \$? = $ac_status" >&5 + echo "$as_me:10257: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:10237: result: yes" >&5 + echo "$as_me:10259: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:10242: result: no" >&5 +echo "$as_me:10264: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -10264,13 +10286,13 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:10267: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:10289: 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:10270: result: yes" >&5 + echo "$as_me:10292: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:10273: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:10295: 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 @@ -10403,7 +10425,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 10406 "configure" +#line 10428 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10415,37 +10437,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10418: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10440: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10421: \$? = $ac_status" >&5 + echo "$as_me:10443: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10424: \"$ac_try\"") >&5 + { (eval echo "$as_me:10446: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10427: \$? = $ac_status" >&5 + echo "$as_me:10449: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 10433 "configure" +#line 10455 "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:10440: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10462: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10443: \$? = $ac_status" >&5 + echo "$as_me:10465: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:10445: \"$ac_try\"") >&5 + { (eval echo "$as_me:10467: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10448: \$? = $ac_status" >&5 + echo "$as_me:10470: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -10478,57 +10500,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) @@ -10621,6 +10622,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -10638,7 +10641,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 10641 "configure" +#line 10644 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10650,37 +10653,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10653: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10656: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10656: \$? = $ac_status" >&5 + echo "$as_me:10659: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10659: \"$ac_try\"") >&5 + { (eval echo "$as_me:10662: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10662: \$? = $ac_status" >&5 + echo "$as_me:10665: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 10668 "configure" +#line 10671 "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:10675: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10678: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10678: \$? = $ac_status" >&5 + echo "$as_me:10681: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:10680: \"$ac_try\"") >&5 + { (eval echo "$as_me:10683: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10683: \$? = $ac_status" >&5 + echo "$as_me:10686: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -10697,7 +10700,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:10700: result: $cf_have_ncuconfig" >&5 + echo "$as_me:10703: 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" @@ -10713,7 +10716,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:10716: checking for terminfo header" >&5 +echo "$as_me:10719: 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 @@ -10731,7 +10734,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 10734 "configure" +#line 10737 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -10746,16 +10749,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10749: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10752: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10752: \$? = $ac_status" >&5 + echo "$as_me:10755: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10755: \"$ac_try\"") >&5 + { (eval echo "$as_me:10758: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10758: \$? = $ac_status" >&5 + echo "$as_me:10761: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -10771,7 +10774,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:10774: result: $cf_cv_term_header" >&5 +echo "$as_me:10777: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -10806,7 +10809,7 @@ esac fi else - echo "$as_me:10809: result: no" >&5 + echo "$as_me:10812: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -10822,7 +10825,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:10825: checking for $ac_word" >&5 +echo "$as_me:10828: 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 @@ -10837,7 +10840,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:10840: found $ac_dir/$ac_word" >&5 +echo "$as_me:10843: found $ac_dir/$ac_word" >&5 break done @@ -10845,10 +10848,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:10848: result: $NCURSES_CONFIG" >&5 + echo "$as_me:10851: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:10851: result: no" >&5 + echo "$as_me:10854: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10861,7 +10864,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:10864: checking for $ac_word" >&5 +echo "$as_me:10867: 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 @@ -10876,7 +10879,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:10879: found $ac_dir/$ac_word" >&5 +echo "$as_me:10882: found $ac_dir/$ac_word" >&5 break done @@ -10884,10 +10887,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:10887: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:10890: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:10890: result: no" >&5 + echo "$as_me:10893: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10902,57 +10905,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) @@ -11045,6 +11027,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -11063,7 +11047,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:11066: checking if we have identified curses headers" >&5 +echo "$as_me:11050: 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 @@ -11075,7 +11059,7 @@ for cf_header in \ curses.h $cf_cv_screen/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 11078 "configure" +#line 11062 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -11087,16 +11071,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11090: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11074: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11093: \$? = $ac_status" >&5 + echo "$as_me:11077: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11096: \"$ac_try\"") >&5 + { (eval echo "$as_me:11080: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11099: \$? = $ac_status" >&5 + echo "$as_me:11083: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -11107,11 +11091,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:11110: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:11094: 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:11114: error: No curses header-files found" >&5 + { { echo "$as_me:11098: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -11121,23 +11105,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:11124: checking for $ac_header" >&5 +echo "$as_me:11108: 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 11130 "configure" +#line 11114 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:11134: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:11118: \"$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:11140: \$? = $ac_status" >&5 + echo "$as_me:11124: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11156,7 +11140,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:11159: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:11143: 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 11215 "configure" +#line 11199 "configure" #include "confdefs.h" #include int @@ -11224,16 +11208,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11227: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11211: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11230: \$? = $ac_status" >&5 + echo "$as_me:11214: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11233: \"$ac_try\"") >&5 + { (eval echo "$as_me:11217: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11236: \$? = $ac_status" >&5 + echo "$as_me:11220: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -11250,7 +11234,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}:11253: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11237: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -11269,7 +11253,7 @@ fi } -echo "$as_me:11272: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:11256: 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 @@ -11281,7 +11265,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 11284 "configure" +#line 11268 "configure" #include "confdefs.h" #include <$cf_header> @@ -11305,16 +11289,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11308: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11292: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11311: \$? = $ac_status" >&5 + echo "$as_me:11295: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11314: \"$ac_try\"") >&5 + { (eval echo "$as_me:11298: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11317: \$? = $ac_status" >&5 + echo "$as_me:11301: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -11329,14 +11313,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:11332: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:11316: 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:11339: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:11323: 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 @@ -11457,7 +11441,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 11460 "configure" +#line 11444 "configure" #include "confdefs.h" #include int @@ -11469,16 +11453,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11472: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11456: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11475: \$? = $ac_status" >&5 + echo "$as_me:11459: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11478: \"$ac_try\"") >&5 + { (eval echo "$as_me:11462: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11481: \$? = $ac_status" >&5 + echo "$as_me:11465: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -11495,7 +11479,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}:11498: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11482: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -11518,7 +11502,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 11521 "configure" +#line 11505 "configure" #include "confdefs.h" #include <$cf_header> @@ -11542,16 +11526,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11545: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11529: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11548: \$? = $ac_status" >&5 + echo "$as_me:11532: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11551: \"$ac_try\"") >&5 + { (eval echo "$as_me:11535: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11554: \$? = $ac_status" >&5 + echo "$as_me:11538: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -11572,12 +11556,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:11575: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11559: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:11580: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:11564: 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%/[^/]*$%%'` @@ -11613,7 +11597,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 11616 "configure" +#line 11600 "configure" #include "confdefs.h" #include int @@ -11625,16 +11609,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11628: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11612: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11631: \$? = $ac_status" >&5 + echo "$as_me:11615: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11634: \"$ac_try\"") >&5 + { (eval echo "$as_me:11618: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11637: \$? = $ac_status" >&5 + echo "$as_me:11621: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -11651,7 +11635,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}:11654: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11638: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -11699,7 +11683,7 @@ EOF ;; esac -echo "$as_me:11702: checking for terminfo header" >&5 +echo "$as_me:11686: 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 @@ -11717,7 +11701,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 11720 "configure" +#line 11704 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -11732,16 +11716,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11735: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11719: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11738: \$? = $ac_status" >&5 + echo "$as_me:11722: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11741: \"$ac_try\"") >&5 + { (eval echo "$as_me:11725: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11744: \$? = $ac_status" >&5 + echo "$as_me:11728: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -11757,7 +11741,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:11760: result: $cf_cv_term_header" >&5 +echo "$as_me:11744: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -11795,7 +11779,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:11798: checking for ncurses version" >&5 +echo "$as_me:11782: 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 @@ -11821,10 +11805,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:11824: \"$cf_try\"") >&5 + { (eval echo "$as_me:11808: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:11827: \$? = $ac_status" >&5 + echo "$as_me:11811: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -11834,7 +11818,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 11837 "configure" +#line 11821 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -11859,15 +11843,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:11862: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11846: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11865: \$? = $ac_status" >&5 + echo "$as_me:11849: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:11867: \"$ac_try\"") >&5 + { (eval echo "$as_me:11851: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11870: \$? = $ac_status" >&5 + echo "$as_me:11854: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -11881,7 +11865,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:11884: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:11868: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -11894,7 +11878,7 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:11897: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:11881: 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 @@ -11902,7 +11886,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11905 "configure" +#line 11889 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11921,16 +11905,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11924: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11908: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11927: \$? = $ac_status" >&5 + echo "$as_me:11911: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11930: \"$ac_try\"") >&5 + { (eval echo "$as_me:11914: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11933: \$? = $ac_status" >&5 + echo "$as_me:11917: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -11941,10 +11925,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11944: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:11928: 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:11947: checking for initscr in -lgpm" >&5 + echo "$as_me:11931: 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 @@ -11952,7 +11936,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11955 "configure" +#line 11939 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11971,16 +11955,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11974: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11958: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11977: \$? = $ac_status" >&5 + echo "$as_me:11961: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11980: \"$ac_try\"") >&5 + { (eval echo "$as_me:11964: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11983: \$? = $ac_status" >&5 + echo "$as_me:11967: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -11991,7 +11975,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11994: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:11978: 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" @@ -12006,7 +11990,7 @@ case "$host_os" in # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:12009: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:11993: 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 @@ -12014,7 +11998,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12017 "configure" +#line 12001 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12033,16 +12017,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12036: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12020: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12039: \$? = $ac_status" >&5 + echo "$as_me:12023: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12042: \"$ac_try\"") >&5 + { (eval echo "$as_me:12026: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12045: \$? = $ac_status" >&5 + echo "$as_me:12029: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -12053,7 +12037,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12056: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:12040: 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" @@ -12102,13 +12086,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:12105: checking for initscr" >&5 + echo "$as_me:12089: 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 12111 "configure" +#line 12095 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -12139,16 +12123,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12142: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12126: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12145: \$? = $ac_status" >&5 + echo "$as_me:12129: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12148: \"$ac_try\"") >&5 + { (eval echo "$as_me:12132: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12151: \$? = $ac_status" >&5 + echo "$as_me:12135: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -12158,18 +12142,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:12161: result: $ac_cv_func_initscr" >&5 +echo "$as_me:12145: 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:12168: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:12152: 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 12172 "configure" +#line 12156 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -12181,25 +12165,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12184: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12168: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12187: \$? = $ac_status" >&5 + echo "$as_me:12171: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12190: \"$ac_try\"") >&5 + { (eval echo "$as_me:12174: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12193: \$? = $ac_status" >&5 + echo "$as_me:12177: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:12195: result: yes" >&5 + echo "$as_me:12179: 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:12202: result: no" >&5 +echo "$as_me:12186: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -12267,11 +12251,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:12270: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:12254: 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 12274 "configure" +#line 12258 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -12283,25 +12267,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12286: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12270: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12289: \$? = $ac_status" >&5 + echo "$as_me:12273: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12292: \"$ac_try\"") >&5 + { (eval echo "$as_me:12276: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12295: \$? = $ac_status" >&5 + echo "$as_me:12279: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:12297: result: yes" >&5 + echo "$as_me:12281: 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:12304: result: no" >&5 +echo "$as_me:12288: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -12316,7 +12300,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:12319: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:12303: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -12324,7 +12308,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:12327: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:12311: 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 @@ -12334,7 +12318,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 12337 "configure" +#line 12321 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -12346,23 +12330,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12349: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12333: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12352: \$? = $ac_status" >&5 + echo "$as_me:12336: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12355: \"$ac_try\"") >&5 + { (eval echo "$as_me:12339: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12358: \$? = $ac_status" >&5 + echo "$as_me:12342: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:12360: result: yes" >&5 + echo "$as_me:12344: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:12365: result: no" >&5 +echo "$as_me:12349: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -12382,7 +12366,7 @@ fi ;; (pdcurses) - echo "$as_me:12385: checking for X" >&5 + echo "$as_me:12369: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -12486,17 +12470,17 @@ if test "$ac_x_includes" = no; then # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >"conftest.$ac_ext" <<_ACEOF -#line 12489 "configure" +#line 12473 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:12493: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:12477: \"$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:12499: \$? = $ac_status" >&5 + echo "$as_me:12483: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12529,7 +12513,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12532 "configure" +#line 12516 "configure" #include "confdefs.h" #include int @@ -12541,16 +12525,16 @@ XtMalloc (0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12544: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12528: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12547: \$? = $ac_status" >&5 + echo "$as_me:12531: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12550: \"$ac_try\"") >&5 + { (eval echo "$as_me:12534: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12553: \$? = $ac_status" >&5 + echo "$as_me:12537: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -12588,7 +12572,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:12591: result: $have_x" >&5 + echo "$as_me:12575: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -12598,7 +12582,7 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:12601: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:12585: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -12625,11 +12609,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:12628: checking whether -R must be followed by a space" >&5 + echo "$as_me:12612: checking whether -R must be followed by a space" >&5 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >"conftest.$ac_ext" <<_ACEOF -#line 12632 "configure" +#line 12616 "configure" #include "confdefs.h" int @@ -12641,16 +12625,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12644: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12628: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12647: \$? = $ac_status" >&5 + echo "$as_me:12631: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12650: \"$ac_try\"") >&5 + { (eval echo "$as_me:12634: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12653: \$? = $ac_status" >&5 + echo "$as_me:12637: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_nospace=yes else @@ -12660,13 +12644,13 @@ ac_R_nospace=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_nospace = yes; then - echo "$as_me:12663: result: no" >&5 + echo "$as_me:12647: result: no" >&5 echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" cat >"conftest.$ac_ext" <<_ACEOF -#line 12669 "configure" +#line 12653 "configure" #include "confdefs.h" int @@ -12678,16 +12662,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12681: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12665: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12684: \$? = $ac_status" >&5 + echo "$as_me:12668: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12687: \"$ac_try\"") >&5 + { (eval echo "$as_me:12671: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12690: \$? = $ac_status" >&5 + echo "$as_me:12674: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_space=yes else @@ -12697,11 +12681,11 @@ ac_R_space=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_space = yes; then - echo "$as_me:12700: result: yes" >&5 + echo "$as_me:12684: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:12704: result: neither works" >&5 + echo "$as_me:12688: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -12721,7 +12705,7 @@ echo "${ECHO_T}neither works" >&6 # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >"conftest.$ac_ext" <<_ACEOF -#line 12724 "configure" +#line 12708 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12740,22 +12724,22 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12743: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12727: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12746: \$? = $ac_status" >&5 + echo "$as_me:12730: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12749: \"$ac_try\"") >&5 + { (eval echo "$as_me:12733: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12752: \$? = $ac_status" >&5 + echo "$as_me:12736: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:12758: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:12742: checking for dnet_ntoa in -ldnet" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12763,7 +12747,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12766 "configure" +#line 12750 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12782,16 +12766,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12785: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12769: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12788: \$? = $ac_status" >&5 + echo "$as_me:12772: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12791: \"$ac_try\"") >&5 + { (eval echo "$as_me:12775: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12794: \$? = $ac_status" >&5 + echo "$as_me:12778: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -12802,14 +12786,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12805: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:12789: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:12812: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:12796: checking for dnet_ntoa in -ldnet_stub" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12817,7 +12801,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12820 "configure" +#line 12804 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12836,16 +12820,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12839: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12823: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12842: \$? = $ac_status" >&5 + echo "$as_me:12826: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12845: \"$ac_try\"") >&5 + { (eval echo "$as_me:12829: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12848: \$? = $ac_status" >&5 + echo "$as_me:12832: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -12856,7 +12840,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12859: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:12843: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" @@ -12875,13 +12859,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:12878: checking for gethostbyname" >&5 + echo "$as_me:12862: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 12884 "configure" +#line 12868 "configure" #include "confdefs.h" #define gethostbyname autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -12912,16 +12896,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12915: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12899: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12918: \$? = $ac_status" >&5 + echo "$as_me:12902: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12921: \"$ac_try\"") >&5 + { (eval echo "$as_me:12905: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12924: \$? = $ac_status" >&5 + echo "$as_me:12908: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gethostbyname=yes else @@ -12931,11 +12915,11 @@ ac_cv_func_gethostbyname=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:12934: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:12918: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:12938: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:12922: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12943,7 +12927,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12946 "configure" +#line 12930 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12962,16 +12946,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12965: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12949: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12968: \$? = $ac_status" >&5 + echo "$as_me:12952: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12971: \"$ac_try\"") >&5 + { (eval echo "$as_me:12955: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12974: \$? = $ac_status" >&5 + echo "$as_me:12958: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -12982,14 +12966,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12985: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:12969: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 if test "$ac_cv_lib_nsl_gethostbyname" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:12992: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:12976: checking for gethostbyname in -lbsd" >&5 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12997,7 +12981,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13000 "configure" +#line 12984 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13016,16 +13000,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13019: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13003: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13022: \$? = $ac_status" >&5 + echo "$as_me:13006: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13025: \"$ac_try\"") >&5 + { (eval echo "$as_me:13009: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13028: \$? = $ac_status" >&5 + echo "$as_me:13012: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -13036,7 +13020,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13039: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:13023: result: $ac_cv_lib_bsd_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 if test "$ac_cv_lib_bsd_gethostbyname" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" @@ -13052,13 +13036,13 @@ fi # variants that don't use the nameserver (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:13055: checking for connect" >&5 + echo "$as_me:13039: checking for connect" >&5 echo $ECHO_N "checking for connect... $ECHO_C" >&6 if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 13061 "configure" +#line 13045 "configure" #include "confdefs.h" #define connect autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -13089,16 +13073,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13092: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13076: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13095: \$? = $ac_status" >&5 + echo "$as_me:13079: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13098: \"$ac_try\"") >&5 + { (eval echo "$as_me:13082: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13101: \$? = $ac_status" >&5 + echo "$as_me:13085: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_connect=yes else @@ -13108,11 +13092,11 @@ ac_cv_func_connect=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:13111: result: $ac_cv_func_connect" >&5 +echo "$as_me:13095: result: $ac_cv_func_connect" >&5 echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo "$as_me:13115: checking for connect in -lsocket" >&5 + echo "$as_me:13099: checking for connect in -lsocket" >&5 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13120,7 +13104,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13123 "configure" +#line 13107 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13139,16 +13123,16 @@ connect (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13142: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13126: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13145: \$? = $ac_status" >&5 + echo "$as_me:13129: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13148: \"$ac_try\"") >&5 + { (eval echo "$as_me:13132: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13151: \$? = $ac_status" >&5 + echo "$as_me:13135: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_socket_connect=yes else @@ -13159,7 +13143,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13162: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:13146: result: $ac_cv_lib_socket_connect" >&5 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 if test "$ac_cv_lib_socket_connect" = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" @@ -13168,13 +13152,13 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:13171: checking for remove" >&5 + echo "$as_me:13155: checking for remove" >&5 echo $ECHO_N "checking for remove... $ECHO_C" >&6 if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 13177 "configure" +#line 13161 "configure" #include "confdefs.h" #define remove autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -13205,16 +13189,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13208: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13192: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13211: \$? = $ac_status" >&5 + echo "$as_me:13195: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13214: \"$ac_try\"") >&5 + { (eval echo "$as_me:13198: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13217: \$? = $ac_status" >&5 + echo "$as_me:13201: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_remove=yes else @@ -13224,11 +13208,11 @@ ac_cv_func_remove=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:13227: result: $ac_cv_func_remove" >&5 +echo "$as_me:13211: result: $ac_cv_func_remove" >&5 echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo "$as_me:13231: checking for remove in -lposix" >&5 + echo "$as_me:13215: checking for remove in -lposix" >&5 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13236,7 +13220,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13239 "configure" +#line 13223 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13255,16 +13239,16 @@ remove (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13258: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13242: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13261: \$? = $ac_status" >&5 + echo "$as_me:13245: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13264: \"$ac_try\"") >&5 + { (eval echo "$as_me:13248: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13267: \$? = $ac_status" >&5 + echo "$as_me:13251: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_posix_remove=yes else @@ -13275,7 +13259,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13278: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:13262: result: $ac_cv_lib_posix_remove" >&5 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 if test "$ac_cv_lib_posix_remove" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" @@ -13284,13 +13268,13 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:13287: checking for shmat" >&5 + echo "$as_me:13271: checking for shmat" >&5 echo $ECHO_N "checking for shmat... $ECHO_C" >&6 if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 13293 "configure" +#line 13277 "configure" #include "confdefs.h" #define shmat autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -13321,16 +13305,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13324: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13308: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13327: \$? = $ac_status" >&5 + echo "$as_me:13311: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13330: \"$ac_try\"") >&5 + { (eval echo "$as_me:13314: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13333: \$? = $ac_status" >&5 + echo "$as_me:13317: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_shmat=yes else @@ -13340,11 +13324,11 @@ ac_cv_func_shmat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:13343: result: $ac_cv_func_shmat" >&5 +echo "$as_me:13327: result: $ac_cv_func_shmat" >&5 echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo "$as_me:13347: checking for shmat in -lipc" >&5 + echo "$as_me:13331: checking for shmat in -lipc" >&5 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13352,7 +13336,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13355 "configure" +#line 13339 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13371,16 +13355,16 @@ shmat (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13374: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13358: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13377: \$? = $ac_status" >&5 + echo "$as_me:13361: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13380: \"$ac_try\"") >&5 + { (eval echo "$as_me:13364: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13383: \$? = $ac_status" >&5 + echo "$as_me:13367: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -13391,7 +13375,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13394: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:13378: result: $ac_cv_lib_ipc_shmat" >&5 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 if test "$ac_cv_lib_ipc_shmat" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" @@ -13409,7 +13393,7 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:13412: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:13396: checking for IceConnectionNumber in -lICE" >&5 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13417,7 +13401,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13420 "configure" +#line 13404 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13436,16 +13420,16 @@ IceConnectionNumber (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13439: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13423: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13442: \$? = $ac_status" >&5 + echo "$as_me:13426: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13445: \"$ac_try\"") >&5 + { (eval echo "$as_me:13429: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13448: \$? = $ac_status" >&5 + echo "$as_me:13432: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -13456,7 +13440,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13459: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:13443: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" @@ -13468,7 +13452,7 @@ fi cf_x_athena=${cf_x_athena:-Xaw} -echo "$as_me:13471: checking if you want to link with Xaw 3d library" >&5 +echo "$as_me:13455: checking if you want to link with Xaw 3d library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6 withval= @@ -13479,14 +13463,14 @@ if test "${with_Xaw3d+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$as_me:13482: result: yes" >&5 + echo "$as_me:13466: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:13485: result: no" >&5 + echo "$as_me:13469: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:13489: checking if you want to link with Xaw 3d xft library" >&5 +echo "$as_me:13473: checking if you want to link with Xaw 3d xft library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6 withval= @@ -13497,14 +13481,14 @@ if test "${with_Xaw3dxft+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3dxft - echo "$as_me:13500: result: yes" >&5 + echo "$as_me:13484: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:13503: result: no" >&5 + echo "$as_me:13487: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:13507: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:13491: checking if you want to link with neXT Athena library" >&5 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6 withval= @@ -13515,14 +13499,14 @@ if test "${with_neXtaw+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$as_me:13518: result: yes" >&5 + echo "$as_me:13502: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:13521: result: no" >&5 + echo "$as_me:13505: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:13525: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:13509: checking if you want to link with Athena-Plus library" >&5 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6 withval= @@ -13533,10 +13517,10 @@ if test "${with_XawPlus+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$as_me:13536: result: yes" >&5 + echo "$as_me:13520: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:13539: result: no" >&5 + echo "$as_me:13523: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -13556,17 +13540,17 @@ if test "$PKG_CONFIG" != none ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then test -n "$verbose" && echo " found package $cf_athena_pkg" 1>&6 -echo "${as_me:-configure}:13559: testing found package $cf_athena_pkg ..." 1>&5 +echo "${as_me:-configure}:13543: testing found package $cf_athena_pkg ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_athena_pkg" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "$cf_athena_pkg" 2>/dev/null`" test -n "$verbose" && echo " package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:13565: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:13549: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:13569: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:13553: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -13697,20 +13681,20 @@ EOF LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 -echo "${as_me:-configure}:13700: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:13684: testing ..trimmed $LIBS ..." 1>&5 ;; esac done -echo "$as_me:13706: checking for usable $cf_x_athena/Xmu package" >&5 +echo "$as_me:13690: checking for usable $cf_x_athena/Xmu package" >&5 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6 if test "${cf_cv_xaw_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 13713 "configure" +#line 13697 "configure" #include "confdefs.h" #include @@ -13727,16 +13711,16 @@ int check = XmuCompareISOLatin1("big", "small"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13730: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13714: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13733: \$? = $ac_status" >&5 + echo "$as_me:13717: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13736: \"$ac_try\"") >&5 + { (eval echo "$as_me:13720: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13739: \$? = $ac_status" >&5 + echo "$as_me:13723: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xaw_compat=yes else @@ -13746,7 +13730,7 @@ cf_cv_xaw_compat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:13749: result: $cf_cv_xaw_compat" >&5 +echo "$as_me:13733: result: $cf_cv_xaw_compat" >&5 echo "${ECHO_T}$cf_cv_xaw_compat" >&6 if test "$cf_cv_xaw_compat" = no @@ -13758,7 +13742,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6 (*) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:13761: testing work around broken package ..." 1>&5 +echo "${as_me:-configure}:13745: testing work around broken package ..." 1>&5 cf_save_xmu="$LIBS" cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'` @@ -13766,17 +13750,17 @@ echo "${as_me:-configure}:13761: testing work around broken package ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then test -n "$verbose" && echo " found package xmu" 1>&6 -echo "${as_me:-configure}:13769: testing found package xmu ..." 1>&5 +echo "${as_me:-configure}:13753: testing found package xmu ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xmu" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "xmu" 2>/dev/null`" test -n "$verbose" && echo " package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:13775: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:13759: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:13779: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:13763: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -13896,12 +13880,12 @@ LIBS="$cf_add_libs" test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:13899: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:13883: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:13904: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:13888: testing ...after $LIBS ..." 1>&5 else cf_pkgconfig_incs= @@ -13909,12 +13893,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:13912: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:13896: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:13917: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:13901: testing ...after $LIBS ..." 1>&5 fi @@ -13925,7 +13909,7 @@ fi LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 -echo "${as_me:-configure}:13928: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:13912: testing ..trimmed $LIBS ..." 1>&5 ;; esac @@ -13950,17 +13934,17 @@ if test -z "$cf_x_athena_lib" ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then test -n "$verbose" && echo " found package Xext" 1>&6 -echo "${as_me:-configure}:13953: testing found package Xext ..." 1>&5 +echo "${as_me:-configure}:13937: testing found package Xext ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "Xext" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "Xext" 2>/dev/null`" test -n "$verbose" && echo " package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:13959: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:13943: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:13963: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:13947: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14081,7 +14065,7 @@ else cf_pkgconfig_incs= cf_pkgconfig_libs= - echo "$as_me:14084: checking for XextCreateExtension in -lXext" >&5 + echo "$as_me:14068: checking for XextCreateExtension in -lXext" >&5 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14089,7 +14073,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 14092 "configure" +#line 14076 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14108,16 +14092,16 @@ XextCreateExtension (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14111: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14095: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14114: \$? = $ac_status" >&5 + echo "$as_me:14098: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14117: \"$ac_try\"") >&5 + { (eval echo "$as_me:14101: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14120: \$? = $ac_status" >&5 + echo "$as_me:14104: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -14128,7 +14112,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14131: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:14115: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then @@ -14164,17 +14148,17 @@ then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:14167: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:14151: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "x11" 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14173: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14157: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14177: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14161: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14294,24 +14278,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:14297: WARNING: unable to find X11 library" >&5 + { echo "$as_me:14281: WARNING: unable to find X11 library" >&5 echo "$as_me: WARNING: unable to find X11 library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:14304: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:14288: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "ice" 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14310: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14294: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14314: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14298: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14431,24 +14415,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:14434: WARNING: unable to find ICE library" >&5 + { echo "$as_me:14418: WARNING: unable to find ICE library" >&5 echo "$as_me: WARNING: unable to find ICE library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:14441: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:14425: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "sm" 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14447: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14431: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14451: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14435: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14568,24 +14552,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:14571: WARNING: unable to find SM library" >&5 + { echo "$as_me:14555: WARNING: unable to find SM library" >&5 echo "$as_me: WARNING: unable to find SM library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:14578: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:14562: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "xt" 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14584: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14568: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14588: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14572: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14705,7 +14689,7 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:14708: WARNING: unable to find Xt library" >&5 + { echo "$as_me:14692: WARNING: unable to find Xt library" >&5 echo "$as_me: WARNING: unable to find Xt library" >&2;} fi @@ -14718,17 +14702,17 @@ cf_have_X_LIBS=no if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:14721: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:14705: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "xt" 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14727: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14711: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14731: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14715: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14849,14 +14833,14 @@ LIBS="$cf_add_libs" ;; (*) # we have an "xt" package, but it may omit Xt's dependency on X11 -echo "$as_me:14852: checking for usable X dependency" >&5 +echo "$as_me:14836: checking for usable X dependency" >&5 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6 if test "${cf_cv_xt_x11_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14859 "configure" +#line 14843 "configure" #include "confdefs.h" #include @@ -14875,16 +14859,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14878: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14862: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14881: \$? = $ac_status" >&5 + echo "$as_me:14865: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14884: \"$ac_try\"") >&5 + { (eval echo "$as_me:14868: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14887: \$? = $ac_status" >&5 + echo "$as_me:14871: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xt_x11_compat=yes else @@ -14894,30 +14878,30 @@ cf_cv_xt_x11_compat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14897: result: $cf_cv_xt_x11_compat" >&5 +echo "$as_me:14881: result: $cf_cv_xt_x11_compat" >&5 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6 if test "$cf_cv_xt_x11_compat" = no then test -n "$verbose" && echo " work around broken X11 dependency" 1>&6 -echo "${as_me:-configure}:14903: testing work around broken X11 dependency ..." 1>&5 +echo "${as_me:-configure}:14887: testing work around broken X11 dependency ..." 1>&5 # 2010/11/19 - good enough until a working Xt on Xcb is delivered. if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:14910: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:14894: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "x11" 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14916: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14900: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14920: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14904: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -15040,12 +15024,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:15043: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:15027: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:15048: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:15032: testing ...after $LIBS ..." 1>&5 fi @@ -15053,14 +15037,14 @@ fi ;; esac -echo "$as_me:15056: checking for usable X Toolkit package" >&5 +echo "$as_me:15040: checking for usable X Toolkit package" >&5 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6 if test "${cf_cv_xt_ice_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15063 "configure" +#line 15047 "configure" #include "confdefs.h" #include @@ -15075,16 +15059,16 @@ int num = IceConnectionNumber(0); (void) num } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15078: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15062: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15081: \$? = $ac_status" >&5 + echo "$as_me:15065: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15084: \"$ac_try\"") >&5 + { (eval echo "$as_me:15068: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15087: \$? = $ac_status" >&5 + echo "$as_me:15071: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xt_ice_compat=yes else @@ -15094,7 +15078,7 @@ cf_cv_xt_ice_compat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15097: result: $cf_cv_xt_ice_compat" >&5 +echo "$as_me:15081: result: $cf_cv_xt_ice_compat" >&5 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 if test "$cf_cv_xt_ice_compat" = no @@ -15108,22 +15092,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 (*) test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 -echo "${as_me:-configure}:15111: testing work around broken ICE dependency ..." 1>&5 +echo "${as_me:-configure}:15095: testing work around broken ICE dependency ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:15116: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:15100: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "ice" 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:15122: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15106: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:15126: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15110: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -15242,17 +15226,17 @@ LIBS="$cf_add_libs" if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:15245: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:15229: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "sm" 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:15251: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15235: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:15255: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15239: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -15381,12 +15365,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:15384: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:15368: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:15389: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:15373: testing ...after $LIBS ..." 1>&5 fi @@ -15406,7 +15390,7 @@ else test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:15409: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15393: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -15491,7 +15475,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}:15494: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:15478: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -15501,7 +15485,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}:15504: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:15488: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -15511,7 +15495,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:15514: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:15498: 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" @@ -15520,7 +15504,7 @@ fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 15523 "configure" +#line 15507 "configure" #include "confdefs.h" #include int @@ -15532,16 +15516,16 @@ printf("Hello world"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15535: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15519: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15538: \$? = $ac_status" >&5 + echo "$as_me:15522: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15541: \"$ac_try\"") >&5 + { (eval echo "$as_me:15525: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15544: \$? = $ac_status" >&5 + echo "$as_me:15528: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -15549,12 +15533,12 @@ else cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:15552: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15536: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:15557: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:15541: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_cflags" @@ -15562,13 +15546,13 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi - echo "$as_me:15565: checking for XOpenDisplay" >&5 + echo "$as_me:15549: checking for XOpenDisplay" >&5 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6 if test "${ac_cv_func_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15571 "configure" +#line 15555 "configure" #include "confdefs.h" #define XOpenDisplay autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15599,16 +15583,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15602: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15586: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15605: \$? = $ac_status" >&5 + echo "$as_me:15589: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15608: \"$ac_try\"") >&5 + { (eval echo "$as_me:15592: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15611: \$? = $ac_status" >&5 + echo "$as_me:15595: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_XOpenDisplay=yes else @@ -15618,13 +15602,13 @@ ac_cv_func_XOpenDisplay=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15621: result: $ac_cv_func_XOpenDisplay" >&5 +echo "$as_me:15605: result: $ac_cv_func_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6 if test "$ac_cv_func_XOpenDisplay" = yes; then : else - echo "$as_me:15627: checking for XOpenDisplay in -lX11" >&5 + echo "$as_me:15611: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15632,7 +15616,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15635 "configure" +#line 15619 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15651,16 +15635,16 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15654: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15638: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15657: \$? = $ac_status" >&5 + echo "$as_me:15641: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15660: \"$ac_try\"") >&5 + { (eval echo "$as_me:15644: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15663: \$? = $ac_status" >&5 + echo "$as_me:15647: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -15671,7 +15655,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15674: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:15658: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then @@ -15695,13 +15679,13 @@ fi fi - echo "$as_me:15698: checking for XtAppInitialize" >&5 + echo "$as_me:15682: checking for XtAppInitialize" >&5 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6 if test "${ac_cv_func_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15704 "configure" +#line 15688 "configure" #include "confdefs.h" #define XtAppInitialize autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15732,16 +15716,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15735: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15719: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15738: \$? = $ac_status" >&5 + echo "$as_me:15722: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15741: \"$ac_try\"") >&5 + { (eval echo "$as_me:15725: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15744: \$? = $ac_status" >&5 + echo "$as_me:15728: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_XtAppInitialize=yes else @@ -15751,13 +15735,13 @@ ac_cv_func_XtAppInitialize=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15754: result: $ac_cv_func_XtAppInitialize" >&5 +echo "$as_me:15738: result: $ac_cv_func_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6 if test "$ac_cv_func_XtAppInitialize" = yes; then : else - echo "$as_me:15760: checking for XtAppInitialize in -lXt" >&5 + echo "$as_me:15744: checking for XtAppInitialize in -lXt" >&5 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15765,7 +15749,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15768 "configure" +#line 15752 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15784,16 +15768,16 @@ XtAppInitialize (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15787: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15771: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15790: \$? = $ac_status" >&5 + echo "$as_me:15774: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15793: \"$ac_try\"") >&5 + { (eval echo "$as_me:15777: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15796: \$? = $ac_status" >&5 + echo "$as_me:15780: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xt_XtAppInitialize=yes else @@ -15804,7 +15788,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15807: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "$as_me:15791: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6 if test "$ac_cv_lib_Xt_XtAppInitialize" = yes; then @@ -15821,7 +15805,7 @@ fi fi if test "$cf_have_X_LIBS" = no ; then - { echo "$as_me:15824: WARNING: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:15808: WARNING: Unable to successfully link X Toolkit library (-lXt) with test program. You will have to check and add the proper libraries by hand to makefile." >&5 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with @@ -15862,14 +15846,14 @@ done test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_path/include" - echo "$as_me:15865: checking for $cf_test in $cf_path" >&5 + echo "$as_me:15849: checking for $cf_test in $cf_path" >&5 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6 else - echo "$as_me:15868: checking for $cf_test" >&5 + echo "$as_me:15852: checking for $cf_test" >&5 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi cat >"conftest.$ac_ext" <<_ACEOF -#line 15872 "configure" +#line 15856 "configure" #include "confdefs.h" #include @@ -15883,16 +15867,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15886: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15870: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15889: \$? = $ac_status" >&5 + echo "$as_me:15873: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15892: \"$ac_try\"") >&5 + { (eval echo "$as_me:15876: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15895: \$? = $ac_status" >&5 + echo "$as_me:15879: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -15901,7 +15885,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:15904: result: $cf_result" >&5 + echo "$as_me:15888: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS" @@ -15917,7 +15901,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS" done if test -z "$cf_x_athena_inc" ; then - { echo "$as_me:15920: WARNING: Unable to find Athena header files" >&5 + { echo "$as_me:15904: WARNING: Unable to find Athena header files" >&5 echo "$as_me: WARNING: Unable to find Athena header files" >&2;} elif test "$cf_x_athena_inc" != default ; then @@ -15982,10 +15966,10 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - echo "$as_me:15985: checking for $cf_test in $cf_libs" >&5 + echo "$as_me:15969: checking for $cf_test in $cf_libs" >&5 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 15988 "configure" +#line 15972 "configure" #include "confdefs.h" #include @@ -16001,16 +15985,16 @@ $cf_test((XtAppContext) 0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16004: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15988: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16007: \$? = $ac_status" >&5 + echo "$as_me:15991: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16010: \"$ac_try\"") >&5 + { (eval echo "$as_me:15994: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16013: \$? = $ac_status" >&5 + echo "$as_me:15997: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -16019,7 +16003,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:16022: result: $cf_result" >&5 + echo "$as_me:16006: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS" @@ -16036,7 +16020,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS" done if test -z "$cf_x_athena_lib" ; then - { { echo "$as_me:16039: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + { { echo "$as_me:16023: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;} { (exit 1); exit 1; }; } fi @@ -16070,7 +16054,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:16073: checking for $ac_word" >&5 +echo "$as_me:16057: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16085,7 +16069,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:16088: found $ac_dir/$ac_word" >&5 +echo "$as_me:16072: found $ac_dir/$ac_word" >&5 break done @@ -16093,10 +16077,10 @@ fi fi XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG if test -n "$XCURSES_CONFIG"; then - echo "$as_me:16096: result: $XCURSES_CONFIG" >&5 + echo "$as_me:16080: result: $XCURSES_CONFIG" >&5 echo "${ECHO_T}$XCURSES_CONFIG" >&6 else - echo "$as_me:16099: result: no" >&5 + echo "$as_me:16083: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -16109,7 +16093,7 @@ if test -z "$XCURSES_CONFIG"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:16112: checking for $ac_word" >&5 +echo "$as_me:16096: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16124,7 +16108,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_XCURSES_CONFIG="$ac_prog" -echo "$as_me:16127: found $ac_dir/$ac_word" >&5 +echo "$as_me:16111: found $ac_dir/$ac_word" >&5 break done @@ -16132,10 +16116,10 @@ fi fi ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG if test -n "$ac_ct_XCURSES_CONFIG"; then - echo "$as_me:16135: result: $ac_ct_XCURSES_CONFIG" >&5 + echo "$as_me:16119: result: $ac_ct_XCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6 else - echo "$as_me:16138: result: no" >&5 + echo "$as_me:16122: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -16270,7 +16254,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:16273: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:16257: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -16355,7 +16339,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}:16358: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:16342: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -16365,7 +16349,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}:16368: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:16352: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -16375,7 +16359,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:16378: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:16362: 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" @@ -16384,7 +16368,7 @@ fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 16387 "configure" +#line 16371 "configure" #include "confdefs.h" #include int @@ -16396,16 +16380,16 @@ printf("Hello world"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16399: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16383: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16402: \$? = $ac_status" >&5 + echo "$as_me:16386: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16405: \"$ac_try\"") >&5 + { (eval echo "$as_me:16389: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16408: \$? = $ac_status" >&5 + echo "$as_me:16392: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -16413,12 +16397,12 @@ else cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:16416: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:16400: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:16421: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:16405: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_cflags" @@ -16426,7 +16410,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16429: checking for XOpenDisplay in -lX11" >&5 +echo "$as_me:16413: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16434,7 +16418,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16437 "configure" +#line 16421 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16453,16 +16437,16 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16456: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16440: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16459: \$? = $ac_status" >&5 + echo "$as_me:16443: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16462: \"$ac_try\"") >&5 + { (eval echo "$as_me:16446: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16465: \$? = $ac_status" >&5 + echo "$as_me:16449: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -16473,7 +16457,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16476: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:16460: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then @@ -16495,7 +16479,7 @@ LIBS="$cf_add_libs" fi -echo "$as_me:16498: checking for XCurses library" >&5 +echo "$as_me:16482: checking for XCurses library" >&5 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6 if test "${cf_cv_lib_XCurses+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16518,7 +16502,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 16521 "configure" +#line 16505 "configure" #include "confdefs.h" #include @@ -16533,16 +16517,16 @@ XCursesExit(); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16536: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16520: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16539: \$? = $ac_status" >&5 + echo "$as_me:16523: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16542: \"$ac_try\"") >&5 + { (eval echo "$as_me:16526: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16545: \$? = $ac_status" >&5 + echo "$as_me:16529: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_lib_XCurses=yes else @@ -16553,7 +16537,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16556: result: $cf_cv_lib_XCurses" >&5 +echo "$as_me:16540: result: $cf_cv_lib_XCurses" >&5 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6 fi @@ -16568,23 +16552,23 @@ cat >>confdefs.h <<\EOF #define XCURSES 1 EOF - echo "$as_me:16571: checking for xcurses.h" >&5 + echo "$as_me:16555: checking for xcurses.h" >&5 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6 if test "${ac_cv_header_xcurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16577 "configure" +#line 16561 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:16581: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:16565: \"$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:16587: \$? = $ac_status" >&5 + echo "$as_me:16571: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16603,7 +16587,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:16606: result: $ac_cv_header_xcurses_h" >&5 +echo "$as_me:16590: result: $ac_cv_header_xcurses_h" >&5 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6 if test "$ac_cv_header_xcurses_h" = yes; then @@ -16614,14 +16598,14 @@ EOF fi else - { { echo "$as_me:16617: error: Cannot link with XCurses" >&5 + { { echo "$as_me:16601: error: Cannot link with XCurses" >&5 echo "$as_me: error: Cannot link with XCurses" >&2;} { (exit 1); exit 1; }; } fi ;; (*) - { { echo "$as_me:16624: error: unexpected screen-value: $cf_cv_screen" >&5 + { { echo "$as_me:16608: error: unexpected screen-value: $cf_cv_screen" >&5 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;} { (exit 1); exit 1; }; } ;; @@ -16629,7 +16613,7 @@ esac : ${cf_nculib_root:=$cf_cv_screen} as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh` -echo "$as_me:16632: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5 +echo "$as_me:16616: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16637,7 +16621,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_nculib_root $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16640 "configure" +#line 16624 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16656,16 +16640,16 @@ _nc_init_pthreads (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16659: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16643: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16662: \$? = $ac_status" >&5 + echo "$as_me:16646: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16665: \"$ac_try\"") >&5 + { (eval echo "$as_me:16649: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16668: \$? = $ac_status" >&5 + echo "$as_me:16652: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -16676,7 +16660,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16679: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:16663: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then cf_cv_ncurses_pthreads=yes @@ -16711,7 +16695,7 @@ case $cf_cv_screen in ;; esac -echo "$as_me:16714: checking for X11 rgb file" >&5 +echo "$as_me:16698: checking for X11 rgb file" >&5 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6 # Check whether --with-x11-rgb or --without-x11-rgb was given. @@ -16775,7 +16759,7 @@ case ".$cf_path" in cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:16778: error: expected a pathname, not \"$cf_path\"" >&5 + { { echo "$as_me:16762: error: expected a pathname, not \"$cf_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -16783,7 +16767,7 @@ esac fi -echo "$as_me:16786: result: $RGB_PATH" >&5 +echo "$as_me:16770: result: $RGB_PATH" >&5 echo "${ECHO_T}$RGB_PATH" >&6 cat >>confdefs.h <&5 +echo "$as_me:16811: checking for desired basename for form library" >&5 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6 # Check whether --with-form-libname or --without-form-libname was given. @@ -16844,10 +16828,10 @@ case "x$FORM_NAME" in ;; esac -echo "$as_me:16847: result: $FORM_NAME" >&5 +echo "$as_me:16831: result: $FORM_NAME" >&5 echo "${ECHO_T}$FORM_NAME" >&6 -echo "$as_me:16850: checking for desired basename for menu library" >&5 +echo "$as_me:16834: checking for desired basename for menu library" >&5 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6 # Check whether --with-menu-libname or --without-menu-libname was given. @@ -16867,10 +16851,10 @@ case "x$MENU_NAME" in ;; esac -echo "$as_me:16870: result: $MENU_NAME" >&5 +echo "$as_me:16854: result: $MENU_NAME" >&5 echo "${ECHO_T}$MENU_NAME" >&6 -echo "$as_me:16873: checking for desired basename for panel library" >&5 +echo "$as_me:16857: checking for desired basename for panel library" >&5 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6 # Check whether --with-panel-libname or --without-panel-libname was given. @@ -16890,10 +16874,10 @@ case "x$PANEL_NAME" in ;; esac -echo "$as_me:16893: result: $PANEL_NAME" >&5 +echo "$as_me:16877: result: $PANEL_NAME" >&5 echo "${ECHO_T}$PANEL_NAME" >&6 -echo "$as_me:16896: checking if you want to check for panel functions" >&5 +echo "$as_me:16880: checking if you want to check for panel functions" >&5 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6 # Check whether --enable-panel or --disable-panel was given. @@ -16910,7 +16894,7 @@ else cf_enable_panel=$cf_default_panel fi; -echo "$as_me:16913: result: $cf_enable_panel" >&5 +echo "$as_me:16897: result: $cf_enable_panel" >&5 echo "${ECHO_T}$cf_enable_panel" >&6 if test $cf_enable_panel = yes then @@ -16921,24 +16905,51 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:16924: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5 + echo "$as_me:16908: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6 if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then - echo "$as_me:16927: result: yes" >&5 + echo "$as_me:16911: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:16930: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5 + echo "$as_me:16914: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" +for cf_add_cflags in `$PKG_CONFIG --cflags "$PANEL_NAME$cf_cv_libtype"` +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$PKG_CONFIG --cflags "$PANEL_NAME$cf_cv_libtype"` +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -17031,6 +17042,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -17048,7 +17061,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 17051 "configure" +#line 17064 "configure" #include "confdefs.h" #include <$PANEL_NAME.h> int @@ -17060,37 +17073,37 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17063: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17076: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17066: \$? = $ac_status" >&5 + echo "$as_me:17079: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17069: \"$ac_try\"") >&5 + { (eval echo "$as_me:17082: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17072: \$? = $ac_status" >&5 + echo "$as_me:17085: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 17078 "configure" +#line 17091 "configure" #include "confdefs.h" #include <$PANEL_NAME.h> int main(void) { (void) new_panel ( 0 ); return 0; } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:17085: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17098: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17088: \$? = $ac_status" >&5 + echo "$as_me:17101: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:17090: \"$ac_try\"") >&5 + { (eval echo "$as_me:17103: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17093: \$? = $ac_status" >&5 + echo "$as_me:17106: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_curses_lib=yes else @@ -17107,14 +17120,11 @@ cat "conftest.$ac_ext" >&5 cf_have_curses_lib=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:17110: result: $cf_have_curses_lib" >&5 + echo "$as_me:17123: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes - if test "$cf_have_curses_lib" != "yes" + if test "$cf_have_curses_lib" = "yes" then - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - else cf_upper=`echo "have_lib$PANEL_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -17122,12 +17132,16 @@ cf_upper=`echo "have_lib$PANEL_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDE #define $cf_upper 1 EOF + else + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" fi fi fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh` -echo "$as_me:17130: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5 +echo "$as_me:17144: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17135,7 +17149,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$PANEL_NAME$cf_cv_libtype $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17138 "configure" +#line 17152 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17154,16 +17168,16 @@ new_panel (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17157: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17171: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17160: \$? = $ac_status" >&5 + echo "$as_me:17174: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17163: \"$ac_try\"") >&5 + { (eval echo "$as_me:17177: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17166: \$? = $ac_status" >&5 + echo "$as_me:17180: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -17174,7 +17188,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17177: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:17191: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -17207,7 +17221,7 @@ fi cf_curses_headers="$cf_curses_headers panel.h" fi -echo "$as_me:17210: checking if you want to check for menu functions" >&5 +echo "$as_me:17224: checking if you want to check for menu functions" >&5 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6 # Check whether --enable-menu or --disable-menu was given. @@ -17224,7 +17238,7 @@ else cf_enable_menu=$cf_default_menu fi; -echo "$as_me:17227: result: $cf_enable_menu" >&5 +echo "$as_me:17241: result: $cf_enable_menu" >&5 echo "${ECHO_T}$cf_enable_menu" >&6 if test $cf_enable_menu = yes then @@ -17233,14 +17247,14 @@ then ;; (curses*) -echo "$as_me:17236: checking for NetBSD menu.h" >&5 +echo "$as_me:17250: checking for NetBSD menu.h" >&5 echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6 if test "${cf_cv_netbsd_menu_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17243 "configure" +#line 17257 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -17258,16 +17272,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17261: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17275: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17264: \$? = $ac_status" >&5 + echo "$as_me:17278: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17267: \"$ac_try\"") >&5 + { (eval echo "$as_me:17281: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17270: \$? = $ac_status" >&5 + echo "$as_me:17284: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_netbsd_menu_h=yes @@ -17279,7 +17293,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17282: result: $cf_cv_netbsd_menu_h" >&5 +echo "$as_me:17296: result: $cf_cv_netbsd_menu_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6 test "$cf_cv_netbsd_menu_h" = yes && @@ -17296,24 +17310,51 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:17299: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5 + echo "$as_me:17313: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6 if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then - echo "$as_me:17302: result: yes" >&5 + echo "$as_me:17316: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:17305: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5 + echo "$as_me:17319: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" +for cf_add_cflags in `$PKG_CONFIG --cflags "$MENU_NAME$cf_cv_libtype"` +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$PKG_CONFIG --cflags "$MENU_NAME$cf_cv_libtype"` +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -17406,6 +17447,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -17423,7 +17466,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 17426 "configure" +#line 17469 "configure" #include "confdefs.h" #include <$MENU_NAME.h> int @@ -17435,37 +17478,37 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17438: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17481: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17441: \$? = $ac_status" >&5 + echo "$as_me:17484: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17444: \"$ac_try\"") >&5 + { (eval echo "$as_me:17487: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17447: \$? = $ac_status" >&5 + echo "$as_me:17490: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 17453 "configure" +#line 17496 "configure" #include "confdefs.h" #include <$MENU_NAME.h> int main(void) { (void) menu_driver ( 0,0 ); return 0; } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:17460: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17503: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17463: \$? = $ac_status" >&5 + echo "$as_me:17506: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:17465: \"$ac_try\"") >&5 + { (eval echo "$as_me:17508: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17468: \$? = $ac_status" >&5 + echo "$as_me:17511: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_curses_lib=yes else @@ -17482,14 +17525,11 @@ cat "conftest.$ac_ext" >&5 cf_have_curses_lib=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:17485: result: $cf_have_curses_lib" >&5 + echo "$as_me:17528: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes - if test "$cf_have_curses_lib" != "yes" + if test "$cf_have_curses_lib" = "yes" then - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - else cf_upper=`echo "have_lib$MENU_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -17497,12 +17537,16 @@ cf_upper=`echo "have_lib$MENU_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEF #define $cf_upper 1 EOF + else + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" fi fi fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh` -echo "$as_me:17505: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5 +echo "$as_me:17549: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17510,7 +17554,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$MENU_NAME$cf_cv_libtype $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17513 "configure" +#line 17557 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17529,16 +17573,16 @@ menu_driver (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17532: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17576: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17535: \$? = $ac_status" >&5 + echo "$as_me:17579: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17538: \"$ac_try\"") >&5 + { (eval echo "$as_me:17582: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17541: \$? = $ac_status" >&5 + echo "$as_me:17585: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -17549,7 +17593,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17552: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:17596: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -17582,7 +17626,7 @@ fi cf_curses_headers="$cf_curses_headers menu.h" fi -echo "$as_me:17585: checking if you want to check for form functions" >&5 +echo "$as_me:17629: checking if you want to check for form functions" >&5 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6 # Check whether --enable-form or --disable-form was given. @@ -17599,7 +17643,7 @@ else cf_enable_form=$cf_default_form fi; -echo "$as_me:17602: result: $cf_enable_form" >&5 +echo "$as_me:17646: result: $cf_enable_form" >&5 echo "${ECHO_T}$cf_enable_form" >&6 if test $cf_enable_form = yes then @@ -17608,14 +17652,14 @@ then ;; (curses*) -echo "$as_me:17611: checking for NetBSD form.h" >&5 +echo "$as_me:17655: checking for NetBSD form.h" >&5 echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6 if test "${cf_cv_netbsd_form_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17618 "configure" +#line 17662 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -17634,16 +17678,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17637: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17681: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17640: \$? = $ac_status" >&5 + echo "$as_me:17684: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17643: \"$ac_try\"") >&5 + { (eval echo "$as_me:17687: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17646: \$? = $ac_status" >&5 + echo "$as_me:17690: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_netbsd_form_h=yes @@ -17655,7 +17699,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17658: result: $cf_cv_netbsd_form_h" >&5 +echo "$as_me:17702: result: $cf_cv_netbsd_form_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6 test "$cf_cv_netbsd_form_h" = yes && @@ -17672,24 +17716,51 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:17675: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5 + echo "$as_me:17719: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6 if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then - echo "$as_me:17678: result: yes" >&5 + echo "$as_me:17722: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:17681: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5 + echo "$as_me:17725: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" +for cf_add_cflags in `$PKG_CONFIG --cflags "$FORM_NAME$cf_cv_libtype"` +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$PKG_CONFIG --cflags "$FORM_NAME$cf_cv_libtype"` +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -17782,6 +17853,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -17799,7 +17872,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 17802 "configure" +#line 17875 "configure" #include "confdefs.h" #include <$FORM_NAME.h> int @@ -17811,37 +17884,37 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17814: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17887: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17817: \$? = $ac_status" >&5 + echo "$as_me:17890: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17820: \"$ac_try\"") >&5 + { (eval echo "$as_me:17893: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17823: \$? = $ac_status" >&5 + echo "$as_me:17896: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 17829 "configure" +#line 17902 "configure" #include "confdefs.h" #include <$FORM_NAME.h> int main(void) { (void) form_driver ( 0,0 ); return 0; } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:17836: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17909: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17839: \$? = $ac_status" >&5 + echo "$as_me:17912: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:17841: \"$ac_try\"") >&5 + { (eval echo "$as_me:17914: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17844: \$? = $ac_status" >&5 + echo "$as_me:17917: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_curses_lib=yes else @@ -17858,14 +17931,11 @@ cat "conftest.$ac_ext" >&5 cf_have_curses_lib=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:17861: result: $cf_have_curses_lib" >&5 + echo "$as_me:17934: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes - if test "$cf_have_curses_lib" != "yes" + if test "$cf_have_curses_lib" = "yes" then - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - else cf_upper=`echo "have_lib$FORM_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -17873,12 +17943,16 @@ cf_upper=`echo "have_lib$FORM_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEF #define $cf_upper 1 EOF + else + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" fi fi fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh` -echo "$as_me:17881: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5 +echo "$as_me:17955: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17886,7 +17960,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$FORM_NAME$cf_cv_libtype $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17889 "configure" +#line 17963 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17905,16 +17979,16 @@ form_driver (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17908: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17982: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17911: \$? = $ac_status" >&5 + echo "$as_me:17985: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17914: \"$ac_try\"") >&5 + { (eval echo "$as_me:17988: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17917: \$? = $ac_status" >&5 + echo "$as_me:17991: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -17925,7 +17999,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17928: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:18002: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -17963,23 +18037,23 @@ fi for ac_header in $cf_curses_headers do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:17966: checking for $ac_header" >&5 +echo "$as_me:18040: 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 17972 "configure" +#line 18046 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17976: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18050: \"$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:17982: \$? = $ac_status" >&5 + echo "$as_me:18056: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17998,7 +18072,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:18001: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18075: 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:18085: 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 18017 "configure" +#line 18091 "configure" #include "confdefs.h" #include #include @@ -18022,13 +18096,13 @@ else #include _ACEOF -if { (eval echo "$as_me:18025: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18099: \"$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:18031: \$? = $ac_status" >&5 + echo "$as_me:18105: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18050,7 +18124,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 18053 "configure" +#line 18127 "configure" #include "confdefs.h" #include @@ -18068,7 +18142,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 18071 "configure" +#line 18145 "configure" #include "confdefs.h" #include @@ -18089,7 +18163,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >"conftest.$ac_ext" <<_ACEOF -#line 18092 "configure" +#line 18166 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -18115,15 +18189,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:18118: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18192: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18121: \$? = $ac_status" >&5 + echo "$as_me:18195: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:18123: \"$ac_try\"") >&5 + { (eval echo "$as_me:18197: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18126: \$? = $ac_status" >&5 + echo "$as_me:18200: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -18136,7 +18210,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi fi -echo "$as_me:18139: result: $ac_cv_header_stdc" >&5 +echo "$as_me:18213: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -18146,13 +18220,13 @@ EOF fi -echo "$as_me:18149: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:18223: 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 18155 "configure" +#line 18229 "configure" #include "confdefs.h" #include #include @@ -18168,16 +18242,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18171: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18245: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18174: \$? = $ac_status" >&5 + echo "$as_me:18248: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18177: \"$ac_try\"") >&5 + { (eval echo "$as_me:18251: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18180: \$? = $ac_status" >&5 + echo "$as_me:18254: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_header_time=yes else @@ -18187,7 +18261,7 @@ ac_cv_header_time=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:18190: result: $ac_cv_header_time" >&5 +echo "$as_me:18264: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -18211,23 +18285,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18214: checking for $ac_header" >&5 +echo "$as_me:18288: 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 18220 "configure" +#line 18294 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18224: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18298: \"$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:18230: \$? = $ac_status" >&5 + echo "$as_me:18304: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18246,7 +18320,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:18249: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18323: 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:18336: 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 18268 "configure" +#line 18342 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18272: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18346: \"$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:18278: \$? = $ac_status" >&5 + echo "$as_me:18352: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18294,7 +18368,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:18297: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18371: 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:18381: checking for header declaring getopt variables" >&5 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 if test "${cf_cv_getopt_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18314,7 +18388,7 @@ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 18317 "configure" +#line 18391 "configure" #include "confdefs.h" #include <$cf_header> @@ -18327,16 +18401,16 @@ int x = optind; char *y = optarg; (void)x; (void)y } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18330: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18404: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18333: \$? = $ac_status" >&5 + echo "$as_me:18407: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18336: \"$ac_try\"") >&5 + { (eval echo "$as_me:18410: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18339: \$? = $ac_status" >&5 + echo "$as_me:18413: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_getopt_header=$cf_header break @@ -18348,7 +18422,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:18351: result: $cf_cv_getopt_header" >&5 +echo "$as_me:18425: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test "$cf_cv_getopt_header" != none ; then @@ -18366,6 +18440,7 @@ EOF fi for ac_func in \ +cfmakeraw \ getopt \ gettimeofday \ snprintf \ @@ -18375,13 +18450,13 @@ tsearch \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:18378: checking for $ac_func" >&5 +echo "$as_me:18453: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18384 "configure" +#line 18459 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18412,16 +18487,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18415: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18490: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18418: \$? = $ac_status" >&5 + echo "$as_me:18493: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18421: \"$ac_try\"") >&5 + { (eval echo "$as_me:18496: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18424: \$? = $ac_status" >&5 + echo "$as_me:18499: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -18431,7 +18506,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18434: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:18509: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:18520: checking if we can use termcap.h" >&5 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6 if test "${cf_cv_have_termcap_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18452 "configure" +#line 18527 "configure" #include "confdefs.h" #include @@ -18470,16 +18545,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18473: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18548: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18476: \$? = $ac_status" >&5 + echo "$as_me:18551: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18479: \"$ac_try\"") >&5 + { (eval echo "$as_me:18554: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18482: \$? = $ac_status" >&5 + echo "$as_me:18557: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_termcap_h=yes else @@ -18489,7 +18564,7 @@ cf_cv_have_termcap_h=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:18492: result: $cf_cv_have_termcap_h" >&5 +echo "$as_me:18567: result: $cf_cv_have_termcap_h" >&5 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6 if test "x$cf_cv_have_termcap_h" = xyes then @@ -18499,14 +18574,14 @@ cat >>confdefs.h <<\EOF EOF else -echo "$as_me:18502: checking if we can use ncurses/termcap.h" >&5 +echo "$as_me:18577: checking if we can use ncurses/termcap.h" >&5 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18509 "configure" +#line 18584 "configure" #include "confdefs.h" #include @@ -18527,16 +18602,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18530: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18605: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18533: \$? = $ac_status" >&5 + echo "$as_me:18608: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18536: \"$ac_try\"") >&5 + { (eval echo "$as_me:18611: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18539: \$? = $ac_status" >&5 + echo "$as_me:18614: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_ncurses_termcap_h=yes else @@ -18546,7 +18621,7 @@ cf_cv_have_ncurses_termcap_h=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:18549: result: $cf_cv_have_ncurses_termcap_h" >&5 +echo "$as_me:18624: result: $cf_cv_have_ncurses_termcap_h" >&5 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6 test "x$cf_cv_have_ncurses_termcap_h" = xyes && cat >>confdefs.h <<\EOF @@ -18556,7 +18631,7 @@ EOF fi if test "x$ac_cv_func_getopt" = xno; then - { { echo "$as_me:18559: error: getopt is required for building programs" >&5 + { { echo "$as_me:18634: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi @@ -18575,13 +18650,13 @@ wcstombs \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:18578: checking for $ac_func" >&5 +echo "$as_me:18653: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18584 "configure" +#line 18659 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18612,16 +18687,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18615: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18690: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18618: \$? = $ac_status" >&5 + echo "$as_me:18693: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18621: \"$ac_try\"") >&5 + { (eval echo "$as_me:18696: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18624: \$? = $ac_status" >&5 + echo "$as_me:18699: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -18631,7 +18706,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18634: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:18709: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:18721: checking definition to turn on extended curses functions" >&5 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6 if test "${cf_cv_need_xopen_extension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18651,7 +18726,7 @@ else cf_cv_need_xopen_extension=unknown cat >"conftest.$ac_ext" <<_ACEOF -#line 18654 "configure" +#line 18729 "configure" #include "confdefs.h" #include @@ -18683,16 +18758,16 @@ make an error /* prefer to fall-through on the second checks */ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18686: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18761: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18689: \$? = $ac_status" >&5 + echo "$as_me:18764: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18692: \"$ac_try\"") >&5 + { (eval echo "$as_me:18767: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18695: \$? = $ac_status" >&5 + echo "$as_me:18770: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_xopen_extension=none else @@ -18702,7 +18777,7 @@ cat "conftest.$ac_ext" >&5 for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR do cat >"conftest.$ac_ext" <<_ACEOF -#line 18705 "configure" +#line 18780 "configure" #include "confdefs.h" #define $cf_try_xopen_extension 1 @@ -18727,16 +18802,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18730: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18805: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18733: \$? = $ac_status" >&5 + echo "$as_me:18808: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18736: \"$ac_try\"") >&5 + { (eval echo "$as_me:18811: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18739: \$? = $ac_status" >&5 + echo "$as_me:18814: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_xopen_extension=$cf_try_xopen_extension; break else @@ -18750,7 +18825,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18753: result: $cf_cv_need_xopen_extension" >&5 +echo "$as_me:18828: result: $cf_cv_need_xopen_extension" >&5 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 case "$cf_cv_need_xopen_extension" in @@ -18762,7 +18837,7 @@ case "$cf_cv_need_xopen_extension" in ;; esac -echo "$as_me:18765: checking for term.h" >&5 +echo "$as_me:18840: checking for term.h" >&5 echo $ECHO_N "checking for term.h... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18783,7 +18858,7 @@ esac for cf_header in $cf_header_list do cat >"conftest.$ac_ext" <<_ACEOF -#line 18786 "configure" +#line 18861 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18797,16 +18872,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18800: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18875: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18803: \$? = $ac_status" >&5 + echo "$as_me:18878: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18806: \"$ac_try\"") >&5 + { (eval echo "$as_me:18881: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18809: \$? = $ac_status" >&5 + echo "$as_me:18884: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break @@ -18825,7 +18900,7 @@ case "$cf_cv_term_header" in for cf_header in ncurses/term.h ncursesw/term.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 18828 "configure" +#line 18903 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18843,16 +18918,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18846: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18921: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18849: \$? = $ac_status" >&5 + echo "$as_me:18924: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18852: \"$ac_try\"") >&5 + { (eval echo "$as_me:18927: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18855: \$? = $ac_status" >&5 + echo "$as_me:18930: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break @@ -18867,7 +18942,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" esac fi -echo "$as_me:18870: result: $cf_cv_term_header" >&5 +echo "$as_me:18945: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 case "$cf_cv_term_header" in @@ -18894,7 +18969,7 @@ EOF ;; esac -echo "$as_me:18897: checking for unctrl.h" >&5 +echo "$as_me:18972: checking for unctrl.h" >&5 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6 if test "${cf_cv_unctrl_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18915,7 +18990,7 @@ esac for cf_header in $cf_header_list do cat >"conftest.$ac_ext" <<_ACEOF -#line 18918 "configure" +#line 18993 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18929,16 +19004,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18932: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19007: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18935: \$? = $ac_status" >&5 + echo "$as_me:19010: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18938: \"$ac_try\"") >&5 + { (eval echo "$as_me:19013: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18941: \$? = $ac_status" >&5 + echo "$as_me:19016: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_unctrl_header=$cf_header break @@ -18951,12 +19026,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:18954: result: $cf_cv_unctrl_header" >&5 +echo "$as_me:19029: result: $cf_cv_unctrl_header" >&5 echo "${ECHO_T}$cf_cv_unctrl_header" >&6 case "$cf_cv_unctrl_header" in (no) - { echo "$as_me:18959: WARNING: unctrl.h header not found" >&5 + { echo "$as_me:19034: WARNING: unctrl.h header not found" >&5 echo "$as_me: WARNING: unctrl.h header not found" >&2;} ;; esac @@ -18992,6 +19067,7 @@ chgat \ color_content \ color_set \ copywin \ +curses_trace \ delscreen \ dupwin \ exit_curses \ @@ -19028,6 +19104,7 @@ tigetnum \ tigetstr \ tputs_sp \ typeahead \ +unget_wch \ use_default_colors \ use_env \ use_extended_names \ @@ -19048,10 +19125,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:19051: checking for ${cf_func}" >&5 + echo "$as_me:19128: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:19054: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:19131: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19060,7 +19137,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >"conftest.$ac_ext" <<_ACEOF -#line 19063 "configure" +#line 19140 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -19093,16 +19170,16 @@ if (foo + 1234L > 5678L) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19096: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19173: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19099: \$? = $ac_status" >&5 + echo "$as_me:19176: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19102: \"$ac_try\"") >&5 + { (eval echo "$as_me:19179: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19105: \$? = $ac_status" >&5 + echo "$as_me:19182: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -19118,7 +19195,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:19121: result: $cf_result" >&5 + echo "$as_me:19198: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" != no; then cat >>confdefs.h <&5 + echo "$as_me:19213: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:19139: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:19216: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19145,7 +19222,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >"conftest.$ac_ext" <<_ACEOF -#line 19148 "configure" +#line 19225 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -19178,16 +19255,16 @@ if (foo + 1234L > 5678L) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19181: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19258: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19184: \$? = $ac_status" >&5 + echo "$as_me:19261: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19187: \"$ac_try\"") >&5 + { (eval echo "$as_me:19264: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19190: \$? = $ac_status" >&5 + echo "$as_me:19267: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -19203,7 +19280,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:19206: result: $cf_result" >&5 + echo "$as_me:19283: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" != no; then cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 19230 "configure" +#line 19307 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19247,21 +19324,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19250: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19327: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19253: \$? = $ac_status" >&5 + echo "$as_me:19330: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19256: \"$ac_try\"") >&5 + { (eval echo "$as_me:19333: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19259: \$? = $ac_status" >&5 + echo "$as_me:19336: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6 -echo "${as_me:-configure}:19264: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 +echo "${as_me:-configure}:19341: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:19361: checking for ncurses extended functions" >&5 echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6 if test "${cf_cv_ncurses_ext_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19291 "configure" +#line 19368 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19303,16 +19380,16 @@ int x = NCURSES_EXT_FUNCS } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19306: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19383: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19309: \$? = $ac_status" >&5 + echo "$as_me:19386: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19312: \"$ac_try\"") >&5 + { (eval echo "$as_me:19389: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19315: \$? = $ac_status" >&5 + echo "$as_me:19392: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_ext_funcs=defined else @@ -19320,7 +19397,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 19323 "configure" +#line 19400 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19345,16 +19422,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19348: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19425: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19351: \$? = $ac_status" >&5 + echo "$as_me:19428: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19354: \"$ac_try\"") >&5 + { (eval echo "$as_me:19431: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19357: \$? = $ac_status" >&5 + echo "$as_me:19434: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_ext_funcs=yes else @@ -19368,7 +19445,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19371: result: $cf_cv_ncurses_ext_funcs" >&5 +echo "$as_me:19448: result: $cf_cv_ncurses_ext_funcs" >&5 echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6 test "$cf_cv_ncurses_ext_funcs" = yes && cat >>confdefs.h <<\EOF @@ -19382,11 +19459,11 @@ then if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno then cf_define_xpg5=no - echo "$as_me:19385: checking if _XPG5 should be defined to enable wide-characters" >&5 + echo "$as_me:19462: checking if _XPG5 should be defined to enable wide-characters" >&5 echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 19389 "configure" +#line 19466 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19399,16 +19476,16 @@ int x = _XPG5 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19402: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19479: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19405: \$? = $ac_status" >&5 + echo "$as_me:19482: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19408: \"$ac_try\"") >&5 + { (eval echo "$as_me:19485: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19411: \$? = $ac_status" >&5 + echo "$as_me:19488: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -19417,7 +19494,7 @@ cat "conftest.$ac_ext" >&5 cf_save_cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XPG5" cat >"conftest.$ac_ext" <<_ACEOF -#line 19420 "configure" +#line 19497 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19430,16 +19507,16 @@ int x = _XPG5 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19433: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19510: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19436: \$? = $ac_status" >&5 + echo "$as_me:19513: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19439: \"$ac_try\"") >&5 + { (eval echo "$as_me:19516: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19442: \$? = $ac_status" >&5 + echo "$as_me:19519: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_define_xpg5=yes else @@ -19450,7 +19527,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save_cppflags" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:19453: result: $cf_define_xpg5" >&5 + echo "$as_me:19530: result: $cf_define_xpg5" >&5 echo "${ECHO_T}$cf_define_xpg5" >&6 if test "$cf_define_xpg5" = yes @@ -19459,14 +19536,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6 fi fi - echo "$as_me:19462: checking for wide-character functions" >&5 + echo "$as_me:19539: checking for wide-character functions" >&5 echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6 if test "${cf_cv_widechar_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19469 "configure" +#line 19546 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19483,16 +19560,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19486: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19563: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19489: \$? = $ac_status" >&5 + echo "$as_me:19566: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19492: \"$ac_try\"") >&5 + { (eval echo "$as_me:19569: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19495: \$? = $ac_status" >&5 + echo "$as_me:19572: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_widechar_funcs=yes else @@ -19503,7 +19580,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19506: result: $cf_cv_widechar_funcs" >&5 +echo "$as_me:19583: result: $cf_cv_widechar_funcs" >&5 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 if test "$cf_cv_widechar_funcs" != no ; then @@ -19524,14 +19601,14 @@ EOF fi -echo "$as_me:19527: checking if $cf_cv_screen library uses pthreads" >&5 +echo "$as_me:19604: checking if $cf_cv_screen library uses pthreads" >&5 echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6 if test "${cf_cv_use_pthreads+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19534 "configure" +#line 19611 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19549,16 +19626,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19552: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19629: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19555: \$? = $ac_status" >&5 + echo "$as_me:19632: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19558: \"$ac_try\"") >&5 + { (eval echo "$as_me:19635: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19561: \$? = $ac_status" >&5 + echo "$as_me:19638: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_use_pthreads=yes else @@ -19569,21 +19646,21 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19572: result: $cf_cv_use_pthreads" >&5 +echo "$as_me:19649: result: $cf_cv_use_pthreads" >&5 echo "${ECHO_T}$cf_cv_use_pthreads" >&6 test $cf_cv_use_pthreads = yes && cat >>confdefs.h <<\EOF #define USE_PTHREADS 1 EOF -echo "$as_me:19579: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:19656: checking if sys/time.h works with sys/select.h" >&5 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 if test "${cf_cv_sys_time_select+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19586 "configure" +#line 19663 "configure" #include "confdefs.h" #include @@ -19603,16 +19680,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19606: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19683: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19609: \$? = $ac_status" >&5 + echo "$as_me:19686: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19612: \"$ac_try\"") >&5 + { (eval echo "$as_me:19689: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19615: \$? = $ac_status" >&5 + echo "$as_me:19692: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sys_time_select=yes else @@ -19624,7 +19701,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19627: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:19704: result: $cf_cv_sys_time_select" >&5 echo "${ECHO_T}$cf_cv_sys_time_select" >&6 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF @@ -19633,7 +19710,7 @@ EOF # special check for test/ditto.c -echo "$as_me:19636: checking for openpty in -lutil" >&5 +echo "$as_me:19713: checking for openpty in -lutil" >&5 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 if test "${ac_cv_lib_util_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19641,7 +19718,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19644 "configure" +#line 19721 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19660,16 +19737,16 @@ openpty (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19663: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19740: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19666: \$? = $ac_status" >&5 + echo "$as_me:19743: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19669: \"$ac_try\"") >&5 + { (eval echo "$as_me:19746: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19672: \$? = $ac_status" >&5 + echo "$as_me:19749: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_util_openpty=yes else @@ -19680,7 +19757,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19683: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:19760: result: $ac_cv_lib_util_openpty" >&5 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 if test "$ac_cv_lib_util_openpty" = yes; then cf_cv_lib_util=yes @@ -19688,7 +19765,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:19691: checking for openpty header" >&5 +echo "$as_me:19768: checking for openpty header" >&5 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 if test "${cf_cv_func_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19715,7 +19792,7 @@ LIBS="$cf_add_libs" for cf_header in pty.h libutil.h util.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 19718 "configure" +#line 19795 "configure" #include "confdefs.h" #include <$cf_header> @@ -19732,16 +19809,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19735: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19812: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19738: \$? = $ac_status" >&5 + echo "$as_me:19815: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19741: \"$ac_try\"") >&5 + { (eval echo "$as_me:19818: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19744: \$? = $ac_status" >&5 + echo "$as_me:19821: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_openpty=$cf_header @@ -19759,7 +19836,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" fi -echo "$as_me:19762: result: $cf_cv_func_openpty" >&5 +echo "$as_me:19839: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -19793,7 +19870,7 @@ TEST_LIBS="$cf_add_libs" fi fi -echo "$as_me:19796: checking for function curses_version" >&5 +echo "$as_me:19873: checking for function curses_version" >&5 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6 if test "${cf_cv_func_curses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19803,7 +19880,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_curses_version=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 19806 "configure" +#line 19883 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19816,15 +19893,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:19819: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19896: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19822: \$? = $ac_status" >&5 + echo "$as_me:19899: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:19824: \"$ac_try\"") >&5 + { (eval echo "$as_me:19901: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19827: \$? = $ac_status" >&5 + echo "$as_me:19904: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_curses_version=yes @@ -19839,14 +19916,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi rm -f core fi -echo "$as_me:19842: result: $cf_cv_func_curses_version" >&5 +echo "$as_me:19919: result: $cf_cv_func_curses_version" >&5 echo "${ECHO_T}$cf_cv_func_curses_version" >&6 test "$cf_cv_func_curses_version" = yes && cat >>confdefs.h <<\EOF #define HAVE_CURSES_VERSION 1 EOF -echo "$as_me:19849: checking for alternate character set array" >&5 +echo "$as_me:19926: checking for alternate character set array" >&5 echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6 if test "${cf_cv_curses_acs_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19856,7 +19933,7 @@ cf_cv_curses_acs_map=unknown for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map do cat >"conftest.$ac_ext" <<_ACEOF -#line 19859 "configure" +#line 19936 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19872,16 +19949,16 @@ ${name}['k'] = ACS_PLUS } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19875: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19952: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19878: \$? = $ac_status" >&5 + echo "$as_me:19955: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19881: \"$ac_try\"") >&5 + { (eval echo "$as_me:19958: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19884: \$? = $ac_status" >&5 + echo "$as_me:19961: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_acs_map=$name; break else @@ -19892,7 +19969,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:19895: result: $cf_cv_curses_acs_map" >&5 +echo "$as_me:19972: result: $cf_cv_curses_acs_map" >&5 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 test "$cf_cv_curses_acs_map" != unknown && @@ -19902,7 +19979,7 @@ EOF if test "$cf_enable_widec" = yes; then -echo "$as_me:19905: checking for wide alternate character set array" >&5 +echo "$as_me:19982: checking for wide alternate character set array" >&5 echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6 if test "${cf_cv_curses_wacs_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19912,7 +19989,7 @@ else for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char do cat >"conftest.$ac_ext" <<_ACEOF -#line 19915 "configure" +#line 19992 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19928,16 +20005,16 @@ void *foo = &(${name}['k']); (void)foo } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19931: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20008: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19934: \$? = $ac_status" >&5 + echo "$as_me:20011: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19937: \"$ac_try\"") >&5 + { (eval echo "$as_me:20014: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19940: \$? = $ac_status" >&5 + echo "$as_me:20017: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_map=$name break @@ -19948,7 +20025,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:19951: result: $cf_cv_curses_wacs_map" >&5 +echo "$as_me:20028: result: $cf_cv_curses_wacs_map" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 test "$cf_cv_curses_wacs_map" != unknown && @@ -19956,7 +20033,7 @@ cat >>confdefs.h <&5 +echo "$as_me:20036: checking for wide alternate character constants" >&5 echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6 if test "${cf_cv_curses_wacs_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19966,7 +20043,7 @@ cf_cv_curses_wacs_symbols=no if test "$cf_cv_curses_wacs_map" != unknown then cat >"conftest.$ac_ext" <<_ACEOF -#line 19969 "configure" +#line 20046 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19983,16 +20060,16 @@ cchar_t *foo = WACS_PLUS; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19986: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20063: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19989: \$? = $ac_status" >&5 + echo "$as_me:20066: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19992: \"$ac_try\"") >&5 + { (eval echo "$as_me:20069: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19995: \$? = $ac_status" >&5 + echo "$as_me:20072: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -20002,7 +20079,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" else cat >"conftest.$ac_ext" <<_ACEOF -#line 20005 "configure" +#line 20082 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20018,16 +20095,16 @@ cchar_t *foo = WACS_PLUS; (void)foo } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20021: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20098: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20024: \$? = $ac_status" >&5 + echo "$as_me:20101: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20027: \"$ac_try\"") >&5 + { (eval echo "$as_me:20104: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20030: \$? = $ac_status" >&5 + echo "$as_me:20107: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -20038,7 +20115,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi fi -echo "$as_me:20041: result: $cf_cv_curses_wacs_symbols" >&5 +echo "$as_me:20118: result: $cf_cv_curses_wacs_symbols" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 test "$cf_cv_curses_wacs_symbols" != no && @@ -20048,10 +20125,10 @@ EOF fi -echo "$as_me:20051: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20128: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 20054 "configure" +#line 20131 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20069,16 +20146,16 @@ attr_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20072: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20149: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20075: \$? = $ac_status" >&5 + echo "$as_me:20152: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20078: \"$ac_try\"") >&5 + { (eval echo "$as_me:20155: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20081: \$? = $ac_status" >&5 + echo "$as_me:20158: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20087,7 +20164,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20090: result: $cf_result" >&5 +echo "$as_me:20167: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20108,14 +20185,14 @@ fi if test "$cf_enable_widec" = yes; then # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:20111: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:20188: checking if we must include wchar.h to declare mbstate_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 if test "${cf_cv_mbstate_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20118 "configure" +#line 20195 "configure" #include "confdefs.h" #include @@ -20133,23 +20210,23 @@ mbstate_t state } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20136: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20213: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20139: \$? = $ac_status" >&5 + echo "$as_me:20216: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20142: \"$ac_try\"") >&5 + { (eval echo "$as_me:20219: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20145: \$? = $ac_status" >&5 + echo "$as_me:20222: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_mbstate_t=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 20152 "configure" +#line 20229 "configure" #include "confdefs.h" #include @@ -20168,16 +20245,16 @@ mbstate_t value } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20171: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20248: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20174: \$? = $ac_status" >&5 + echo "$as_me:20251: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20177: \"$ac_try\"") >&5 + { (eval echo "$as_me:20254: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20180: \$? = $ac_status" >&5 + echo "$as_me:20257: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_mbstate_t=yes else @@ -20189,7 +20266,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20192: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:20269: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -20212,14 +20289,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:20215: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:20292: checking if we must include wchar.h to declare wchar_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 if test "${cf_cv_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20222 "configure" +#line 20299 "configure" #include "confdefs.h" #include @@ -20237,23 +20314,23 @@ wchar_t state } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20240: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20317: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20243: \$? = $ac_status" >&5 + echo "$as_me:20320: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20246: \"$ac_try\"") >&5 + { (eval echo "$as_me:20323: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20249: \$? = $ac_status" >&5 + echo "$as_me:20326: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wchar_t=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 20256 "configure" +#line 20333 "configure" #include "confdefs.h" #include @@ -20272,16 +20349,16 @@ wchar_t value } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20275: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20352: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20278: \$? = $ac_status" >&5 + echo "$as_me:20355: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20281: \"$ac_try\"") >&5 + { (eval echo "$as_me:20358: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20284: \$? = $ac_status" >&5 + echo "$as_me:20361: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wchar_t=yes else @@ -20293,7 +20370,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20296: result: $cf_cv_wchar_t" >&5 +echo "$as_me:20373: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -20316,14 +20393,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:20319: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:20396: checking if we must include wchar.h to declare wint_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 if test "${cf_cv_wint_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20326 "configure" +#line 20403 "configure" #include "confdefs.h" #include @@ -20341,23 +20418,23 @@ wint_t state } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20344: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20421: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20347: \$? = $ac_status" >&5 + echo "$as_me:20424: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20350: \"$ac_try\"") >&5 + { (eval echo "$as_me:20427: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20353: \$? = $ac_status" >&5 + echo "$as_me:20430: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wint_t=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 20360 "configure" +#line 20437 "configure" #include "confdefs.h" #include @@ -20376,16 +20453,16 @@ wint_t value } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20379: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20456: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20382: \$? = $ac_status" >&5 + echo "$as_me:20459: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20385: \"$ac_try\"") >&5 + { (eval echo "$as_me:20462: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20388: \$? = $ac_status" >&5 + echo "$as_me:20465: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wint_t=yes else @@ -20397,7 +20474,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20400: result: $cf_cv_wint_t" >&5 +echo "$as_me:20477: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -20421,10 +20498,10 @@ fi if test "$NCURSES_OK_MBSTATE_T" = 0 ; then -echo "$as_me:20424: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20501: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 20427 "configure" +#line 20504 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20442,16 +20519,16 @@ mbstate_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20445: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20522: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20448: \$? = $ac_status" >&5 + echo "$as_me:20525: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20451: \"$ac_try\"") >&5 + { (eval echo "$as_me:20528: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20454: \$? = $ac_status" >&5 + echo "$as_me:20531: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20460,7 +20537,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20463: result: $cf_result" >&5 +echo "$as_me:20540: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20482,10 +20559,10 @@ fi if test "$NCURSES_OK_WCHAR_T" = 0 ; then -echo "$as_me:20485: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20562: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 20488 "configure" +#line 20565 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20503,16 +20580,16 @@ wchar_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20506: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20583: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20509: \$? = $ac_status" >&5 + echo "$as_me:20586: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20512: \"$ac_try\"") >&5 + { (eval echo "$as_me:20589: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20515: \$? = $ac_status" >&5 + echo "$as_me:20592: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20521,7 +20598,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20524: result: $cf_result" >&5 +echo "$as_me:20601: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20543,10 +20620,10 @@ fi if test "$NCURSES_OK_WINT_T" = 0 ; then -echo "$as_me:20546: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20623: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 20549 "configure" +#line 20626 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20564,16 +20641,16 @@ wint_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20567: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20644: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20570: \$? = $ac_status" >&5 + echo "$as_me:20647: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20573: \"$ac_try\"") >&5 + { (eval echo "$as_me:20650: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20576: \$? = $ac_status" >&5 + echo "$as_me:20653: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20582,7 +20659,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20585: result: $cf_result" >&5 +echo "$as_me:20662: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20611,11 +20688,11 @@ boolnames \ boolfnames \ ttytype do -echo "$as_me:20614: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20691: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 20618 "configure" +#line 20695 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -20648,16 +20725,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20651: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20728: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20654: \$? = $ac_status" >&5 + echo "$as_me:20731: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20657: \"$ac_try\"") >&5 + { (eval echo "$as_me:20734: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20660: \$? = $ac_status" >&5 + echo "$as_me:20737: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes @@ -20667,7 +20744,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20670: result: $cf_result" >&5 +echo "$as_me:20747: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20679,14 +20756,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./ EOF else - echo "$as_me:20682: checking for data $cf_data in library" >&5 + echo "$as_me:20759: checking for data $cf_data in library" >&5 echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6 # BSD linkers insist on making weak linkage, but resolve at runtime. if test "$cross_compiling" = yes; then # cross-compiling cat >"conftest.$ac_ext" <<_ACEOF -#line 20689 "configure" +#line 20766 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -20725,16 +20802,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20728: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20805: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20731: \$? = $ac_status" >&5 + echo "$as_me:20808: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20734: \"$ac_try\"") >&5 + { (eval echo "$as_me:20811: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20737: \$? = $ac_status" >&5 + echo "$as_me:20814: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20746,7 +20823,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" else cat >"conftest.$ac_ext" <<_ACEOF -#line 20749 "configure" +#line 20826 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -20778,15 +20855,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:20781: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20858: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20784: \$? = $ac_status" >&5 + echo "$as_me:20861: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:20786: \"$ac_try\"") >&5 + { (eval echo "$as_me:20863: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20789: \$? = $ac_status" >&5 + echo "$as_me:20866: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes @@ -20798,7 +20875,7 @@ cf_result=no fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi - echo "$as_me:20801: result: $cf_result" >&5 + echo "$as_me:20878: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20815,7 +20892,7 @@ done if test -n "$with_screen" && test "x$with_screen" = "xpdcurses" then - echo "$as_me:20818: checking for X" >&5 + echo "$as_me:20895: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -20919,17 +20996,17 @@ if test "$ac_x_includes" = no; then # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >"conftest.$ac_ext" <<_ACEOF -#line 20922 "configure" +#line 20999 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:20926: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:21003: \"$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:20932: \$? = $ac_status" >&5 + echo "$as_me:21009: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -20962,7 +21039,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 20965 "configure" +#line 21042 "configure" #include "confdefs.h" #include int @@ -20974,16 +21051,16 @@ XtMalloc (0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20977: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21054: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20980: \$? = $ac_status" >&5 + echo "$as_me:21057: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20983: \"$ac_try\"") >&5 + { (eval echo "$as_me:21060: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20986: \$? = $ac_status" >&5 + echo "$as_me:21063: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -21021,7 +21098,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:21024: result: $have_x" >&5 + echo "$as_me:21101: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -21031,7 +21108,7 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:21034: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:21111: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -21058,11 +21135,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:21061: checking whether -R must be followed by a space" >&5 + echo "$as_me:21138: checking whether -R must be followed by a space" >&5 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >"conftest.$ac_ext" <<_ACEOF -#line 21065 "configure" +#line 21142 "configure" #include "confdefs.h" int @@ -21074,16 +21151,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21077: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21154: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21080: \$? = $ac_status" >&5 + echo "$as_me:21157: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21083: \"$ac_try\"") >&5 + { (eval echo "$as_me:21160: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21086: \$? = $ac_status" >&5 + echo "$as_me:21163: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_nospace=yes else @@ -21093,13 +21170,13 @@ ac_R_nospace=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_nospace = yes; then - echo "$as_me:21096: result: no" >&5 + echo "$as_me:21173: result: no" >&5 echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" cat >"conftest.$ac_ext" <<_ACEOF -#line 21102 "configure" +#line 21179 "configure" #include "confdefs.h" int @@ -21111,16 +21188,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21114: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21191: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21117: \$? = $ac_status" >&5 + echo "$as_me:21194: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21120: \"$ac_try\"") >&5 + { (eval echo "$as_me:21197: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21123: \$? = $ac_status" >&5 + echo "$as_me:21200: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_space=yes else @@ -21130,11 +21207,11 @@ ac_R_space=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_space = yes; then - echo "$as_me:21133: result: yes" >&5 + echo "$as_me:21210: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:21137: result: neither works" >&5 + echo "$as_me:21214: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -21154,7 +21231,7 @@ echo "${ECHO_T}neither works" >&6 # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >"conftest.$ac_ext" <<_ACEOF -#line 21157 "configure" +#line 21234 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21173,22 +21250,22 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21176: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21253: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21179: \$? = $ac_status" >&5 + echo "$as_me:21256: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21182: \"$ac_try\"") >&5 + { (eval echo "$as_me:21259: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21185: \$? = $ac_status" >&5 + echo "$as_me:21262: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:21191: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:21268: checking for dnet_ntoa in -ldnet" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21196,7 +21273,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21199 "configure" +#line 21276 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21215,16 +21292,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21218: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21295: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21221: \$? = $ac_status" >&5 + echo "$as_me:21298: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21224: \"$ac_try\"") >&5 + { (eval echo "$as_me:21301: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21227: \$? = $ac_status" >&5 + echo "$as_me:21304: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -21235,14 +21312,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21238: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:21315: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:21245: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:21322: checking for dnet_ntoa in -ldnet_stub" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21250,7 +21327,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21253 "configure" +#line 21330 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21269,16 +21346,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21272: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21349: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21275: \$? = $ac_status" >&5 + echo "$as_me:21352: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21278: \"$ac_try\"") >&5 + { (eval echo "$as_me:21355: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21281: \$? = $ac_status" >&5 + echo "$as_me:21358: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -21289,7 +21366,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21292: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:21369: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" @@ -21308,13 +21385,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:21311: checking for gethostbyname" >&5 + echo "$as_me:21388: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21317 "configure" +#line 21394 "configure" #include "confdefs.h" #define gethostbyname autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21345,16 +21422,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21348: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21425: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21351: \$? = $ac_status" >&5 + echo "$as_me:21428: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21354: \"$ac_try\"") >&5 + { (eval echo "$as_me:21431: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21357: \$? = $ac_status" >&5 + echo "$as_me:21434: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gethostbyname=yes else @@ -21364,11 +21441,11 @@ ac_cv_func_gethostbyname=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21367: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:21444: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:21371: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:21448: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21376,7 +21453,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21379 "configure" +#line 21456 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21395,16 +21472,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21398: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21475: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21401: \$? = $ac_status" >&5 + echo "$as_me:21478: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21404: \"$ac_try\"") >&5 + { (eval echo "$as_me:21481: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21407: \$? = $ac_status" >&5 + echo "$as_me:21484: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -21415,14 +21492,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21418: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:21495: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 if test "$ac_cv_lib_nsl_gethostbyname" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:21425: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:21502: checking for gethostbyname in -lbsd" >&5 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21430,7 +21507,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21433 "configure" +#line 21510 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21449,16 +21526,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21452: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21529: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21455: \$? = $ac_status" >&5 + echo "$as_me:21532: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21458: \"$ac_try\"") >&5 + { (eval echo "$as_me:21535: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21461: \$? = $ac_status" >&5 + echo "$as_me:21538: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -21469,7 +21546,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21472: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:21549: result: $ac_cv_lib_bsd_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 if test "$ac_cv_lib_bsd_gethostbyname" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" @@ -21485,13 +21562,13 @@ fi # variants that don't use the nameserver (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:21488: checking for connect" >&5 + echo "$as_me:21565: checking for connect" >&5 echo $ECHO_N "checking for connect... $ECHO_C" >&6 if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21494 "configure" +#line 21571 "configure" #include "confdefs.h" #define connect autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21522,16 +21599,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21525: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21602: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21528: \$? = $ac_status" >&5 + echo "$as_me:21605: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21531: \"$ac_try\"") >&5 + { (eval echo "$as_me:21608: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21534: \$? = $ac_status" >&5 + echo "$as_me:21611: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_connect=yes else @@ -21541,11 +21618,11 @@ ac_cv_func_connect=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21544: result: $ac_cv_func_connect" >&5 +echo "$as_me:21621: result: $ac_cv_func_connect" >&5 echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo "$as_me:21548: checking for connect in -lsocket" >&5 + echo "$as_me:21625: checking for connect in -lsocket" >&5 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21553,7 +21630,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21556 "configure" +#line 21633 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21572,16 +21649,16 @@ connect (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21575: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21652: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21578: \$? = $ac_status" >&5 + echo "$as_me:21655: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21581: \"$ac_try\"") >&5 + { (eval echo "$as_me:21658: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21584: \$? = $ac_status" >&5 + echo "$as_me:21661: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_socket_connect=yes else @@ -21592,7 +21669,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21595: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:21672: result: $ac_cv_lib_socket_connect" >&5 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 if test "$ac_cv_lib_socket_connect" = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" @@ -21601,13 +21678,13 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:21604: checking for remove" >&5 + echo "$as_me:21681: checking for remove" >&5 echo $ECHO_N "checking for remove... $ECHO_C" >&6 if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21610 "configure" +#line 21687 "configure" #include "confdefs.h" #define remove autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21638,16 +21715,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21641: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21718: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21644: \$? = $ac_status" >&5 + echo "$as_me:21721: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21647: \"$ac_try\"") >&5 + { (eval echo "$as_me:21724: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21650: \$? = $ac_status" >&5 + echo "$as_me:21727: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_remove=yes else @@ -21657,11 +21734,11 @@ ac_cv_func_remove=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21660: result: $ac_cv_func_remove" >&5 +echo "$as_me:21737: result: $ac_cv_func_remove" >&5 echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo "$as_me:21664: checking for remove in -lposix" >&5 + echo "$as_me:21741: checking for remove in -lposix" >&5 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21669,7 +21746,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21672 "configure" +#line 21749 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21688,16 +21765,16 @@ remove (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21691: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21768: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21694: \$? = $ac_status" >&5 + echo "$as_me:21771: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21697: \"$ac_try\"") >&5 + { (eval echo "$as_me:21774: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21700: \$? = $ac_status" >&5 + echo "$as_me:21777: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_posix_remove=yes else @@ -21708,7 +21785,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21711: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:21788: result: $ac_cv_lib_posix_remove" >&5 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 if test "$ac_cv_lib_posix_remove" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" @@ -21717,13 +21794,13 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:21720: checking for shmat" >&5 + echo "$as_me:21797: checking for shmat" >&5 echo $ECHO_N "checking for shmat... $ECHO_C" >&6 if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21726 "configure" +#line 21803 "configure" #include "confdefs.h" #define shmat autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21754,16 +21831,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21757: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21834: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21760: \$? = $ac_status" >&5 + echo "$as_me:21837: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21763: \"$ac_try\"") >&5 + { (eval echo "$as_me:21840: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21766: \$? = $ac_status" >&5 + echo "$as_me:21843: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_shmat=yes else @@ -21773,11 +21850,11 @@ ac_cv_func_shmat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21776: result: $ac_cv_func_shmat" >&5 +echo "$as_me:21853: result: $ac_cv_func_shmat" >&5 echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo "$as_me:21780: checking for shmat in -lipc" >&5 + echo "$as_me:21857: checking for shmat in -lipc" >&5 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21785,7 +21862,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21788 "configure" +#line 21865 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21804,16 +21881,16 @@ shmat (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21807: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21884: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21810: \$? = $ac_status" >&5 + echo "$as_me:21887: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21813: \"$ac_try\"") >&5 + { (eval echo "$as_me:21890: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21816: \$? = $ac_status" >&5 + echo "$as_me:21893: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -21824,7 +21901,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21827: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:21904: result: $ac_cv_lib_ipc_shmat" >&5 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 if test "$ac_cv_lib_ipc_shmat" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" @@ -21842,7 +21919,7 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:21845: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:21922: checking for IceConnectionNumber in -lICE" >&5 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21850,7 +21927,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21853 "configure" +#line 21930 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21869,16 +21946,16 @@ IceConnectionNumber (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21872: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21949: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21875: \$? = $ac_status" >&5 + echo "$as_me:21952: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21878: \"$ac_try\"") >&5 + { (eval echo "$as_me:21955: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21881: \$? = $ac_status" >&5 + echo "$as_me:21958: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -21889,7 +21966,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21892: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:21969: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" @@ -21908,14 +21985,16 @@ if test "$GCC" = yes || test "$GXX" = yes then case $CFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 - -echo "${as_me:-configure}:21913: testing repairing CFLAGS: $CFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $CFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -21930,15 +22009,22 @@ echo "${as_me:-configure}:21913: testing repairing CFLAGS: $CFLAGS ..." 1>&5 ;; esac done - CFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + if test "x$CFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 + +echo "${as_me:-configure}:22016: testing repairing CFLAGS: $CFLAGS ..." 1>&5 + + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:21936: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22021: testing ... fixed $CFLAGS ..." 1>&5 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:21940: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22025: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + fi ;; esac fi @@ -21947,14 +22033,16 @@ if test "$GCC" = yes || test "$GXX" = yes then case $CPPFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 - -echo "${as_me:-configure}:21952: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $CPPFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -21969,15 +22057,22 @@ echo "${as_me:-configure}:21952: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 ;; esac done - CPPFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + if test "x$CPPFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +echo "${as_me:-configure}:22064: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 -echo "${as_me:-configure}:21975: testing ... fixed $CPPFLAGS ..." 1>&5 + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:22069: testing ... fixed $CPPFLAGS ..." 1>&5 -echo "${as_me:-configure}:21979: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:22073: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi ;; esac fi @@ -21986,14 +22081,16 @@ if test "$GCC" = yes || test "$GXX" = yes then case $LDFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 - -echo "${as_me:-configure}:21991: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $LDFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -22008,20 +22105,27 @@ echo "${as_me:-configure}:21991: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 ;; esac done - LDFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + if test "x$LDFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 + +echo "${as_me:-configure}:22112: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 -echo "${as_me:-configure}:22014: testing ... fixed $LDFLAGS ..." 1>&5 + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:22117: testing ... fixed $LDFLAGS ..." 1>&5 -echo "${as_me:-configure}:22018: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:22121: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi ;; esac fi -echo "$as_me:22024: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:22128: 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. @@ -22038,7 +22142,7 @@ else enable_warnings=no fi; -echo "$as_me:22041: result: $enable_warnings" >&5 +echo "$as_me:22145: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then @@ -22061,10 +22165,10 @@ cat > conftest.i <&5 + { echo "$as_me:22168: 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:22220: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22119: \$? = $ac_status" >&5 + echo "$as_me:22223: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:22121: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:22225: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -22196,7 +22300,7 @@ do done cat >"conftest.$ac_ext" <<_ACEOF -#line 22199 "configure" +#line 22303 "configure" #include "confdefs.h" #include @@ -22211,26 +22315,26 @@ String foo = malloc(1); free((void*)foo) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22214: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22318: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22217: \$? = $ac_status" >&5 + echo "$as_me:22321: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22220: \"$ac_try\"") >&5 + { (eval echo "$as_me:22324: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22223: \$? = $ac_status" >&5 + echo "$as_me:22327: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then -echo "$as_me:22226: checking for X11/Xt const-feature" >&5 +echo "$as_me:22330: 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 22233 "configure" +#line 22337 "configure" #include "confdefs.h" #define _CONST_X_STRING /* X11R7.8 (perhaps) */ @@ -22247,16 +22351,16 @@ String foo = malloc(1); *foo = 0 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22250: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22354: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22253: \$? = $ac_status" >&5 + echo "$as_me:22357: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22256: \"$ac_try\"") >&5 + { (eval echo "$as_me:22360: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22259: \$? = $ac_status" >&5 + echo "$as_me:22363: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_const_x_string=no @@ -22271,7 +22375,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:22274: result: $cf_cv_const_x_string" >&5 +echo "$as_me:22378: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -22300,7 +22404,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi cat > "conftest.$ac_ext" <&5 + { echo "$as_me:22423: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -22332,12 +22436,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:22335: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:22439: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22338: \$? = $ac_status" >&5 + echo "$as_me:22442: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:22340: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:22444: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -22345,7 +22449,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:22348: checking for $CC warning options..." >&5 + { echo "$as_me:22452: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -22368,12 +22472,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:22371: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:22475: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22374: \$? = $ac_status" >&5 + echo "$as_me:22478: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:22376: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:22480: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -22381,7 +22485,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}:22384: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:22488: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -22391,7 +22495,7 @@ echo "${as_me:-configure}:22384: 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}:22394: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:22498: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -22408,7 +22512,7 @@ fi fi -echo "$as_me:22411: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:22515: checking if you want to use dmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 # Check whether --with-dmalloc or --without-dmalloc was given. @@ -22430,7 +22534,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:22433: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:22537: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case ".$with_cflags" in @@ -22544,23 +22648,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:22547: checking for dmalloc.h" >&5 + echo "$as_me:22651: checking for dmalloc.h" >&5 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22553 "configure" +#line 22657 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:22557: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:22661: \"$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:22563: \$? = $ac_status" >&5 + echo "$as_me:22667: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -22579,11 +22683,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:22582: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:22686: result: $ac_cv_header_dmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 if test "$ac_cv_header_dmalloc_h" = yes; then -echo "$as_me:22586: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:22690: checking for dmalloc_debug in -ldmalloc" >&5 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22591,7 +22695,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22594 "configure" +#line 22698 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22610,16 +22714,16 @@ dmalloc_debug (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22613: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22717: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22616: \$? = $ac_status" >&5 + echo "$as_me:22720: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22619: \"$ac_try\"") >&5 + { (eval echo "$as_me:22723: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22622: \$? = $ac_status" >&5 + echo "$as_me:22726: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -22630,7 +22734,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22633: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:22737: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then cat >>confdefs.h <&5 +echo "$as_me:22752: checking if you want to use dbmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 # Check whether --with-dbmalloc or --without-dbmalloc was given. @@ -22667,7 +22771,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:22670: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:22774: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case ".$with_cflags" in @@ -22781,23 +22885,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:22784: checking for dbmalloc.h" >&5 + echo "$as_me:22888: checking for dbmalloc.h" >&5 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dbmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22790 "configure" +#line 22894 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:22794: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:22898: \"$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:22800: \$? = $ac_status" >&5 + echo "$as_me:22904: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -22816,11 +22920,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:22819: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:22923: result: $ac_cv_header_dbmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 if test "$ac_cv_header_dbmalloc_h" = yes; then -echo "$as_me:22823: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:22927: checking for debug_malloc in -ldbmalloc" >&5 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22828,7 +22932,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22831 "configure" +#line 22935 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22847,16 +22951,16 @@ debug_malloc (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22850: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22954: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22853: \$? = $ac_status" >&5 + echo "$as_me:22957: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22856: \"$ac_try\"") >&5 + { (eval echo "$as_me:22960: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22859: \$? = $ac_status" >&5 + echo "$as_me:22963: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -22867,7 +22971,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22870: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:22974: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then cat >>confdefs.h <&5 +echo "$as_me:22989: checking if you want to use valgrind for testing" >&5 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 # Check whether --with-valgrind or --without-valgrind was given. @@ -22904,7 +23008,7 @@ EOF else with_valgrind= fi; -echo "$as_me:22907: result: ${with_valgrind:-no}" >&5 +echo "$as_me:23011: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case ".$with_cflags" in @@ -23017,7 +23121,7 @@ fi ;; esac -echo "$as_me:23020: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:23124: checking if you want to perform memory-leak testing" >&5 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 # Check whether --enable-leaks or --disable-leaks was given. @@ -23028,7 +23132,7 @@ else enable_leaks=yes fi; if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi -echo "$as_me:23031: result: $with_no_leaks" >&5 +echo "$as_me:23135: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$enable_leaks" = no ; then @@ -23046,7 +23150,7 @@ fi LD_RPATH_OPT= if test "x$cf_cv_enable_rpath" != xno then - echo "$as_me:23049: checking for an rpath option" >&5 + echo "$as_me:23153: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case "$cf_cv_system_name" in (irix*) @@ -23077,12 +23181,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 (*) ;; esac - echo "$as_me:23080: result: $LD_RPATH_OPT" >&5 + echo "$as_me:23184: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:23085: checking if we need a space after rpath option" >&5 + echo "$as_me:23189: 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" @@ -23103,7 +23207,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 23106 "configure" +#line 23210 "configure" #include "confdefs.h" int @@ -23115,16 +23219,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23118: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23222: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23121: \$? = $ac_status" >&5 + echo "$as_me:23225: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23124: \"$ac_try\"") >&5 + { (eval echo "$as_me:23228: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23127: \$? = $ac_status" >&5 + echo "$as_me:23231: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_space=no else @@ -23134,14 +23238,14 @@ cf_rpath_space=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:23137: result: $cf_rpath_space" >&5 + echo "$as_me:23241: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; esac fi -echo "$as_me:23144: checking if rpath-hack should be disabled" >&5 +echo "$as_me:23248: checking if rpath-hack should be disabled" >&5 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 # Check whether --enable-rpath-hack or --disable-rpath-hack was given. @@ -23159,22 +23263,22 @@ else fi; if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi -echo "$as_me:23162: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:23266: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 if test "$enable_rpath_hack" = yes ; then -echo "$as_me:23167: checking for updated LDFLAGS" >&5 +echo "$as_me:23271: checking for updated LDFLAGS" >&5 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 if test -n "$LD_RPATH_OPT" ; then - echo "$as_me:23170: result: maybe" >&5 + echo "$as_me:23274: result: maybe" >&5 echo "${ECHO_T}maybe" >&6 for ac_prog in ldd do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:23177: checking for $ac_word" >&5 +echo "$as_me:23281: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23189,7 +23293,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_cf_ldd_prog="$ac_prog" -echo "$as_me:23192: found $ac_dir/$ac_word" >&5 +echo "$as_me:23296: found $ac_dir/$ac_word" >&5 break done @@ -23197,10 +23301,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:23200: result: $cf_ldd_prog" >&5 + echo "$as_me:23304: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:23203: result: no" >&5 + echo "$as_me:23307: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -23214,7 +23318,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >"conftest.$ac_ext" <<_ACEOF -#line 23217 "configure" +#line 23321 "configure" #include "confdefs.h" #include int @@ -23226,16 +23330,16 @@ printf("Hello"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23229: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23333: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23232: \$? = $ac_status" >&5 + echo "$as_me:23336: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23235: \"$ac_try\"") >&5 + { (eval echo "$as_me:23339: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23238: \$? = $ac_status" >&5 + echo "$as_me:23342: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq` cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` @@ -23263,7 +23367,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" then test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 -echo "${as_me:-configure}:23266: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:23370: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -23275,11 +23379,11 @@ echo "${as_me:-configure}:23266: testing ...adding -L$cf_rpath_dir/lib to LDFLAG test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:23278: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23382: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:23282: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23386: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -23316,7 +23420,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:23319: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:23423: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -23329,11 +23433,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:23332: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23436: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:23336: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:23440: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -23370,7 +23474,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:23373: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:23477: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -23383,14 +23487,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:23386: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:23490: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:23390: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23494: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:23393: result: no" >&5 + echo "$as_me:23497: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -23480,7 +23584,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:23483: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:23587: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -23489,6 +23593,8 @@ cat >"$CONFIG_STATUS" <<_ACEOF # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. +me=\`echo "\$0" | sed -e 's,.*\\/,,'\` + debug=false SHELL=\${CONFIG_SHELL-$SHELL} ac_cs_invocation="\$0 \$@" @@ -23510,9 +23616,9 @@ fi as_me=`echo "$0" |sed 's,.*[\\/],,'` if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr + as_expr="expr" else - as_expr=false + as_expr="false" fi rm -f conf$$ conf$$.exe conf$$.file @@ -23527,7 +23633,7 @@ if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' fi elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + as_ln_s='ln' else as_ln_s='cp -p' fi @@ -23614,10 +23720,10 @@ EOF cat >>"$CONFIG_STATUS" <>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:23662: error: ambiguous option: $1 + { { echo "$as_me:23768: 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;} @@ -23678,7 +23784,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:23681: error: unrecognized option: $1 + -*) { { echo "$as_me:23787: 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;} @@ -23697,7 +23803,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20210509, executed with +This file was extended by $as_me 2.52.20221009, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -23728,7 +23834,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;; - *) { { echo "$as_me:23731: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:23837: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -23752,14 +23858,14 @@ $debug || } # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} +: "${TMPDIR=/tmp}" { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { tmp=$TMPDIR/cs$$-$RANDOM - (umask 077 && mkdir $tmp) + (umask 077 && mkdir "$tmp") } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 @@ -23779,7 +23885,7 @@ cat >>"$CONFIG_STATUS" <\$tmp/subs.sed <<\\CEOF + s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >"\$tmp"/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t @@ -23840,6 +23946,7 @@ s,@INSTALL_OPT_S@,$INSTALL_OPT_S,;t t s,@INSTALL_OPT_O@,$INSTALL_OPT_O,;t t s,@LINT@,$LINT,;t t s,@LINT_OPTS@,$LINT_OPTS,;t t +s,@LINT_LIBS@,$LINT_LIBS,;t t s,@MAKE_NO_PHONY@,$MAKE_NO_PHONY,;t t s,@MAKE_PHONY@,$MAKE_PHONY,;t t s,@CTAGS@,$CTAGS,;t t @@ -23917,11 +24024,11 @@ EOF ac_sed_cmds= while "$ac_more_lines"; do if test "$ac_beg" -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + sed "1,${ac_beg}d; ${ac_end}q" "$tmp"/subs.sed >"$tmp"/subs.frag else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + sed "${ac_end}q" "$tmp"/subs.sed >"$tmp"/subs.frag fi - if test ! -s $tmp/subs.frag; then + if test ! -s "$tmp"/subs.frag; then ac_more_lines=false else # The purpose of the label and of the branching condition is to @@ -23929,17 +24036,17 @@ EOF # is no need to browse any of the substitutions). # These are the two extra sed commands mentioned above. (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed # It is possible to make a multiline substitution using escaped newlines. # Ensure that we do not split the substitution between script fragments. ac_BEG=$ac_end ac_END=`expr "$ac_end" + "$ac_max_sed_lines"` - sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next - if test -s $tmp/subs.next; then - grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit - if test ! -s $tmp/subs.edit; then - grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit - if test ! -s $tmp/subs.edit; then + sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next + if test -s "$tmp"/subs.next; then + grep '^s,@[^@,][^@,]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit + if test ! -s "$tmp"/subs.edit; then + grep "^s,@[^@,][^@,]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit + if test ! -s "$tmp"/subs.edit; then if test "$ac_beg" -gt 1; then ac_end=`expr "$ac_end" - 1` continue @@ -23949,9 +24056,9 @@ EOF fi if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="sed -f \"$tmp\"/subs-$ac_sed_frag.sed" else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="$ac_sed_cmds | sed -f \"$tmp\"/subs-$ac_sed_frag.sed" fi ac_sed_frag=`expr "$ac_sed_frag" + 1` ac_beg=$ac_end @@ -23959,7 +24066,7 @@ EOF fi done if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + ac_sed_cmds="cat" fi fi # test -n "$CONFIG_FILES" @@ -23969,7 +24076,7 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin + cat >"$tmp"/stdin ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` @@ -24006,7 +24113,7 @@ for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do esac done; } - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" + ac_dir_suffix="/`echo "$ac_dir"|sed 's,^\./,,'`" # A "../" for each directory in $ac_dir_suffix. ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` else @@ -24034,7 +24141,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:24037: creating $ac_file" >&5 + { echo "$as_me:24144: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -24049,23 +24156,23 @@ echo "$as_me: creating $ac_file" >&6;} ac_file_inputs=`IFS=: for f in $ac_file_in; do case $f in - -) echo $tmp/stdin ;; + -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:24055: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24162: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo $f;; + echo "$f";; *) # Relative if test -f "$f"; then # Build tree - echo $f + echo "$f" elif test -f "$srcdir/$f"; then # Source tree echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:24068: error: cannot find input file: $f" >&5 + { { echo "$as_me:24175: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -24081,7 +24188,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:24084: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:24191: 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;} @@ -24090,7 +24197,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:24093: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:24200: 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;} @@ -24115,38 +24222,46 @@ s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin +" $ac_file_inputs | (eval "$ac_sed_cmds") >"$tmp"/out + rm -f "$tmp"/stdin +EOF +: "${FGREP:=grep -F}" +: "${EGREP:=grep -E}" +cat >>"$CONFIG_STATUS" <>"$CONFIG_STATUS" <<\EOF if test x"$ac_file" != x-; then cp "$tmp/out" "$ac_file" for ac_name in prefix exec_prefix datarootdir do - ac_seen=`${FGREP-fgrep} -n '${'$ac_name'[:=].*}' "$ac_file"` + ac_seen=`$FGREP -n '${'$ac_name'[:=].*}' "$ac_file"` if test -n "$ac_seen"; then - ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` + ac_init=`$EGREP '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then - ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:24130: WARNING: Variable $ac_name is used but was not set: + ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'` + { echo "$as_me:24245: 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;} fi fi done - ${EGREP-egrep} -n '@[a-z_][a-z_0-9]+@' "$ac_file" >$tmp/out - ${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:24141: WARNING: Some variables may not be substituted: + $EGREP -n '@[a-z_][a-z_0-9]+@' "$ac_file" >"$tmp"/out + $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:24256: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} fi else - cat $tmp/out + cat "$tmp"/out fi - rm -f $tmp/out + rm -f "$tmp"/out done EOF @@ -24179,7 +24294,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin + cat >"$tmp"/stdin ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` @@ -24187,7 +24302,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:24190: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:24305: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -24195,10 +24310,10 @@ echo "$as_me: creating $ac_file" >&6;} ac_file_inputs=`IFS=: for f in $ac_file_in; do case $f in - -) echo $tmp/stdin ;; + -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:24201: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24316: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -24211,14 +24326,14 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:24214: error: cannot find input file: $f" >&5 + { { echo "$as_me:24329: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + sed 's/[ ]*$//' $ac_file_inputs >"$tmp"/in EOF @@ -24250,9 +24365,9 @@ echo ' cat >> conftest.edit < $tmp/out -rm -f $tmp/in -mv $tmp/out $tmp/in +sed -f conftest.edit "$tmp"/in > "$tmp"/out +rm -f "$tmp"/in +mv "$tmp"/out "$tmp"/in rm -f conftest.edit conftest.frag ' >> "$CONFIG_STATUS" @@ -24261,15 +24376,15 @@ cat >>"$CONFIG_STATUS" <<\EOF # use $as_me), people would be surprised to read: # /* config.h. Generated automatically by config.status. */ if test x"$ac_file" = x-; then - echo "/* Generated automatically by configure. */" >$tmp/config.h + echo "/* Generated automatically by configure. */" >"$tmp"/config.h else - echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h + echo "/* $ac_file. Generated automatically by configure. */" >"$tmp"/config.h fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in + cat "$tmp"/in >>"$tmp"/config.h + 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:24272: $ac_file is unchanged" >&5 + { echo "$as_me:24387: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -24305,8 +24420,8 @@ done; } mv "$tmp/config.h" "$ac_file" fi else - cat $tmp/config.h - rm -f $tmp/config.h + cat "$tmp"/config.h + rm -f "$tmp"/config.h fi done EOF