From: Thomas E. Dickey Date: Sun, 26 Feb 2012 01:59:00 +0000 (+0000) Subject: ncurses 5.9 - patch 20120225 X-Git-Tag: v6.0~166 X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=8b06e371ed1bce3dd6f37138e6becb5e1a562fe0 ncurses 5.9 - patch 20120225 + modify configure script to allow creating dll's for MinGW when cross-compiling. + add --enable-string-hacks option to control whether strlcat and strlcpy may be used. The same issue applies to OpenBSD's warnings about snprintf, noting that this function is weakly standardized. + add configure checks for strlcat, strlcpy and snprintf, to help reduce bogus warnings with OpenBSD builds. + build-fix for OpenBSD 4.9 to supply consistent intptr_t declaration (cf:20111231) + update config.guess, config.sub --- diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index e376356a..72f2f3ea 100644 --- a/Ada95/aclocal.m4 +++ b/Ada95/aclocal.m4 @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: aclocal.m4,v 1.45 2012/02/18 23:21:42 tom Exp $ +dnl $Id: aclocal.m4,v 1.46 2012/02/25 20:24:03 tom Exp $ dnl Macros used in NCURSES Ada95 auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -1726,7 +1726,7 @@ fi ]) ]) dnl --------------------------------------------------------------------------- -dnl CF_LIB_SUFFIX version: 17 updated: 2011/07/02 15:36:04 +dnl CF_LIB_SUFFIX version: 18 updated: 2012/02/25 15:20:07 dnl ------------- dnl Compute the library file-suffix from the given model name dnl $1 = model name @@ -1759,7 +1759,7 @@ AC_DEFUN([CF_LIB_SUFFIX], $2='.a' $3=[$]$2 ;; - cygwin*) #(vi + cygwin*|mingw*) #(vi $2='.dll' $3='.dll.a' ;; @@ -2910,7 +2910,7 @@ define([CF_REMOVE_LIB], $1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'` ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SHARED_OPTS version: 69 updated: 2011/07/30 19:31:39 +dnl CF_SHARED_OPTS version: 70 updated: 2012/02/25 15:20:07 dnl -------------- dnl -------------- dnl Attempt to determine the appropriate CC/LD options for creating a shared @@ -3079,6 +3079,27 @@ CF_EOF CF_SHARED_SONAME MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]' ;; + mingw*) #(vi + cf_cv_shlib_version=mingw + cf_cv_shlib_version_infix=mingw + CC_SHARED_OPTS= + MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}' + #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]' + #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]' + cat >mk_shared_lib.sh <<-CF_EOF + #!/bin/sh + SHARED_LIB=\[$]1 + IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\` + shift + cat <<-EOF + Linking shared library + ** SHARED_LIB \[$]SHARED_LIB + ** IMPORT_LIB \[$]IMPORT_LIB +EOF + exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB} +CF_EOF + chmod +x mk_shared_lib.sh + ;; openbsd[[2-9]].*|mirbsd*) #(vi if test "$DFT_LWR_MODEL" = "shared" ; then LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" @@ -3220,6 +3241,9 @@ CF_EOF test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}" test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}" + CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS) + CF_VERBOSE(MK_SHARED_LIB: $MK_SHARED_LIB) + AC_SUBST(CC_SHARED_OPTS) AC_SUBST(LD_RPATH_OPT) AC_SUBST(LD_SHARED_OPTS) diff --git a/Ada95/configure b/Ada95/configure index 9b37c362..0d7898a5 100644 --- a/Ada95/configure +++ b/Ada95/configure @@ -7811,6 +7811,27 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' ;; + mingw*) #(vi + cf_cv_shlib_version=mingw + cf_cv_shlib_version_infix=mingw + CC_SHARED_OPTS= + MK_SHARED_LIB='sh ../mk_shared_lib.sh $@ ${CC} ${CFLAGS}' + #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]' + #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]' + cat >mk_shared_lib.sh <<-CF_EOF + #!/bin/sh + SHARED_LIB=\$1 + IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$/.dll.a/'\` + shift + cat <<-EOF + Linking shared library + ** SHARED_LIB \$SHARED_LIB + ** IMPORT_LIB \$IMPORT_LIB +EOF + exec \$* -shared -Wl,--out-implib=../lib/\${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\${SHARED_LIB} +CF_EOF + chmod +x mk_shared_lib.sh + ;; openbsd[2-9].*|mirbsd*) #(vi if test "$DFT_LWR_MODEL" = "shared" ; then LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" @@ -7941,7 +7962,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" cat >conftest.$ac_ext <<_ACEOF -#line 7944 "configure" +#line 7965 "configure" #include "confdefs.h" #include int @@ -7953,16 +7974,16 @@ printf("Hello\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7956: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7977: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7959: \$? = $ac_status" >&5 + echo "$as_me:7980: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7962: \"$ac_try\"") >&5 + { (eval echo "$as_me:7983: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7965: \$? = $ac_status" >&5 + echo "$as_me:7986: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -7999,7 +8020,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes ;; *) - { echo "$as_me:8002: WARNING: ignored --with-shlib-version" >&5 + { echo "$as_me:8023: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac @@ -8010,11 +8031,19 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}" test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}" + test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 + +echo "${as_me:-configure}:8036: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 + + test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 + +echo "${as_me:-configure}:8040: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + # The test/sample programs in the original tree link using rpath option. # Make it optional for packagers. if test -n "$LOCAL_LDFLAGS" then - echo "$as_me:8017: checking if you want to link sample programs with rpath option" >&5 + echo "$as_me:8046: checking if you want to link sample programs with rpath option" >&5 echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6 # Check whether --enable-rpath-link or --disable-rpath-link was given. @@ -8024,7 +8053,7 @@ if test "${enable_rpath_link+set}" = set; then else with_rpath_link=yes fi; - echo "$as_me:8027: result: $with_rpath_link" >&5 + echo "$as_me:8056: result: $with_rpath_link" >&5 echo "${ECHO_T}$with_rpath_link" >&6 if test "$with_rpath_link" = no then @@ -8036,7 +8065,7 @@ fi ############################################################################### ### use option --enable-broken-linker to force on use of broken-linker support -echo "$as_me:8039: checking if you want broken-linker support code" >&5 +echo "$as_me:8068: checking if you want broken-linker support code" >&5 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 # Check whether --enable-broken_linker or --disable-broken_linker was given. @@ -8046,7 +8075,7 @@ if test "${enable_broken_linker+set}" = set; then else with_broken_linker=${BROKEN_LINKER:-no} fi; -echo "$as_me:8049: result: $with_broken_linker" >&5 +echo "$as_me:8078: result: $with_broken_linker" >&5 echo "${ECHO_T}$with_broken_linker" >&6 BROKEN_LINKER=0 @@ -8066,7 +8095,7 @@ EOF BROKEN_LINKER=1 test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 -echo "${as_me:-configure}:8069: testing cygwin linker is broken anyway ..." 1>&5 +echo "${as_me:-configure}:8098: testing cygwin linker is broken anyway ..." 1>&5 ;; esac @@ -8112,14 +8141,14 @@ irix[56].*) #(vi ;; linux*|gnu*|mint*|k*bsd*-gnu) #(vi -echo "$as_me:8115: checking if we must define _GNU_SOURCE" >&5 +echo "$as_me:8144: 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 8122 "configure" +#line 8151 "configure" #include "confdefs.h" #include int @@ -8134,16 +8163,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8137: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8166: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8140: \$? = $ac_status" >&5 + echo "$as_me:8169: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8143: \"$ac_try\"") >&5 + { (eval echo "$as_me:8172: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8146: \$? = $ac_status" >&5 + echo "$as_me:8175: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -8152,7 +8181,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 8155 "configure" +#line 8184 "configure" #include "confdefs.h" #include int @@ -8167,16 +8196,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8170: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8199: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8173: \$? = $ac_status" >&5 + echo "$as_me:8202: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8176: \"$ac_try\"") >&5 + { (eval echo "$as_me:8205: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8179: \$? = $ac_status" >&5 + echo "$as_me:8208: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -8191,7 +8220,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8194: result: $cf_cv_gnu_source" >&5 +echo "$as_me:8223: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" @@ -8213,16 +8242,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:8216: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:8245: 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}:8222: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:8251: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 8225 "configure" +#line 8254 "configure" #include "confdefs.h" #include int @@ -8237,16 +8266,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8240: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8269: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8243: \$? = $ac_status" >&5 + echo "$as_me:8272: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8246: \"$ac_try\"") >&5 + { (eval echo "$as_me:8275: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8249: \$? = $ac_status" >&5 + echo "$as_me:8278: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -8267,7 +8296,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 8270 "configure" +#line 8299 "configure" #include "confdefs.h" #include int @@ -8282,16 +8311,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8285: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8314: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8288: \$? = $ac_status" >&5 + echo "$as_me:8317: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8291: \"$ac_try\"") >&5 + { (eval echo "$as_me:8320: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8294: \$? = $ac_status" >&5 + echo "$as_me:8323: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8302,15 +8331,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:8305: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:8334: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:8310: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:8339: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 8313 "configure" +#line 8342 "configure" #include "confdefs.h" #include int @@ -8325,16 +8354,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8328: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8357: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8331: \$? = $ac_status" >&5 + echo "$as_me:8360: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8334: \"$ac_try\"") >&5 + { (eval echo "$as_me:8363: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8337: \$? = $ac_status" >&5 + echo "$as_me:8366: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8350,7 +8379,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8353: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:8382: 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 @@ -8463,14 +8492,14 @@ solaris2.*) #(vi ;; *) -echo "$as_me:8466: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:8495: 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 8473 "configure" +#line 8502 "configure" #include "confdefs.h" #include @@ -8489,16 +8518,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8492: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8521: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8495: \$? = $ac_status" >&5 + echo "$as_me:8524: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8498: \"$ac_try\"") >&5 + { (eval echo "$as_me:8527: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8501: \$? = $ac_status" >&5 + echo "$as_me:8530: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8507,7 +8536,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 8510 "configure" +#line 8539 "configure" #include "confdefs.h" #include @@ -8526,16 +8555,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8529: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8558: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8532: \$? = $ac_status" >&5 + echo "$as_me:8561: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8535: \"$ac_try\"") >&5 + { (eval echo "$as_me:8564: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8538: \$? = $ac_status" >&5 + echo "$as_me:8567: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8550,7 +8579,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8553: result: $cf_cv_xopen_source" >&5 +echo "$as_me:8582: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -8658,16 +8687,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:8661: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:8690: 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}:8667: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:8696: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 8670 "configure" +#line 8699 "configure" #include "confdefs.h" #include int @@ -8682,16 +8711,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8685: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8714: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8688: \$? = $ac_status" >&5 + echo "$as_me:8717: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8691: \"$ac_try\"") >&5 + { (eval echo "$as_me:8720: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8694: \$? = $ac_status" >&5 + echo "$as_me:8723: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -8712,7 +8741,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 8715 "configure" +#line 8744 "configure" #include "confdefs.h" #include int @@ -8727,16 +8756,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8730: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8759: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8733: \$? = $ac_status" >&5 + echo "$as_me:8762: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8736: \"$ac_try\"") >&5 + { (eval echo "$as_me:8765: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8739: \$? = $ac_status" >&5 + echo "$as_me:8768: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8747,15 +8776,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:8750: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:8779: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:8755: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:8784: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 8758 "configure" +#line 8787 "configure" #include "confdefs.h" #include int @@ -8770,16 +8799,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8773: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8802: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8776: \$? = $ac_status" >&5 + echo "$as_me:8805: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8779: \"$ac_try\"") >&5 + { (eval echo "$as_me:8808: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8782: \$? = $ac_status" >&5 + echo "$as_me:8811: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8795,7 +8824,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8798: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:8827: 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 @@ -8968,10 +8997,10 @@ fi fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:8971: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:9000: 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 8974 "configure" +#line 9003 "configure" #include "confdefs.h" #include int @@ -8986,16 +9015,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8989: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9018: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8992: \$? = $ac_status" >&5 + echo "$as_me:9021: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8995: \"$ac_try\"") >&5 + { (eval echo "$as_me:9024: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8998: \$? = $ac_status" >&5 + echo "$as_me:9027: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -9004,12 +9033,12 @@ cat conftest.$ac_ext >&5 cf_XOPEN_SOURCE_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:9007: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:9036: 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 9012 "configure" +#line 9041 "configure" #include "confdefs.h" #include int @@ -9024,16 +9053,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9027: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9056: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9030: \$? = $ac_status" >&5 + echo "$as_me:9059: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9033: \"$ac_try\"") >&5 + { (eval echo "$as_me:9062: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9036: \$? = $ac_status" >&5 + echo "$as_me:9065: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -9044,19 +9073,19 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext if test $cf_XOPEN_SOURCE_set_ok = no then - { echo "$as_me:9047: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:9076: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:9052: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:9081: 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 9059 "configure" +#line 9088 "configure" #include "confdefs.h" #include @@ -9075,16 +9104,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9078: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9107: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9081: \$? = $ac_status" >&5 + echo "$as_me:9110: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9084: \"$ac_try\"") >&5 + { (eval echo "$as_me:9113: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9087: \$? = $ac_status" >&5 + echo "$as_me:9116: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -9093,7 +9122,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 9096 "configure" +#line 9125 "configure" #include "confdefs.h" #include @@ -9112,16 +9141,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9115: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9144: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9118: \$? = $ac_status" >&5 + echo "$as_me:9147: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9121: \"$ac_try\"") >&5 + { (eval echo "$as_me:9150: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9124: \$? = $ac_status" >&5 + echo "$as_me:9153: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -9136,7 +9165,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9139: result: $cf_cv_xopen_source" >&5 +echo "$as_me:9168: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -9241,7 +9270,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:9244: checking for special C compiler options needed for large files" >&5 + echo "$as_me:9273: checking for special C compiler options needed for large files" >&5 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9253,7 +9282,7 @@ else # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. cat >conftest.$ac_ext <<_ACEOF -#line 9256 "configure" +#line 9285 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -9273,16 +9302,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9276: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9305: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9279: \$? = $ac_status" >&5 + echo "$as_me:9308: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9282: \"$ac_try\"") >&5 + { (eval echo "$as_me:9311: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9285: \$? = $ac_status" >&5 + echo "$as_me:9314: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -9292,16 +9321,16 @@ fi rm -f conftest.$ac_objext CC="$CC -n32" rm -f conftest.$ac_objext -if { (eval echo "$as_me:9295: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9324: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9298: \$? = $ac_status" >&5 + echo "$as_me:9327: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9301: \"$ac_try\"") >&5 + { (eval echo "$as_me:9330: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9304: \$? = $ac_status" >&5 + echo "$as_me:9333: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -9315,13 +9344,13 @@ rm -f conftest.$ac_objext rm -f conftest.$ac_ext fi fi -echo "$as_me:9318: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:9347: result: $ac_cv_sys_largefile_CC" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:9324: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:9353: checking for _FILE_OFFSET_BITS value needed for large files" >&5 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9329,7 +9358,7 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF -#line 9332 "configure" +#line 9361 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -9349,16 +9378,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9352: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9381: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9355: \$? = $ac_status" >&5 + echo "$as_me:9384: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9358: \"$ac_try\"") >&5 + { (eval echo "$as_me:9387: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9361: \$? = $ac_status" >&5 + echo "$as_me:9390: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -9367,7 +9396,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 9370 "configure" +#line 9399 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -9388,16 +9417,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9391: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9420: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9394: \$? = $ac_status" >&5 + echo "$as_me:9423: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9397: \"$ac_try\"") >&5 + { (eval echo "$as_me:9426: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9400: \$? = $ac_status" >&5 + echo "$as_me:9429: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -9408,7 +9437,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:9411: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:9440: result: $ac_cv_sys_file_offset_bits" >&5 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 if test "$ac_cv_sys_file_offset_bits" != no; then @@ -9418,7 +9447,7 @@ EOF fi rm -rf conftest* - echo "$as_me:9421: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:9450: checking for _LARGE_FILES value needed for large files" >&5 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9426,7 +9455,7 @@ else while :; do ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF -#line 9429 "configure" +#line 9458 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -9446,16 +9475,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9449: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9478: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9452: \$? = $ac_status" >&5 + echo "$as_me:9481: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9455: \"$ac_try\"") >&5 + { (eval echo "$as_me:9484: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9458: \$? = $ac_status" >&5 + echo "$as_me:9487: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -9464,7 +9493,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 9467 "configure" +#line 9496 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -9485,16 +9514,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9488: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9517: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9491: \$? = $ac_status" >&5 + echo "$as_me:9520: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9494: \"$ac_try\"") >&5 + { (eval echo "$as_me:9523: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9497: \$? = $ac_status" >&5 + echo "$as_me:9526: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_large_files=1; break else @@ -9505,7 +9534,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:9508: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:9537: result: $ac_cv_sys_large_files" >&5 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 if test "$ac_cv_sys_large_files" != no; then @@ -9518,7 +9547,7 @@ rm -rf conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:9521: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:9550: checking for _LARGEFILE_SOURCE value needed for large files" >&5 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9526,7 +9555,7 @@ else while :; do ac_cv_sys_largefile_source=no cat >conftest.$ac_ext <<_ACEOF -#line 9529 "configure" +#line 9558 "configure" #include "confdefs.h" #include int @@ -9538,16 +9567,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9541: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9570: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9544: \$? = $ac_status" >&5 + echo "$as_me:9573: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9547: \"$ac_try\"") >&5 + { (eval echo "$as_me:9576: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9550: \$? = $ac_status" >&5 + echo "$as_me:9579: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -9556,7 +9585,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 9559 "configure" +#line 9588 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include @@ -9569,16 +9598,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9572: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9601: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9575: \$? = $ac_status" >&5 + echo "$as_me:9604: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9578: \"$ac_try\"") >&5 + { (eval echo "$as_me:9607: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9581: \$? = $ac_status" >&5 + echo "$as_me:9610: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_source=1; break else @@ -9589,7 +9618,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:9592: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:9621: result: $ac_cv_sys_largefile_source" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 if test "$ac_cv_sys_largefile_source" != no; then @@ -9603,13 +9632,13 @@ rm -rf conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -echo "$as_me:9606: checking for fseeko" >&5 +echo "$as_me:9635: checking for fseeko" >&5 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 if test "${ac_cv_func_fseeko+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9612 "configure" +#line 9641 "configure" #include "confdefs.h" #include int @@ -9621,16 +9650,16 @@ return fseeko && fseeko (stdin, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9624: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9653: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9627: \$? = $ac_status" >&5 + echo "$as_me:9656: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9630: \"$ac_try\"") >&5 + { (eval echo "$as_me:9659: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9633: \$? = $ac_status" >&5 + echo "$as_me:9662: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fseeko=yes else @@ -9640,7 +9669,7 @@ ac_cv_func_fseeko=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9643: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:9672: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -9661,14 +9690,14 @@ fi test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits " - echo "$as_me:9664: checking whether to use struct dirent64" >&5 + echo "$as_me:9693: checking whether to use struct dirent64" >&5 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 if test "${cf_cv_struct_dirent64+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9671 "configure" +#line 9700 "configure" #include "confdefs.h" #include @@ -9689,16 +9718,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9692: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9721: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9695: \$? = $ac_status" >&5 + echo "$as_me:9724: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9698: \"$ac_try\"") >&5 + { (eval echo "$as_me:9727: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9701: \$? = $ac_status" >&5 + echo "$as_me:9730: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_struct_dirent64=yes else @@ -9709,7 +9738,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9712: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:9741: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF #define HAVE_STRUCT_DIRENT64 1 @@ -9718,7 +9747,7 @@ EOF fi ### Enable compiling-in rcs id's -echo "$as_me:9721: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:9750: checking if RCS identifiers should be compiled-in" >&5 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 # Check whether --with-rcs-ids or --without-rcs-ids was given. @@ -9728,7 +9757,7 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:9731: result: $with_rcs_ids" >&5 +echo "$as_me:9760: result: $with_rcs_ids" >&5 echo "${ECHO_T}$with_rcs_ids" >&6 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF #define USE_RCS_IDS 1 @@ -9737,7 +9766,7 @@ EOF ############################################################################### ### Note that some functions (such as const) are normally disabled anyway. -echo "$as_me:9740: checking if you want to build with function extensions" >&5 +echo "$as_me:9769: checking if you want to build with function extensions" >&5 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. @@ -9747,7 +9776,7 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:9750: result: $with_ext_funcs" >&5 +echo "$as_me:9779: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "$with_ext_funcs" = yes ; then NCURSES_EXT_FUNCS=1 @@ -9764,7 +9793,7 @@ else fi ### use option --enable-const to turn on use of const beyond that in XSI. -echo "$as_me:9767: checking for extended use of const keyword" >&5 +echo "$as_me:9796: checking for extended use of const keyword" >&5 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 # Check whether --enable-const or --disable-const was given. @@ -9774,7 +9803,7 @@ if test "${enable_const+set}" = set; then else with_ext_const=no fi; -echo "$as_me:9777: result: $with_ext_const" >&5 +echo "$as_me:9806: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "$with_ext_const" = yes ; then @@ -9784,7 +9813,7 @@ fi ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:9787: checking if you want all development code" >&5 +echo "$as_me:9816: checking if you want all development code" >&5 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 # Check whether --with-develop or --without-develop was given. @@ -9794,7 +9823,7 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:9797: result: $with_develop" >&5 +echo "$as_me:9826: result: $with_develop" >&5 echo "${ECHO_T}$with_develop" >&6 ############################################################################### @@ -9803,7 +9832,7 @@ echo "${ECHO_T}$with_develop" >&6 # This is still experimental (20080329), but should ultimately be moved to # the script-block --with-normal, etc. -echo "$as_me:9806: checking if you want to link with the pthread library" >&5 +echo "$as_me:9835: checking if you want to link with the pthread library" >&5 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 # Check whether --with-pthread or --without-pthread was given. @@ -9813,27 +9842,27 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:9816: result: $with_pthread" >&5 +echo "$as_me:9845: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:9820: checking for pthread.h" >&5 + echo "$as_me:9849: checking for pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 if test "${ac_cv_header_pthread_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9826 "configure" +#line 9855 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:9830: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:9859: \"$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:9836: \$? = $ac_status" >&5 + echo "$as_me:9865: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9852,7 +9881,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:9855: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:9884: result: $ac_cv_header_pthread_h" >&5 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 if test $ac_cv_header_pthread_h = yes; then @@ -9862,12 +9891,12 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:9865: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:9894: checking if we can link with the $cf_lib_pthread library" >&5 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 cf_save_LIBS="$LIBS" LIBS="-l$cf_lib_pthread $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9870 "configure" +#line 9899 "configure" #include "confdefs.h" #include @@ -9884,16 +9913,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9887: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9916: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9890: \$? = $ac_status" >&5 + echo "$as_me:9919: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9893: \"$ac_try\"") >&5 + { (eval echo "$as_me:9922: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9896: \$? = $ac_status" >&5 + echo "$as_me:9925: \$? = $ac_status" >&5 (exit $ac_status); }; }; then with_pthread=yes else @@ -9903,7 +9932,7 @@ with_pthread=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:9906: result: $with_pthread" >&5 + echo "$as_me:9935: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done @@ -9915,7 +9944,7 @@ echo "${ECHO_T}$with_pthread" >&6 EOF else - { { echo "$as_me:9918: error: Cannot link with pthread library" >&5 + { { echo "$as_me:9947: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -9924,7 +9953,7 @@ fi fi -echo "$as_me:9927: checking if you want to use weak-symbols for pthreads" >&5 +echo "$as_me:9956: checking if you want to use weak-symbols for pthreads" >&5 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. @@ -9934,18 +9963,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; -echo "$as_me:9937: result: $use_weak_symbols" >&5 +echo "$as_me:9966: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "$use_weak_symbols" = yes ; then -echo "$as_me:9941: checking if $CC supports weak symbols" >&5 +echo "$as_me:9970: checking if $CC supports weak symbols" >&5 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 if test "${cf_cv_weak_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9948 "configure" +#line 9977 "configure" #include "confdefs.h" #include @@ -9971,16 +10000,16 @@ weak_symbol(fopen); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9974: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10003: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9977: \$? = $ac_status" >&5 + echo "$as_me:10006: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9980: \"$ac_try\"") >&5 + { (eval echo "$as_me:10009: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9983: \$? = $ac_status" >&5 + echo "$as_me:10012: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_weak_symbols=yes else @@ -9991,7 +10020,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9994: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:10023: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -10018,13 +10047,13 @@ EOF fi # OpenSUSE is installing ncurses6, using reentrant option. -echo "$as_me:10021: checking for _nc_TABSIZE" >&5 +echo "$as_me:10050: checking for _nc_TABSIZE" >&5 echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6 if test "${ac_cv_func__nc_TABSIZE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10027 "configure" +#line 10056 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char _nc_TABSIZE (); below. */ @@ -10055,16 +10084,16 @@ f = _nc_TABSIZE; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10058: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10087: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10061: \$? = $ac_status" >&5 + echo "$as_me:10090: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10064: \"$ac_try\"") >&5 + { (eval echo "$as_me:10093: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10067: \$? = $ac_status" >&5 + echo "$as_me:10096: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func__nc_TABSIZE=yes else @@ -10074,7 +10103,7 @@ ac_cv_func__nc_TABSIZE=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10077: result: $ac_cv_func__nc_TABSIZE" >&5 +echo "$as_me:10106: result: $ac_cv_func__nc_TABSIZE" >&5 echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6 if test $ac_cv_func__nc_TABSIZE = yes; then assume_reentrant=yes @@ -10086,7 +10115,7 @@ fi # opaque outside of that, so there is no --enable-opaque option. We can use # this option without --with-pthreads, but this will be always set for # pthreads. -echo "$as_me:10089: checking if you want experimental reentrant code" >&5 +echo "$as_me:10118: checking if you want experimental reentrant code" >&5 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 # Check whether --enable-reentrant or --disable-reentrant was given. @@ -10096,7 +10125,7 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=$assume_reentrant fi; -echo "$as_me:10099: result: $with_reentrant" >&5 +echo "$as_me:10128: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "$with_reentrant" = yes ; then cf_cv_enable_reentrant=1 @@ -10118,7 +10147,7 @@ fi ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:10121: checking for prefix used to wrap public variables" >&5 + echo "$as_me:10150: checking for prefix used to wrap public variables" >&5 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 # Check whether --with-wrap-prefix or --without-wrap-prefix was given. @@ -10128,7 +10157,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:10131: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:10160: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -10141,7 +10170,7 @@ EOF ############################################################################### ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:10144: checking if you want to display full commands during build" >&5 +echo "$as_me:10173: checking if you want to display full commands during build" >&5 echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -10156,11 +10185,11 @@ if test "$with_echo" = yes; then else ECHO_LINK='@ echo linking $@ ... ;' fi -echo "$as_me:10159: result: $with_echo" >&5 +echo "$as_me:10188: result: $with_echo" >&5 echo "${ECHO_T}$with_echo" >&6 ### use option --enable-warnings to turn on all gcc warnings -echo "$as_me:10163: checking if you want to see compiler warnings" >&5 +echo "$as_me:10192: checking if you want to see compiler warnings" >&5 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -10168,7 +10197,7 @@ if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" with_warnings=$enableval fi; -echo "$as_me:10171: result: $with_warnings" >&5 +echo "$as_me:10200: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "x$with_warnings" = "xyes"; then @@ -10180,12 +10209,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in linux*|gnu*) - echo "$as_me:10183: checking if this is really Intel C compiler" >&5 + echo "$as_me:10212: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >conftest.$ac_ext <<_ACEOF -#line 10188 "configure" +#line 10217 "configure" #include "confdefs.h" int @@ -10202,16 +10231,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10205: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10234: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10208: \$? = $ac_status" >&5 + echo "$as_me:10237: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10211: \"$ac_try\"") >&5 + { (eval echo "$as_me:10240: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10214: \$? = $ac_status" >&5 + echo "$as_me:10243: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -10222,14 +10251,14 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:10225: result: $INTEL_COMPILER" >&5 + echo "$as_me:10254: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac fi cat > conftest.$ac_ext <&5 + { echo "$as_me:10278: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -10262,12 +10291,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:10265: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:10294: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10268: \$? = $ac_status" >&5 + echo "$as_me:10297: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:10270: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:10299: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -10276,7 +10305,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:10279: checking for $CC warning options..." >&5 + { echo "$as_me:10308: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= @@ -10296,12 +10325,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:10299: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:10328: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10302: \$? = $ac_status" >&5 + echo "$as_me:10331: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:10304: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:10333: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -10312,7 +10341,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}:10315: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:10344: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -10345,10 +10374,10 @@ cat > conftest.i <&5 + { echo "$as_me:10377: 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:10429: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10403: \$? = $ac_status" >&5 + echo "$as_me:10432: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:10405: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:10434: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in #(vi @@ -10438,7 +10467,7 @@ rm -rf conftest* fi ### use option --enable-assertions to turn on generation of assertion code -echo "$as_me:10441: checking if you want to enable runtime assertions" >&5 +echo "$as_me:10470: checking if you want to enable runtime assertions" >&5 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 # Check whether --enable-assertions or --disable-assertions was given. @@ -10448,7 +10477,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:10451: result: $with_assertions" >&5 +echo "$as_me:10480: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -10502,7 +10531,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:10505: checking whether to add trace feature to all models" >&5 +echo "$as_me:10534: checking whether to add trace feature to all models" >&5 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 # Check whether --with-trace or --without-trace was given. @@ -10512,7 +10541,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:10515: result: $cf_with_trace" >&5 +echo "$as_me:10544: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "$cf_with_trace" = yes ; then @@ -10605,13 +10634,13 @@ case $cf_cv_system_name in #(vi *mingw32*) #(vi ;; *) -echo "$as_me:10608: checking for gettimeofday" >&5 +echo "$as_me:10637: checking for gettimeofday" >&5 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 if test "${ac_cv_func_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10614 "configure" +#line 10643 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gettimeofday (); below. */ @@ -10642,16 +10671,16 @@ f = gettimeofday; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10645: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10674: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10648: \$? = $ac_status" >&5 + echo "$as_me:10677: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10651: \"$ac_try\"") >&5 + { (eval echo "$as_me:10680: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10654: \$? = $ac_status" >&5 + echo "$as_me:10683: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gettimeofday=yes else @@ -10661,7 +10690,7 @@ ac_cv_func_gettimeofday=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10664: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:10693: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test $ac_cv_func_gettimeofday = yes; then cat >>confdefs.h <<\EOF @@ -10670,7 +10699,7 @@ EOF else -echo "$as_me:10673: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:10702: checking for gettimeofday in -lbsd" >&5 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10678,7 +10707,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10681 "configure" +#line 10710 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10697,16 +10726,16 @@ gettimeofday (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10700: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10729: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10703: \$? = $ac_status" >&5 + echo "$as_me:10732: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10706: \"$ac_try\"") >&5 + { (eval echo "$as_me:10735: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10709: \$? = $ac_status" >&5 + echo "$as_me:10738: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -10717,7 +10746,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10720: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:10749: result: $ac_cv_lib_bsd_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 if test $ac_cv_lib_bsd_gettimeofday = yes; then cat >>confdefs.h <<\EOF @@ -10732,13 +10761,13 @@ fi esac ### Checks for header files. -echo "$as_me:10735: checking for ANSI C header files" >&5 +echo "$as_me:10764: 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 10741 "configure" +#line 10770 "configure" #include "confdefs.h" #include #include @@ -10746,13 +10775,13 @@ else #include _ACEOF -if { (eval echo "$as_me:10749: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:10778: \"$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:10755: \$? = $ac_status" >&5 + echo "$as_me:10784: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -10774,7 +10803,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 10777 "configure" +#line 10806 "configure" #include "confdefs.h" #include @@ -10792,7 +10821,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 10795 "configure" +#line 10824 "configure" #include "confdefs.h" #include @@ -10813,7 +10842,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 10816 "configure" +#line 10845 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -10839,15 +10868,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:10842: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10871: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10845: \$? = $ac_status" >&5 + echo "$as_me:10874: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10847: \"$ac_try\"") >&5 + { (eval echo "$as_me:10876: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10850: \$? = $ac_status" >&5 + echo "$as_me:10879: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -10860,7 +10889,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:10863: result: $ac_cv_header_stdc" >&5 +echo "$as_me:10892: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -10873,13 +10902,13 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:10876: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:10905: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10882 "configure" +#line 10911 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -10894,16 +10923,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10897: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10926: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10900: \$? = $ac_status" >&5 + echo "$as_me:10929: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10903: \"$ac_try\"") >&5 + { (eval echo "$as_me:10932: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10906: \$? = $ac_status" >&5 + echo "$as_me:10935: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -10913,7 +10942,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10916: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:10945: 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:10958: checking for opendir in -ldir" >&5 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 if test "${ac_cv_lib_dir_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10934,7 +10963,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10937 "configure" +#line 10966 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10953,16 +10982,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10956: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10985: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10959: \$? = $ac_status" >&5 + echo "$as_me:10988: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10962: \"$ac_try\"") >&5 + { (eval echo "$as_me:10991: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10965: \$? = $ac_status" >&5 + echo "$as_me:10994: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -10973,14 +11002,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10976: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:11005: result: $ac_cv_lib_dir_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 if test $ac_cv_lib_dir_opendir = yes; then LIBS="$LIBS -ldir" fi else - echo "$as_me:10983: checking for opendir in -lx" >&5 + echo "$as_me:11012: checking for opendir in -lx" >&5 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 if test "${ac_cv_lib_x_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10988,7 +11017,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10991 "configure" +#line 11020 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11007,16 +11036,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11010: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11039: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11013: \$? = $ac_status" >&5 + echo "$as_me:11042: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11016: \"$ac_try\"") >&5 + { (eval echo "$as_me:11045: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11019: \$? = $ac_status" >&5 + echo "$as_me:11048: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -11027,7 +11056,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11030: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:11059: result: $ac_cv_lib_x_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 if test $ac_cv_lib_x_opendir = yes; then LIBS="$LIBS -lx" @@ -11035,13 +11064,13 @@ fi fi -echo "$as_me:11038: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:11067: 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 11044 "configure" +#line 11073 "configure" #include "confdefs.h" #include #include @@ -11057,16 +11086,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11060: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11089: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11063: \$? = $ac_status" >&5 + echo "$as_me:11092: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11066: \"$ac_try\"") >&5 + { (eval echo "$as_me:11095: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11069: \$? = $ac_status" >&5 + echo "$as_me:11098: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -11076,7 +11105,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11079: result: $ac_cv_header_time" >&5 +echo "$as_me:11108: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -11094,7 +11123,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -echo "$as_me:11097: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:11126: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11102,7 +11131,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 11105 "configure" +#line 11134 "configure" #include "confdefs.h" #include #include @@ -11151,16 +11180,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:11154: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11183: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11157: \$? = $ac_status" >&5 + echo "$as_me:11186: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11160: \"$ac_try\"") >&5 + { (eval echo "$as_me:11189: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11163: \$? = $ac_status" >&5 + echo "$as_me:11192: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -11177,21 +11206,21 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:11180: result: none needed" >&5 + echo "$as_me:11209: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:11183: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:11212: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac -echo "$as_me:11188: checking for an ANSI C-conforming const" >&5 +echo "$as_me:11217: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11194 "configure" +#line 11223 "configure" #include "confdefs.h" int @@ -11249,16 +11278,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11252: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11281: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11255: \$? = $ac_status" >&5 + echo "$as_me:11284: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11258: \"$ac_try\"") >&5 + { (eval echo "$as_me:11287: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11261: \$? = $ac_status" >&5 + echo "$as_me:11290: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -11268,7 +11297,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11271: result: $ac_cv_c_const" >&5 +echo "$as_me:11300: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -11280,7 +11309,7 @@ fi ### Checks for external-data -echo "$as_me:11283: checking if data-only library module links" >&5 +echo "$as_me:11312: checking if data-only library module links" >&5 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 if test "${cf_cv_link_dataonly+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11288,20 +11317,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:11323: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11297: \$? = $ac_status" >&5 + echo "$as_me:11326: \$? = $ac_status" >&5 (exit $ac_status); } ; then mv conftest.o data.o && \ ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null fi rm -f conftest.$ac_ext data.o cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:11346: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11320: \$? = $ac_status" >&5 + echo "$as_me:11349: \$? = $ac_status" >&5 (exit $ac_status); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -11330,7 +11359,7 @@ EOF cf_cv_link_dataonly=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 11333 "configure" +#line 11362 "configure" #include "confdefs.h" int main() @@ -11341,15 +11370,15 @@ else _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11344: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11373: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11347: \$? = $ac_status" >&5 + echo "$as_me:11376: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11349: \"$ac_try\"") >&5 + { (eval echo "$as_me:11378: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11352: \$? = $ac_status" >&5 + echo "$as_me:11381: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_dataonly=yes else @@ -11364,7 +11393,7 @@ fi fi -echo "$as_me:11367: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:11396: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -11377,7 +11406,7 @@ fi ### Checks for library functions. -echo "$as_me:11380: checking for working mkstemp" >&5 +echo "$as_me:11409: checking for working mkstemp" >&5 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 if test "${cf_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11388,7 +11417,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 11391 "configure" +#line 11420 "configure" #include "confdefs.h" #include @@ -11426,15 +11455,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11429: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11458: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11432: \$? = $ac_status" >&5 + echo "$as_me:11461: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11434: \"$ac_try\"") >&5 + { (eval echo "$as_me:11463: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11437: \$? = $ac_status" >&5 + echo "$as_me:11466: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -11449,16 +11478,16 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:11452: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:11481: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "x$cf_cv_func_mkstemp" = xmaybe ; then - echo "$as_me:11455: checking for mkstemp" >&5 + echo "$as_me:11484: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 if test "${ac_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11461 "configure" +#line 11490 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mkstemp (); below. */ @@ -11489,16 +11518,16 @@ f = mkstemp; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11492: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11521: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11495: \$? = $ac_status" >&5 + echo "$as_me:11524: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11498: \"$ac_try\"") >&5 + { (eval echo "$as_me:11527: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11501: \$? = $ac_status" >&5 + echo "$as_me:11530: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -11508,7 +11537,7 @@ ac_cv_func_mkstemp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11511: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:11540: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -11519,13 +11548,13 @@ EOF fi -echo "$as_me:11522: checking return type of signal handlers" >&5 +echo "$as_me:11551: checking return type of signal handlers" >&5 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 if test "${ac_cv_type_signal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11528 "configure" +#line 11557 "configure" #include "confdefs.h" #include #include @@ -11547,16 +11576,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11550: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11579: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11553: \$? = $ac_status" >&5 + echo "$as_me:11582: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11556: \"$ac_try\"") >&5 + { (eval echo "$as_me:11585: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11559: \$? = $ac_status" >&5 + echo "$as_me:11588: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signal=void else @@ -11566,7 +11595,7 @@ ac_cv_type_signal=int fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11569: result: $ac_cv_type_signal" >&5 +echo "$as_me:11598: result: $ac_cv_type_signal" >&5 echo "${ECHO_T}$ac_cv_type_signal" >&6 cat >>confdefs.h <&5 +echo "$as_me:11616: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_gnat_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11599,7 +11628,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_gnat_exists="yes" -echo "$as_me:11602: found $ac_dir/$ac_word" >&5 +echo "$as_me:11631: found $ac_dir/$ac_word" >&5 break done @@ -11608,10 +11637,10 @@ fi fi gnat_exists=$ac_cv_prog_gnat_exists if test -n "$gnat_exists"; then - echo "$as_me:11611: result: $gnat_exists" >&5 + echo "$as_me:11640: result: $gnat_exists" >&5 echo "${ECHO_T}$gnat_exists" >&6 else - echo "$as_me:11614: result: no" >&5 + echo "$as_me:11643: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -11620,12 +11649,12 @@ if test "$ac_cv_prog_gnat_exists" = no; then cf_cv_prog_gnat_correct=no else -echo "$as_me:11623: checking for gnat version" >&5 +echo "$as_me:11652: checking for gnat version" >&5 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ grep '[0-9].[0-9][0-9]*' |\ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` -echo "$as_me:11628: result: $cf_gnat_version" >&5 +echo "$as_me:11657: result: $cf_gnat_version" >&5 echo "${ECHO_T}$cf_gnat_version" >&6 case $cf_gnat_version in #(vi @@ -11633,7 +11662,7 @@ case $cf_gnat_version in #(vi cf_cv_prog_gnat_correct=yes ;; *) - { echo "$as_me:11636: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:11665: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} cf_cv_prog_gnat_correct=no ;; @@ -11641,7 +11670,7 @@ esac # Extract the first word of "m4", so it can be a program name with args. set dummy m4; ac_word=$2 -echo "$as_me:11644: checking for $ac_word" >&5 +echo "$as_me:11673: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_M4_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11656,7 +11685,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_M4_exists="yes" -echo "$as_me:11659: found $ac_dir/$ac_word" >&5 +echo "$as_me:11688: found $ac_dir/$ac_word" >&5 break done @@ -11665,10 +11694,10 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:11668: result: $M4_exists" >&5 + echo "$as_me:11697: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:11671: result: no" >&5 + echo "$as_me:11700: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -11677,7 +11706,7 @@ fi echo Ada95 binding required program m4 not found. Ada95 binding disabled. fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:11680: checking if GNAT works" >&5 + echo "$as_me:11709: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf conftest* *~conftest* @@ -11705,7 +11734,7 @@ else fi rm -rf conftest* *~conftest* - echo "$as_me:11708: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:11737: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi fi @@ -11728,7 +11757,7 @@ fi ;; esac -echo "$as_me:11731: checking if GNAT supports generics" >&5 +echo "$as_me:11760: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case $cf_gnat_version in #(vi 3.[1-9]*|[4-9].*) #(vi @@ -11738,7 +11767,7 @@ case $cf_gnat_version in #(vi cf_gnat_generics=no ;; esac -echo "$as_me:11741: result: $cf_gnat_generics" >&5 +echo "$as_me:11770: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -11750,7 +11779,7 @@ else cf_generic_objects= fi -echo "$as_me:11753: checking if GNAT supports SIGINT" >&5 +echo "$as_me:11782: checking if GNAT supports SIGINT" >&5 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 if test "${cf_cv_gnat_sigint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11798,7 +11827,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:11801: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:11830: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test $cf_cv_gnat_sigint = yes ; then @@ -11807,7 +11836,7 @@ else USE_GNAT_SIGINT="#" fi -echo "$as_me:11810: checking if GNAT pragma Unreferenced works" >&5 +echo "$as_me:11839: checking if GNAT pragma Unreferenced works" >&5 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 if test "${cf_cv_pragma_unreferenced+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11838,7 +11867,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:11841: result: $cf_cv_pragma_unreferenced" >&5 +echo "$as_me:11870: result: $cf_cv_pragma_unreferenced" >&5 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6 # if the pragma is supported, use it (needed in the Trace code). @@ -11851,7 +11880,7 @@ fi cf_gnat_libraries=no cf_gnat_projects=no -echo "$as_me:11854: checking if GNAT supports project files" >&5 +echo "$as_me:11883: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case $cf_gnat_version in #(vi 3.[0-9]*) #(vi @@ -11919,14 +11948,14 @@ CF_EOF esac ;; esac -echo "$as_me:11922: result: $cf_gnat_projects" >&5 +echo "$as_me:11951: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 if test $cf_gnat_projects = yes then - echo "$as_me:11927: checking if GNAT supports libraries" >&5 + echo "$as_me:11956: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:11929: result: $cf_gnat_libraries" >&5 + echo "$as_me:11958: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -11946,7 +11975,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:11949: checking for ada-compiler" >&5 +echo "$as_me:11978: checking for ada-compiler" >&5 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 # Check whether --with-ada-compiler or --without-ada-compiler was given. @@ -11957,12 +11986,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:11960: result: $cf_ada_compiler" >&5 +echo "$as_me:11989: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:11965: checking for ada-include" >&5 +echo "$as_me:11994: checking for ada-include" >&5 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 # Check whether --with-ada-include or --without-ada-include was given. @@ -11998,7 +12027,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:12001: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:12030: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -12007,10 +12036,10 @@ esac fi ADA_INCLUDE="$withval" -echo "$as_me:12010: result: $ADA_INCLUDE" >&5 +echo "$as_me:12039: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:12013: checking for ada-objects" >&5 +echo "$as_me:12042: checking for ada-objects" >&5 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 # Check whether --with-ada-objects or --without-ada-objects was given. @@ -12046,7 +12075,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:12049: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:12078: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -12055,10 +12084,10 @@ esac fi ADA_OBJECTS="$withval" -echo "$as_me:12058: result: $ADA_OBJECTS" >&5 +echo "$as_me:12087: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:12061: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:12090: checking if an Ada95 shared-library should be built" >&5 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. @@ -12068,7 +12097,7 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:12071: result: $with_ada_sharedlib" >&5 +echo "$as_me:12100: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 ADA_SHAREDLIB='lib$(LIB_NAME).so.1' @@ -12084,12 +12113,12 @@ then fi else - { { echo "$as_me:12087: error: No usable Ada compiler found" >&5 + { { echo "$as_me:12116: error: No usable Ada compiler found" >&5 echo "$as_me: error: No usable Ada compiler found" >&2;} { (exit 1); exit 1; }; } fi else - { { echo "$as_me:12092: error: The Ada compiler is needed for this package" >&5 + { { echo "$as_me:12121: error: The Ada compiler is needed for this package" >&5 echo "$as_me: error: The Ada compiler is needed for this package" >&2;} { (exit 1); exit 1; }; } fi @@ -12136,7 +12165,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:12139: checking default library suffix" >&5 +echo "$as_me:12168: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -12147,10 +12176,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 shared) DFT_ARG_SUFFIX='' ;; esac test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" -echo "$as_me:12150: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:12179: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:12153: checking default library-dependency suffix" >&5 +echo "$as_me:12182: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in #(vi @@ -12176,7 +12205,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_LIB_SUFFIX='.a' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; - cygwin*) #(vi + cygwin*|mingw*) #(vi DFT_LIB_SUFFIX='.dll' DFT_DEP_SUFFIX='.dll.a' ;; @@ -12203,10 +12232,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 esac test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" -echo "$as_me:12206: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:12235: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:12209: checking default object directory" >&5 +echo "$as_me:12238: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -12222,7 +12251,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:12225: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:12254: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 ### Set up low-level terminfo dependencies for makefiles. @@ -12438,7 +12467,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:12441: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:12470: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -12614,7 +12643,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:12617: error: ambiguous option: $1 + { { echo "$as_me:12646: 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;} @@ -12633,7 +12662,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:12636: error: unrecognized option: $1 + -*) { { echo "$as_me:12665: 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;} @@ -12705,7 +12734,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; - *) { { echo "$as_me:12708: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:12737: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -13023,7 +13052,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:13026: creating $ac_file" >&5 + { echo "$as_me:13055: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -13041,7 +13070,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:13044: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:13073: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -13054,7 +13083,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:13057: error: cannot find input file: $f" >&5 + { { echo "$as_me:13086: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -13120,7 +13149,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:13123: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:13152: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -13131,7 +13160,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:13134: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:13163: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -13144,7 +13173,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:13147: error: cannot find input file: $f" >&5 + { { echo "$as_me:13176: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -13202,7 +13231,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:13205: $ac_file is unchanged" >&5 + { echo "$as_me:13234: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/INSTALL b/INSTALL index bddc708c..bd7227b7 100644 --- a/INSTALL +++ b/INSTALL @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: INSTALL,v 1.164 2012/02/18 21:27:33 tom Exp $ +-- $Id: INSTALL,v 1.165 2012/02/19 21:24:52 tom Exp $ --------------------------------------------------------------------- How to install Ncurses/Terminfo on your system --------------------------------------------------------------------- @@ -596,6 +596,14 @@ SUMMARY OF CONFIGURE OPTIONS: reducing the need for juggling the global SP value with set_term() and delscreen(). + --enable-string-hacks + Controls whether strlcat and strlcpy may be used. The same issue + applies to OpenBSD's warnings about snprintf, noting that this function + is weakly standardized. + + Aside from stifling these warnings, there is no functional improvement + in ncurses. + --enable-symlinks If your system supports symbolic links, make tic use symbolic links rather than hard links to save diskspace when writing aliases in the diff --git a/MANIFEST b/MANIFEST index 5399b9a8..bffc8678 100644 --- a/MANIFEST +++ b/MANIFEST @@ -545,6 +545,7 @@ ./include/nc_alloc.h ./include/nc_mingw.h ./include/nc_panel.h +./include/nc_string.h ./include/nc_termios.h ./include/nc_tparm.h ./include/ncurses_cfg.hin diff --git a/NEWS b/NEWS index 3a831ae1..80465116 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.1861 2012/02/18 23:11:09 tom Exp $ +-- $Id: NEWS,v 1.1866 2012/02/25 20:47:05 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,18 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20120225 + + modify configure script to allow creating dll's for MinGW when + cross-compiling. + + add --enable-string-hacks option to control whether strlcat and + strlcpy may be used. The same issue applies to OpenBSD's warnings + about snprintf, noting that this function is weakly standardized. + + add configure checks for strlcat, strlcpy and snprintf, to help + reduce bogus warnings with OpenBSD builds. + + build-fix for OpenBSD 4.9 to supply consistent intptr_t declaration + (cf:20111231) + + update config.guess, config.sub + 20120218 + correct CF_ETIP_DEFINES configure macro, making it exit properly on the first success (patch by Pierre Labastie). diff --git a/aclocal.m4 b/aclocal.m4 index 3ce9ffe5..9bff894d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.605 2012/02/18 23:06:14 tom Exp $ +dnl $Id: aclocal.m4,v 1.608 2012/02/25 20:21:19 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -1298,6 +1298,37 @@ AC_ARG_ENABLE(rpath, AC_MSG_RESULT($cf_cv_enable_rpath) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_ENABLE_STRING_HACKS version: 1 updated: 2012/02/25 06:33:21 +dnl ---------------------- +dnl On a few platforms, the compiler and/or loader nags with untruthful +dnl comments stating that "most" uses of strcat/strcpy/sprintf are incorrect, +dnl and implying that most uses of the recommended alternatives are correct. +dnl +dnl Factually speaking, no one has actually counted the number of uses of these +dnl functions versus the total of incorrect uses. Samples of a few thousand +dnl instances are meaningless compared to the hundreds of millions of lines of +dnl existing C code. +dnl +dnl strlcat/strlcpy are (as of 2012) non-standard, and are available on some +dnl platforms, in implementations of varying quality. Likewise, snprintf is +dnl standard - but evolved through phases, and older implementations are likely +dnl to yield surprising results, as documented in manpages on various systems. +AC_DEFUN([CF_ENABLE_STRING_HACKS], +[ +AC_MSG_CHECKING(if you want to work around bogus compiler/loader warnings) +AC_ARG_ENABLE(string-hacks, + [ --enable-string-hacks work around bogus compiler/loader warnings], + [with_string_hacks=$enableval], + [with_string_hacks=no]) +AC_MSG_RESULT($with_string_hacks) + +if test "x$with_string_hacks" = "xyes"; then + AC_DEFINE(USE_STRING_HACKS) + AC_MSG_WARN(enabling string-hacks to work around bogus compiler/loader warnings) + AC_CHECK_FUNCS( strlcat strlcpy snprintf ) +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_ERRNO version: 5 updated: 1997/11/30 12:44:39 dnl -------- dnl Check if 'errno' is declared in @@ -2992,7 +3023,7 @@ ifelse($1,,,[$1=$LIB_PREFIX]) AC_SUBST(LIB_PREFIX) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LIB_RULES version: 63 updated: 2012/01/21 19:28:10 +dnl CF_LIB_RULES version: 64 updated: 2012/02/25 15:20:07 dnl ------------ dnl Append definitions and rules for the given models to the subdirectory dnl Makefiles, and the recursion rule for the top-level Makefile. If the @@ -3010,10 +3041,12 @@ AC_DEFUN([CF_LIB_RULES], cf_prefix=$LIB_PREFIX AC_REQUIRE([CF_SUBST_NCURSES_VERSION]) -if test $cf_cv_shlib_version = cygdll ; then +case $cf_cv_shlib_version in #(vi +cygdll|mingw) TINFO_NAME=$TINFO_ARG_SUFFIX TINFO_SUFFIX=.dll -fi + ;; +esac if test -n "$TINFO_SUFFIX" ; then case $TINFO_SUFFIX in @@ -3099,11 +3132,18 @@ do # cygwin needs import library, and has unique naming convention # use autodetected ${cf_prefix} for import lib and static lib, but # use 'cyg' prefix for shared lib. - if test $cf_cv_shlib_version = cygdll ; then + case $cf_cv_shlib_version in #(vi + cygdll) #(vi cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}${cf_cygsuf}" continue - fi + ;; + mingw) + cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` + LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/lib${cf_dir}${cf_cygsuf}" + continue + ;; + esac fi LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/${cf_prefix}${cf_dir}${cf_suffix}" done @@ -3512,7 +3552,7 @@ fi ]) ]) dnl --------------------------------------------------------------------------- -dnl CF_LIB_SUFFIX version: 17 updated: 2011/07/02 15:36:04 +dnl CF_LIB_SUFFIX version: 18 updated: 2012/02/25 15:20:07 dnl ------------- dnl Compute the library file-suffix from the given model name dnl $1 = model name @@ -3545,7 +3585,7 @@ AC_DEFUN([CF_LIB_SUFFIX], $2='.a' $3=[$]$2 ;; - cygwin*) #(vi + cygwin*|mingw*) #(vi $2='.dll' $3='.dll.a' ;; @@ -5218,7 +5258,7 @@ CF_VERBOSE(...checked $1 [$]$1) AC_SUBST(EXTRA_LDFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SHARED_OPTS version: 69 updated: 2011/07/30 19:31:39 +dnl CF_SHARED_OPTS version: 70 updated: 2012/02/25 15:20:07 dnl -------------- dnl -------------- dnl Attempt to determine the appropriate CC/LD options for creating a shared @@ -5387,6 +5427,27 @@ CF_EOF CF_SHARED_SONAME MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]' ;; + mingw*) #(vi + cf_cv_shlib_version=mingw + cf_cv_shlib_version_infix=mingw + CC_SHARED_OPTS= + MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}' + #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]' + #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]' + cat >mk_shared_lib.sh <<-CF_EOF + #!/bin/sh + SHARED_LIB=\[$]1 + IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\` + shift + cat <<-EOF + Linking shared library + ** SHARED_LIB \[$]SHARED_LIB + ** IMPORT_LIB \[$]IMPORT_LIB +EOF + exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB} +CF_EOF + chmod +x mk_shared_lib.sh + ;; openbsd[[2-9]].*|mirbsd*) #(vi if test "$DFT_LWR_MODEL" = "shared" ; then LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" @@ -5528,6 +5589,9 @@ CF_EOF test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}" test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}" + CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS) + CF_VERBOSE(MK_SHARED_LIB: $MK_SHARED_LIB) + AC_SUBST(CC_SHARED_OPTS) AC_SUBST(LD_RPATH_OPT) AC_SUBST(LD_SHARED_OPTS) diff --git a/c++/cursslk.cc b/c++/cursslk.cc index cfbc9da4..23785dfc 100644 --- a/c++/cursslk.cc +++ b/c++/cursslk.cc @@ -1,6 +1,6 @@ // * this is for making emacs happy: -*-Mode: C++;-*- /**************************************************************************** - * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. * + * Copyright (c) 1998-2005,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -35,14 +35,15 @@ #include "cursslk.h" #include "cursesapp.h" -MODULE_ID("$Id: cursslk.cc,v 1.15 2005/08/06 22:12:36 tom Exp $") +MODULE_ID("$Id: cursslk.cc,v 1.16 2012/02/23 10:41:56 tom Exp $") Soft_Label_Key_Set::Soft_Label_Key& Soft_Label_Key_Set::Soft_Label_Key::operator=(char *text) { delete[] label; - label = new char[1 + ::strlen(text)]; - (::strcpy)(label,text); + size_t need = 1 + ::strlen(text); + label = new char[need]; + ::_nc_STRCPY(label,text,need); return *this; } diff --git a/c++/demo.cc b/c++/demo.cc index 7acdd093..8bcfb146 100644 --- a/c++/demo.cc +++ b/c++/demo.cc @@ -1,6 +1,6 @@ // * This makes emacs happy -*-Mode: C++;-*- /**************************************************************************** - * Copyright (c) 1998-2008,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -35,7 +35,7 @@ * Demo code for NCursesMenu and NCursesForm written by * Juergen Pfeifer * - * $Id: demo.cc,v 1.40 2011/09/17 22:12:10 tom Exp $ + * $Id: demo.cc,v 1.41 2012/02/23 10:41:56 tom Exp $ */ #include "internal.h" @@ -320,7 +320,7 @@ public: for(int i=1; i <= S->labels(); i++) { char buf[8]; assert(i < 100); - ::sprintf(buf, "Frm%02d", i); + ::_nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) "Frm%02d", i); (*S)[i] = buf; // Text (*S)[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification } @@ -540,7 +540,7 @@ void TestApplication::init_labels(Soft_Label_Key_Set& S) const for(int i=1; i <= S.labels(); i++) { char buf[8]; assert(i < 100); - ::sprintf(buf, "Key%02d", i); + ::_nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) "Key%02d", i); S[i] = buf; // Text S[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification } diff --git a/c++/internal.h b/c++/internal.h index 64d57cd7..1f6b4a67 100644 --- a/c++/internal.h +++ b/c++/internal.h @@ -1,6 +1,6 @@ // * This makes emacs happy -*-Mode: C++;-*- /**************************************************************************** - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * + * Copyright (c) 1998-2008,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -31,7 +31,7 @@ * Author: Juergen Pfeifer, 1997 * ****************************************************************************/ -// $Id: internal.h,v 1.17 2008/12/07 02:07:34 juergen Exp $ +// $Id: internal.h,v 1.18 2012/02/23 10:41:56 tom Exp $ #ifndef NCURSES_CPLUS_INTERNAL_H #define NCURSES_CPLUS_INTERNAL_H 1 @@ -62,4 +62,6 @@ #define NULL 0 #endif +#include + #endif /* NCURSES_CPLUS_INTERNAL_H */ diff --git a/config.guess b/config.guess index e4b69669..d622a44e 100755 --- a/config.guess +++ b/config.guess @@ -2,9 +2,9 @@ # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2911 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-01-01' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ timestamp='2011-01-01' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -57,7 +55,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -220,10 +218,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in - *4.0) + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; - *5.*) + *5.*) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac @@ -600,50 +598,50 @@ EOF sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include - #include + #define _HPUX_SOURCE + #include + #include - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -792,13 +790,12 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -807,6 +804,9 @@ EOF *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -861,15 +861,22 @@ EOF i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi @@ -877,30 +884,39 @@ EOF exit ;; arm*:Linux:*:*) eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null | \ - grep -q __ARM_EABI__ + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c #ifdef __dietlibc__ LIBC=dietlibc #endif @@ -937,7 +953,7 @@ EOF test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -972,13 +988,13 @@ EOF echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-tilera-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -1096,7 +1112,7 @@ EOF && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1139,8 +1155,8 @@ EOF echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says echo i586-unisys-sysv4 exit ;; *:UNIX_System_V:4*:FTX*) @@ -1168,9 +1184,9 @@ EOF exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1215,12 +1231,12 @@ EOF i386) eval $set_cc_for_build if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac @@ -1229,8 +1245,8 @@ EOF *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} exit ;; @@ -1309,6 +1325,9 @@ EOF i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1331,11 +1350,11 @@ main () #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff --git a/config.sub b/config.sub index 7c62c346..c894da45 100755 --- a/config.sub +++ b/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# 2011 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-04-01' +timestamp='2012-02-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ timestamp='2011-04-01' # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -76,7 +74,7 @@ version="\ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -132,6 +130,10 @@ case $maybe_os in os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -247,17 +249,22 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -291,7 +298,7 @@ case $basic_machine in | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -300,7 +307,7 @@ case $basic_machine in | spu \ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -315,8 +322,7 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -325,21 +331,28 @@ case $basic_machine in ms1) basic_machine=mt-unknown ;; + strongarm | thumb | xscale) basic_machine=arm-unknown ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; xscaleeb) basic_machine=armeb-unknown ;; + xscaleel) basic_machine=armel-unknown ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; + basic_machine=$basic_machine-pc + ;; # Object if more than one company name word. *-*-*) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 @@ -348,11 +361,13 @@ case $basic_machine in # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ @@ -361,8 +376,10 @@ case $basic_machine in | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -396,7 +413,7 @@ case $basic_machine in | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ @@ -404,10 +421,11 @@ case $basic_machine in | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -707,7 +725,6 @@ case $basic_machine in i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -804,10 +821,18 @@ case $basic_machine in ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -836,10 +861,10 @@ case $basic_machine in basic_machine=v70-nec os=-sysv ;; - next | m*-next) + next | m*-next ) basic_machine=m68k-next case $os in - -nextstep*) + -nextstep* ) ;; -ns2*) os=-nextstep2 @@ -958,11 +983,9 @@ case $basic_machine in pn) basic_machine=pn-gould ;; - power) - basic_machine=power-ibm + power) basic_machine=power-ibm ;; - ppc | ppcbe) - basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` @@ -973,11 +996,9 @@ case $basic_machine in ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64) - basic_machine=powerpc64-unknown + ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) - basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -1120,13 +1141,8 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1336,7 +1352,7 @@ case $os in | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1421,7 +1437,7 @@ case $os in -nova*) os=-rtmk-nova ;; - -ns2) + -ns2 ) os=-nextstep2 ;; -nsk*) @@ -1548,9 +1564,6 @@ case $basic_machine in ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout @@ -1618,7 +1631,7 @@ case $basic_machine in m88k-omron*) os=-luna ;; - *-next) + *-next ) os=-nextstep ;; *-sequent) diff --git a/configure b/configure index acf87c60..5f36b162 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.543 . +# From configure.in Revision: 1.545 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20101002. # @@ -802,6 +802,7 @@ Experimental Code: Testing/development Options: --enable-echo build: display "compiling" commands (default) --enable-warnings build: turn on GCC compiler warnings + --enable-string-hacks work around bogus compiler/loader warnings --enable-assertions test: turn on generation of assertion code --with-dmalloc test: use Gray Watson's dmalloc library --with-dbmalloc test: use Conor Cahill's dbmalloc library @@ -1011,7 +1012,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:1014: loading site script $ac_site_file" >&5 + { echo "$as_me:1015: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -1022,7 +1023,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:1025: loading cache $cache_file" >&5 + { echo "$as_me:1026: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1030,7 +1031,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:1033: creating cache $cache_file" >&5 + { echo "$as_me:1034: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1046,21 +1047,21 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:1049: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:1050: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:1053: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:1054: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:1059: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:1060: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:1061: former value: $ac_old_val" >&5 + { echo "$as_me:1062: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:1063: current value: $ac_new_val" >&5 + { echo "$as_me:1064: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -1079,9 +1080,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if $ac_cache_corrupted; then - { echo "$as_me:1082: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1083: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1084: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1085: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1102,10 +1103,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1105: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1106: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1108: \$? = $ac_status" >&5 + echo "$as_me:1109: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -1118,7 +1119,7 @@ ac_config_headers="$ac_config_headers include/ncurses_cfg.h:include/ncurses_cfg. top_builddir=`pwd` -echo "$as_me:1121: checking for egrep" >&5 +echo "$as_me:1122: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_prog_egrep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1128,11 +1129,11 @@ else else ac_cv_prog_egrep='egrep' fi fi -echo "$as_me:1131: result: $ac_cv_prog_egrep" >&5 +echo "$as_me:1132: result: $ac_cv_prog_egrep" >&5 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 EGREP=$ac_cv_prog_egrep -test -z "$EGREP" && { { echo "$as_me:1135: error: No egrep program found" >&5 +test -z "$EGREP" && { { echo "$as_me:1136: error: No egrep program found" >&5 echo "$as_me: error: No egrep program found" >&2;} { (exit 1); exit 1; }; } @@ -1142,7 +1143,7 @@ NCURSES_PATCH="`$ac_cv_prog_egrep '^NCURSES_PATCH[ ]*=' $srcdir/dist.mk | sed - cf_cv_abi_version=${NCURSES_MAJOR} cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} cf_cv_timestamp=`date` -echo "$as_me:1145: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 +echo "$as_me:1146: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0 @@ -1150,7 +1151,7 @@ test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0 # Check whether --with-rel-version or --without-rel-version was given. if test "${with_rel_version+set}" = set; then withval="$with_rel_version" - { echo "$as_me:1153: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 + { echo "$as_me:1154: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;} cf_cv_rel_version=$withval fi; @@ -1163,13 +1164,13 @@ if test -n "$NCURSES_MAJOR" ; then [0-9]*) #(vi ;; *) - { { echo "$as_me:1166: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 + { { echo "$as_me:1167: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;} { (exit 1); exit 1; }; } ;; esac else - { { echo "$as_me:1172: error: Release major-version value is empty" >&5 + { { echo "$as_me:1173: error: Release major-version value is empty" >&5 echo "$as_me: error: Release major-version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -1179,13 +1180,13 @@ if test -n "$NCURSES_MINOR" ; then [0-9]*) #(vi ;; *) - { { echo "$as_me:1182: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 + { { echo "$as_me:1183: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;} { (exit 1); exit 1; }; } ;; esac else - { { echo "$as_me:1188: error: Release minor-version value is empty" >&5 + { { echo "$as_me:1189: error: Release minor-version value is empty" >&5 echo "$as_me: error: Release minor-version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -1195,7 +1196,7 @@ test -z "$cf_cv_abi_version" && cf_cv_abi_version=0 # Check whether --with-abi-version or --without-abi-version was given. if test "${with_abi_version+set}" = set; then withval="$with_abi_version" - { echo "$as_me:1198: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 + { echo "$as_me:1199: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;} cf_cv_abi_version=$withval fi; @@ -1205,13 +1206,13 @@ if test -n "$cf_cv_abi_version" ; then [0-9]*) #(vi ;; *) - { { echo "$as_me:1208: error: ABI version is not a number: $cf_cv_abi_version" >&5 + { { echo "$as_me:1209: error: ABI version is not a number: $cf_cv_abi_version" >&5 echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;} { (exit 1); exit 1; }; } ;; esac else - { { echo "$as_me:1214: error: ABI version value is empty" >&5 + { { echo "$as_me:1215: error: ABI version value is empty" >&5 echo "$as_me: error: ABI version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -1233,7 +1234,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1236: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1237: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1243,11 +1244,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1246: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1247: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1250: checking build system type" >&5 +echo "$as_me:1251: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1256,23 +1257,23 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1259: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1260: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:1263: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1264: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1268: result: $ac_cv_build" >&5 +echo "$as_me:1269: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$as_me:1275: checking host system type" >&5 +echo "$as_me:1276: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1281,12 +1282,12 @@ else test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:1284: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1285: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1289: result: $ac_cv_host" >&5 +echo "$as_me:1290: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1294,7 +1295,7 @@ host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then - echo "$as_me:1297: checking target system type" >&5 + echo "$as_me:1298: checking target system type" >&5 echo $ECHO_N "checking target system type... $ECHO_C" >&6 if test "${ac_cv_target+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1303,12 +1304,12 @@ else test "x$ac_cv_target_alias" = "x" && ac_cv_target_alias=$ac_cv_host_alias ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || - { { echo "$as_me:1306: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + { { echo "$as_me:1307: error: $ac_config_sub $ac_cv_target_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1311: result: $ac_cv_target" >&5 +echo "$as_me:1312: result: $ac_cv_target" >&5 echo "${ECHO_T}$ac_cv_target" >&6 target=$ac_cv_target target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1339,13 +1340,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1342: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1343: result: Configuring for $cf_cv_system_name" >&5 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$as_me:1346: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1347: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 - { { echo "$as_me:1348: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1349: error: \"Please remove config.cache and try again.\"" >&5 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} { (exit 1); exit 1; }; } fi @@ -1353,7 +1354,7 @@ fi # Check whether --with-system-type or --without-system-type was given. if test "${with_system_type+set}" = set; then withval="$with_system_type" - { echo "$as_me:1356: WARNING: overriding system type to $withval" >&5 + { echo "$as_me:1357: WARNING: overriding system type to $withval" >&5 echo "$as_me: WARNING: overriding system type to $withval" >&2;} cf_cv_system_name=$withval fi; @@ -1363,7 +1364,7 @@ cf_user_CFLAGS="$CFLAGS" ### Default install-location -echo "$as_me:1366: checking for prefix" >&5 +echo "$as_me:1367: checking for prefix" >&5 echo $ECHO_N "checking for prefix... $ECHO_C" >&6 if test "x$prefix" = "xNONE" ; then case "$cf_cv_system_name" in @@ -1375,11 +1376,11 @@ if test "x$prefix" = "xNONE" ; then ;; esac fi -echo "$as_me:1378: result: $prefix" >&5 +echo "$as_me:1379: result: $prefix" >&5 echo "${ECHO_T}$prefix" >&6 if test "x$prefix" = "xNONE" ; then -echo "$as_me:1382: checking for default include-directory" >&5 +echo "$as_me:1383: checking for default include-directory" >&5 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 test -n "$verbose" && echo 1>&6 for cf_symbol in \ @@ -1402,7 +1403,7 @@ do fi test -n "$verbose" && echo " tested $cf_dir" 1>&6 done -echo "$as_me:1405: result: $includedir" >&5 +echo "$as_me:1406: result: $includedir" >&5 echo "${ECHO_T}$includedir" >&6 fi @@ -1416,7 +1417,7 @@ ac_main_return=return if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1419: checking for $ac_word" >&5 +echo "$as_me:1420: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1431,7 +1432,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1434: found $ac_dir/$ac_word" >&5 +echo "$as_me:1435: found $ac_dir/$ac_word" >&5 break done @@ -1439,10 +1440,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1442: result: $CC" >&5 + echo "$as_me:1443: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1445: result: no" >&5 + echo "$as_me:1446: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1451,7 +1452,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1454: checking for $ac_word" >&5 +echo "$as_me:1455: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1466,7 +1467,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1469: found $ac_dir/$ac_word" >&5 +echo "$as_me:1470: found $ac_dir/$ac_word" >&5 break done @@ -1474,10 +1475,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1477: result: $ac_ct_CC" >&5 + echo "$as_me:1478: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1480: result: no" >&5 + echo "$as_me:1481: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1490,7 +1491,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1493: checking for $ac_word" >&5 +echo "$as_me:1494: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1505,7 +1506,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1508: found $ac_dir/$ac_word" >&5 +echo "$as_me:1509: found $ac_dir/$ac_word" >&5 break done @@ -1513,10 +1514,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1516: result: $CC" >&5 + echo "$as_me:1517: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1519: result: no" >&5 + echo "$as_me:1520: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1525,7 +1526,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1528: checking for $ac_word" >&5 +echo "$as_me:1529: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1540,7 +1541,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1543: found $ac_dir/$ac_word" >&5 +echo "$as_me:1544: found $ac_dir/$ac_word" >&5 break done @@ -1548,10 +1549,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1551: result: $ac_ct_CC" >&5 + echo "$as_me:1552: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1554: result: no" >&5 + echo "$as_me:1555: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1564,7 +1565,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1567: checking for $ac_word" >&5 +echo "$as_me:1568: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1584,7 +1585,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then continue fi ac_cv_prog_CC="cc" -echo "$as_me:1587: found $ac_dir/$ac_word" >&5 +echo "$as_me:1588: found $ac_dir/$ac_word" >&5 break done @@ -1606,10 +1607,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1609: result: $CC" >&5 + echo "$as_me:1610: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1612: result: no" >&5 + echo "$as_me:1613: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1620,7 +1621,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1623: checking for $ac_word" >&5 +echo "$as_me:1624: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1635,7 +1636,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1638: found $ac_dir/$ac_word" >&5 +echo "$as_me:1639: found $ac_dir/$ac_word" >&5 break done @@ -1643,10 +1644,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1646: result: $CC" >&5 + echo "$as_me:1647: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1649: result: no" >&5 + echo "$as_me:1650: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1659,7 +1660,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1662: checking for $ac_word" >&5 +echo "$as_me:1663: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1674,7 +1675,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1677: found $ac_dir/$ac_word" >&5 +echo "$as_me:1678: found $ac_dir/$ac_word" >&5 break done @@ -1682,10 +1683,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1685: result: $ac_ct_CC" >&5 + echo "$as_me:1686: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1688: result: no" >&5 + echo "$as_me:1689: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1697,32 +1698,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1700: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1701: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1705:" \ +echo "$as_me:1706:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1708: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1709: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1711: \$? = $ac_status" >&5 + echo "$as_me:1712: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1713: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1714: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1716: \$? = $ac_status" >&5 + echo "$as_me:1717: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1718: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1719: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1721: \$? = $ac_status" >&5 + echo "$as_me:1722: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1725 "configure" +#line 1726 "configure" #include "confdefs.h" int @@ -1738,13 +1739,13 @@ ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1741: checking for C compiler default output" >&5 +echo "$as_me:1742: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1744: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1745: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1747: \$? = $ac_status" >&5 + echo "$as_me:1748: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1767,34 +1768,34 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1770: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1771: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1776: result: $ac_file" >&5 +echo "$as_me:1777: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1781: checking whether the C compiler works" >&5 +echo "$as_me:1782: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1787: \"$ac_try\"") >&5 + { (eval echo "$as_me:1788: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1790: \$? = $ac_status" >&5 + echo "$as_me:1791: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1797: error: cannot run C compiled programs. + { { echo "$as_me:1798: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1802,24 +1803,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1805: result: yes" >&5 +echo "$as_me:1806: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1812: checking whether we are cross compiling" >&5 +echo "$as_me:1813: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1814: result: $cross_compiling" >&5 +echo "$as_me:1815: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1817: checking for executable suffix" >&5 +echo "$as_me:1818: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1819: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1820: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1822: \$? = $ac_status" >&5 + echo "$as_me:1823: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1835,25 +1836,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1838: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1839: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1844: result: $ac_cv_exeext" >&5 +echo "$as_me:1845: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1850: checking for object suffix" >&5 +echo "$as_me:1851: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1856 "configure" +#line 1857 "configure" #include "confdefs.h" int @@ -1865,10 +1866,10 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1868: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1869: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1871: \$? = $ac_status" >&5 + echo "$as_me:1872: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1880,24 +1881,24 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1883: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1884: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1890: result: $ac_cv_objext" >&5 +echo "$as_me:1891: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1894: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1895: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1900 "configure" +#line 1901 "configure" #include "confdefs.h" int @@ -1912,16 +1913,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1915: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1916: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1918: \$? = $ac_status" >&5 + echo "$as_me:1919: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1921: \"$ac_try\"") >&5 + { (eval echo "$as_me:1922: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1924: \$? = $ac_status" >&5 + echo "$as_me:1925: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1933,19 +1934,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1936: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1937: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1942: checking whether $CC accepts -g" >&5 +echo "$as_me:1943: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1948 "configure" +#line 1949 "configure" #include "confdefs.h" int @@ -1957,16 +1958,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1960: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1961: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1963: \$? = $ac_status" >&5 + echo "$as_me:1964: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1966: \"$ac_try\"") >&5 + { (eval echo "$as_me:1967: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1969: \$? = $ac_status" >&5 + echo "$as_me:1970: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1976,7 +1977,7 @@ ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1979: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1980: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -2003,16 +2004,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2006: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2007: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2009: \$? = $ac_status" >&5 + echo "$as_me:2010: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2012: \"$ac_try\"") >&5 + { (eval echo "$as_me:2013: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2015: \$? = $ac_status" >&5 + echo "$as_me:2016: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -2024,7 +2025,7 @@ if { (eval echo "$as_me:2006: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 2027 "configure" +#line 2028 "configure" #include "confdefs.h" #include $ac_declaration @@ -2037,16 +2038,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2040: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2041: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2043: \$? = $ac_status" >&5 + echo "$as_me:2044: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2046: \"$ac_try\"") >&5 + { (eval echo "$as_me:2047: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2049: \$? = $ac_status" >&5 + echo "$as_me:2050: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2056,7 +2057,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2059 "configure" +#line 2060 "configure" #include "confdefs.h" $ac_declaration int @@ -2068,16 +2069,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2071: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2072: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2074: \$? = $ac_status" >&5 + echo "$as_me:2075: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2077: \"$ac_try\"") >&5 + { (eval echo "$as_me:2078: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2080: \$? = $ac_status" >&5 + echo "$as_me:2081: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -2107,11 +2108,11 @@ ac_main_return=return GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:2110: checking version of $CC" >&5 + echo "$as_me:2111: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:2114: result: $GCC_VERSION" >&5 + echo "$as_me:2115: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi @@ -2121,7 +2122,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -echo "$as_me:2124: checking how to run the C preprocessor" >&5 +echo "$as_me:2125: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2142,18 +2143,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 2145 "configure" +#line 2146 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2150: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2151: \"$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:2156: \$? = $ac_status" >&5 + echo "$as_me:2157: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2176,17 +2177,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2179 "configure" +#line 2180 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2183: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2184: \"$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:2189: \$? = $ac_status" >&5 + echo "$as_me:2190: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2223,7 +2224,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2226: result: $CPP" >&5 +echo "$as_me:2227: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2233,18 +2234,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 2236 "configure" +#line 2237 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2241: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2242: \"$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:2247: \$? = $ac_status" >&5 + echo "$as_me:2248: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2267,17 +2268,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2270 "configure" +#line 2271 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2274: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2275: \"$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:2280: \$? = $ac_status" >&5 + echo "$as_me:2281: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2305,7 +2306,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:2308: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2309: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2318,14 +2319,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:2321: checking whether $CC needs -traditional" >&5 + echo "$as_me:2322: checking whether $CC needs -traditional" >&5 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 if test "${ac_cv_prog_gcc_traditional+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_pattern="Autoconf.*'x'" cat >conftest.$ac_ext <<_ACEOF -#line 2328 "configure" +#line 2329 "configure" #include "confdefs.h" #include int Autoconf = TIOCGETP; @@ -2340,7 +2341,7 @@ rm -rf conftest* if test $ac_cv_prog_gcc_traditional = no; then cat >conftest.$ac_ext <<_ACEOF -#line 2343 "configure" +#line 2344 "configure" #include "confdefs.h" #include int Autoconf = TCGETA; @@ -2353,14 +2354,14 @@ rm -rf conftest* fi fi -echo "$as_me:2356: result: $ac_cv_prog_gcc_traditional" >&5 +echo "$as_me:2357: result: $ac_cv_prog_gcc_traditional" >&5 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi fi -echo "$as_me:2363: checking whether $CC understands -c and -o together" >&5 +echo "$as_me:2364: checking whether $CC understands -c and -o together" >&5 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6 if test "${cf_cv_prog_CC_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2376,15 +2377,15 @@ CF_EOF # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:2379: \"$ac_try\"") >&5 +if { (eval echo "$as_me:2380: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2382: \$? = $ac_status" >&5 + echo "$as_me:2383: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:2384: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:2385: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2387: \$? = $ac_status" >&5 + echo "$as_me:2388: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CC_c_o=yes @@ -2395,19 +2396,19 @@ rm -rf conftest* fi if test $cf_cv_prog_CC_c_o = yes; then - echo "$as_me:2398: result: yes" >&5 + echo "$as_me:2399: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2401: result: no" >&5 + echo "$as_me:2402: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:2405: checking for POSIXized ISC" >&5 +echo "$as_me:2406: checking for POSIXized ISC" >&5 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then - echo "$as_me:2410: result: yes" >&5 + echo "$as_me:2411: result: yes" >&5 echo "${ECHO_T}yes" >&6 ISC=yes # If later tests want to check for ISC. @@ -2421,7 +2422,7 @@ EOF CC="$CC -Xp" fi else - echo "$as_me:2424: result: no" >&5 + echo "$as_me:2425: result: no" >&5 echo "${ECHO_T}no" >&6 ISC= fi @@ -2432,13 +2433,13 @@ fi # Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content # into CC. This will not help with broken scripts that wrap the compiler with # options, but eliminates a more common category of user confusion. -echo "$as_me:2435: checking \$CC variable" >&5 +echo "$as_me:2436: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in #(vi *[\ \ ]-[IUD]*) - echo "$as_me:2439: result: broken" >&5 + echo "$as_me:2440: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2441: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2442: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_flags=`echo "$CC" | sed -e 's/^[^ ]*[ ]//'` @@ -2524,12 +2525,12 @@ fi ;; *) - echo "$as_me:2527: result: ok" >&5 + echo "$as_me:2528: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2532: checking for ${CC:-cc} option to accept ANSI C" >&5 +echo "$as_me:2533: checking for ${CC:-cc} option to accept ANSI C" >&5 echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6 if test "${cf_cv_ansi_cc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2633,7 +2634,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >conftest.$ac_ext <<_ACEOF -#line 2636 "configure" +#line 2637 "configure" #include "confdefs.h" #ifndef CC_HAS_PROTOS @@ -2654,16 +2655,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2657: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2658: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2660: \$? = $ac_status" >&5 + echo "$as_me:2661: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2663: \"$ac_try\"") >&5 + { (eval echo "$as_me:2664: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2666: \$? = $ac_status" >&5 + echo "$as_me:2667: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ansi_cc="$cf_arg"; break else @@ -2676,7 +2677,7 @@ CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" fi -echo "$as_me:2679: result: $cf_cv_ansi_cc" >&5 +echo "$as_me:2680: result: $cf_cv_ansi_cc" >&5 echo "${ECHO_T}$cf_cv_ansi_cc" >&6 if test "$cf_cv_ansi_cc" != "no"; then @@ -2769,7 +2770,7 @@ fi fi if test "$cf_cv_ansi_cc" = "no"; then - { { echo "$as_me:2772: error: Your compiler does not appear to recognize prototypes. + { { echo "$as_me:2773: error: Your compiler does not appear to recognize prototypes. You have the following choices: a. adjust your compiler options b. get an up-to-date compiler @@ -2809,7 +2810,7 @@ dragonfly*|mirbsd*|freebsd*) #(vi *) LDPATH=$PATH:/sbin:/usr/sbin # Extract the first word of "ldconfig", so it can be a program name with args. set dummy ldconfig; ac_word=$2 -echo "$as_me:2812: checking for $ac_word" >&5 +echo "$as_me:2813: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_LDCONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2826,7 +2827,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_LDCONFIG="$ac_dir/$ac_word" - echo "$as_me:2829: found $ac_dir/$ac_word" >&5 + echo "$as_me:2830: found $ac_dir/$ac_word" >&5 break fi done @@ -2837,10 +2838,10 @@ fi LDCONFIG=$ac_cv_path_LDCONFIG if test -n "$LDCONFIG"; then - echo "$as_me:2840: result: $LDCONFIG" >&5 + echo "$as_me:2841: result: $LDCONFIG" >&5 echo "${ECHO_T}$LDCONFIG" >&6 else - echo "$as_me:2843: result: no" >&5 + echo "$as_me:2844: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2848,7 +2849,7 @@ fi esac fi -echo "$as_me:2851: checking if you want to ensure bool is consistent with C++" >&5 +echo "$as_me:2852: checking if you want to ensure bool is consistent with C++" >&5 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6 # Check whether --with-cxx or --without-cxx was given. @@ -2858,7 +2859,7 @@ if test "${with_cxx+set}" = set; then else cf_with_cxx=yes fi; -echo "$as_me:2861: result: $cf_with_cxx" >&5 +echo "$as_me:2862: result: $cf_with_cxx" >&5 echo "${ECHO_T}$cf_with_cxx" >&6 if test "X$cf_with_cxx" = Xno ; then CXX="" @@ -2876,7 +2877,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:2879: checking for $ac_word" >&5 +echo "$as_me:2880: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2891,7 +2892,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" -echo "$as_me:2894: found $ac_dir/$ac_word" >&5 +echo "$as_me:2895: found $ac_dir/$ac_word" >&5 break done @@ -2899,10 +2900,10 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:2902: result: $CXX" >&5 + echo "$as_me:2903: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:2905: result: no" >&5 + echo "$as_me:2906: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2915,7 +2916,7 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2918: checking for $ac_word" >&5 +echo "$as_me:2919: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2930,7 +2931,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CXX="$ac_prog" -echo "$as_me:2933: found $ac_dir/$ac_word" >&5 +echo "$as_me:2934: found $ac_dir/$ac_word" >&5 break done @@ -2938,10 +2939,10 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:2941: result: $ac_ct_CXX" >&5 + echo "$as_me:2942: result: $ac_ct_CXX" >&5 echo "${ECHO_T}$ac_ct_CXX" >&6 else - echo "$as_me:2944: result: no" >&5 + echo "$as_me:2945: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2953,32 +2954,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++" fi # Provide some information about the compiler. -echo "$as_me:2956:" \ +echo "$as_me:2957:" \ "checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:2959: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:2960: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:2962: \$? = $ac_status" >&5 + echo "$as_me:2963: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:2964: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:2965: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:2967: \$? = $ac_status" >&5 + echo "$as_me:2968: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:2969: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:2970: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:2972: \$? = $ac_status" >&5 + echo "$as_me:2973: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:2975: checking whether we are using the GNU C++ compiler" >&5 +echo "$as_me:2976: checking whether we are using the GNU C++ compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2981 "configure" +#line 2982 "configure" #include "confdefs.h" int @@ -2993,16 +2994,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2996: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2997: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2999: \$? = $ac_status" >&5 + echo "$as_me:3000: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3002: \"$ac_try\"") >&5 + { (eval echo "$as_me:3003: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3005: \$? = $ac_status" >&5 + echo "$as_me:3006: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -3014,19 +3015,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:3017: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "$as_me:3018: result: $ac_cv_cxx_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS CXXFLAGS="-g" -echo "$as_me:3023: checking whether $CXX accepts -g" >&5 +echo "$as_me:3024: checking whether $CXX accepts -g" >&5 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3029 "configure" +#line 3030 "configure" #include "confdefs.h" int @@ -3038,16 +3039,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3041: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3042: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3044: \$? = $ac_status" >&5 + echo "$as_me:3045: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3047: \"$ac_try\"") >&5 + { (eval echo "$as_me:3048: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3050: \$? = $ac_status" >&5 + echo "$as_me:3051: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else @@ -3057,7 +3058,7 @@ ac_cv_prog_cxx_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3060: result: $ac_cv_prog_cxx_g" >&5 +echo "$as_me:3061: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS @@ -3084,7 +3085,7 @@ for ac_declaration in \ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 3087 "configure" +#line 3088 "configure" #include "confdefs.h" #include $ac_declaration @@ -3097,16 +3098,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3100: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3101: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3103: \$? = $ac_status" >&5 + echo "$as_me:3104: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3106: \"$ac_try\"") >&5 + { (eval echo "$as_me:3107: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3109: \$? = $ac_status" >&5 + echo "$as_me:3110: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3116,7 +3117,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 3119 "configure" +#line 3120 "configure" #include "confdefs.h" $ac_declaration int @@ -3128,16 +3129,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3131: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3132: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3134: \$? = $ac_status" >&5 + echo "$as_me:3135: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3137: \"$ac_try\"") >&5 + { (eval echo "$as_me:3138: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3140: \$? = $ac_status" >&5 + echo "$as_me:3141: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -3164,7 +3165,7 @@ ac_main_return=return if test "$CXX" = "g++" ; then # Extract the first word of "g++", so it can be a program name with args. set dummy g++; ac_word=$2 -echo "$as_me:3167: checking for $ac_word" >&5 +echo "$as_me:3168: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3181,7 +3182,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_CXX="$ac_dir/$ac_word" - echo "$as_me:3184: found $ac_dir/$ac_word" >&5 + echo "$as_me:3185: found $ac_dir/$ac_word" >&5 break fi done @@ -3192,16 +3193,16 @@ fi CXX=$ac_cv_path_CXX if test -n "$CXX"; then - echo "$as_me:3195: result: $CXX" >&5 + echo "$as_me:3196: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:3198: result: no" >&5 + echo "$as_me:3199: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi if test "$CXX" = "g++" ; then - { echo "$as_me:3204: WARNING: ignoring hardcoded g++" >&5 + { echo "$as_me:3205: WARNING: ignoring hardcoded g++" >&5 echo "$as_me: WARNING: ignoring hardcoded g++" >&2;} cf_with_cxx=no; CXX=""; GXX=""; fi @@ -3209,11 +3210,11 @@ fi GXX_VERSION=none if test "$GXX" = yes; then - echo "$as_me:3212: checking version of g++" >&5 + echo "$as_me:3213: checking version of g++" >&5 echo $ECHO_N "checking version of g++... $ECHO_C" >&6 GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GXX_VERSION" && GXX_VERSION=unknown - echo "$as_me:3216: result: $GXX_VERSION" >&5 + echo "$as_me:3217: result: $GXX_VERSION" >&5 echo "${ECHO_T}$GXX_VERSION" >&6 fi @@ -3221,12 +3222,12 @@ case $GXX_VERSION in 1*|2.[0-6]*) # GXX=""; CXX=""; ac_cv_prog_gxx=no # cf_cxx_library=no - { echo "$as_me:3224: WARNING: templates do not work" >&5 + { echo "$as_me:3225: WARNING: templates do not work" >&5 echo "$as_me: WARNING: templates do not work" >&2;} ;; esac -echo "$as_me:3229: checking if you want to build C++ binding and demo" >&5 +echo "$as_me:3230: checking if you want to build C++ binding and demo" >&5 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6 # Check whether --with-cxx-binding or --without-cxx-binding was given. @@ -3236,10 +3237,10 @@ if test "${with_cxx_binding+set}" = set; then else cf_with_cxx_binding=$cf_with_cxx fi; -echo "$as_me:3239: result: $cf_with_cxx_binding" >&5 +echo "$as_me:3240: result: $cf_with_cxx_binding" >&5 echo "${ECHO_T}$cf_with_cxx_binding" >&6 -echo "$as_me:3242: checking if you want to build with Ada95" >&5 +echo "$as_me:3243: checking if you want to build with Ada95" >&5 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6 # Check whether --with-ada or --without-ada was given. @@ -3249,10 +3250,10 @@ if test "${with_ada+set}" = set; then else cf_with_ada=yes fi; -echo "$as_me:3252: result: $cf_with_ada" >&5 +echo "$as_me:3253: result: $cf_with_ada" >&5 echo "${ECHO_T}$cf_with_ada" >&6 -echo "$as_me:3255: checking if you want to install manpages" >&5 +echo "$as_me:3256: checking if you want to install manpages" >&5 echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6 # Check whether --with-manpages or --without-manpages was given. @@ -3262,10 +3263,10 @@ if test "${with_manpages+set}" = set; then else cf_with_manpages=yes fi; -echo "$as_me:3265: result: $cf_with_manpages" >&5 +echo "$as_me:3266: result: $cf_with_manpages" >&5 echo "${ECHO_T}$cf_with_manpages" >&6 -echo "$as_me:3268: checking if you want to build programs such as tic" >&5 +echo "$as_me:3269: checking if you want to build programs such as tic" >&5 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6 # Check whether --with-progs or --without-progs was given. @@ -3275,10 +3276,10 @@ if test "${with_progs+set}" = set; then else cf_with_progs=yes fi; -echo "$as_me:3278: result: $cf_with_progs" >&5 +echo "$as_me:3279: result: $cf_with_progs" >&5 echo "${ECHO_T}$cf_with_progs" >&6 -echo "$as_me:3281: checking if you want to build test-programs" >&5 +echo "$as_me:3282: checking if you want to build test-programs" >&5 echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6 # Check whether --with-tests or --without-tests was given. @@ -3288,10 +3289,10 @@ if test "${with_tests+set}" = set; then else cf_with_tests=yes fi; -echo "$as_me:3291: result: $cf_with_tests" >&5 +echo "$as_me:3292: result: $cf_with_tests" >&5 echo "${ECHO_T}$cf_with_tests" >&6 -echo "$as_me:3294: checking if you wish to install curses.h" >&5 +echo "$as_me:3295: checking if you wish to install curses.h" >&5 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6 # Check whether --with-curses-h or --without-curses-h was given. @@ -3301,7 +3302,7 @@ if test "${with_curses_h+set}" = set; then else with_curses_h=yes fi; -echo "$as_me:3304: result: $with_curses_h" >&5 +echo "$as_me:3305: result: $with_curses_h" >&5 echo "${ECHO_T}$with_curses_h" >&6 modules_to_build="ncurses" @@ -3327,7 +3328,7 @@ for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3330: checking for $ac_word" >&5 +echo "$as_me:3331: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3342,7 +3343,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AWK="$ac_prog" -echo "$as_me:3345: found $ac_dir/$ac_word" >&5 +echo "$as_me:3346: found $ac_dir/$ac_word" >&5 break done @@ -3350,21 +3351,21 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:3353: result: $AWK" >&5 + echo "$as_me:3354: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:3356: result: no" >&5 + echo "$as_me:3357: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -test -z "$AWK" && { { echo "$as_me:3363: error: No awk program found" >&5 +test -z "$AWK" && { { echo "$as_me:3364: error: No awk program found" >&5 echo "$as_me: error: No awk program found" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:3367: checking for egrep" >&5 +echo "$as_me:3368: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_prog_egrep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3374,11 +3375,11 @@ else else ac_cv_prog_egrep='egrep' fi fi -echo "$as_me:3377: result: $ac_cv_prog_egrep" >&5 +echo "$as_me:3378: result: $ac_cv_prog_egrep" >&5 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 EGREP=$ac_cv_prog_egrep -test -z "$EGREP" && { { echo "$as_me:3381: error: No egrep program found" >&5 +test -z "$EGREP" && { { echo "$as_me:3382: error: No egrep program found" >&5 echo "$as_me: error: No egrep program found" >&2;} { (exit 1); exit 1; }; } @@ -3394,7 +3395,7 @@ echo "$as_me: error: No egrep program found" >&2;} # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:3397: checking for a BSD compatible install" >&5 +echo "$as_me:3398: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -3443,7 +3444,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:3446: result: $INSTALL" >&5 +echo "$as_me:3447: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -3468,7 +3469,7 @@ for ac_prog in tdlint lint alint splint lclint 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:3471: checking for $ac_word" >&5 +echo "$as_me:3472: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3483,7 +3484,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LINT="$ac_prog" -echo "$as_me:3486: found $ac_dir/$ac_word" >&5 +echo "$as_me:3487: found $ac_dir/$ac_word" >&5 break done @@ -3491,28 +3492,28 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:3494: result: $LINT" >&5 + echo "$as_me:3495: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:3497: result: no" >&5 + echo "$as_me:3498: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$LINT" && break done -echo "$as_me:3504: checking whether ln -s works" >&5 +echo "$as_me:3505: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:3508: result: yes" >&5 + echo "$as_me:3509: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:3511: result: no, using $LN_S" >&5 + echo "$as_me:3512: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:3515: checking if $LN_S -f options work" >&5 +echo "$as_me:3516: checking if $LN_S -f options work" >&5 echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6 rm -f conf$$.src conf$$dst @@ -3524,12 +3525,12 @@ else cf_prog_ln_sf=no fi rm -f conf$$.dst conf$$src -echo "$as_me:3527: result: $cf_prog_ln_sf" >&5 +echo "$as_me:3528: result: $cf_prog_ln_sf" >&5 echo "${ECHO_T}$cf_prog_ln_sf" >&6 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" -echo "$as_me:3532: checking for long file names" >&5 +echo "$as_me:3533: checking for long file names" >&5 echo $ECHO_N "checking for long file names... $ECHO_C" >&6 if test "${ac_cv_sys_long_file_names+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3568,7 +3569,7 @@ for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do rm -rf $ac_xdir 2>/dev/null done fi -echo "$as_me:3571: result: $ac_cv_sys_long_file_names" >&5 +echo "$as_me:3572: result: $ac_cv_sys_long_file_names" >&5 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 if test $ac_cv_sys_long_file_names = yes; then @@ -3580,7 +3581,7 @@ fi # if we find pkg-config, check if we should install the ".pc" files. -echo "$as_me:3583: checking if you want to use pkg-config" >&5 +echo "$as_me:3584: 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. @@ -3590,7 +3591,7 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:3593: result: $cf_pkg_config" >&5 +echo "$as_me:3594: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 case $cf_pkg_config in #(vi @@ -3602,7 +3603,7 @@ yes) #(vi 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:3605: checking for $ac_word" >&5 +echo "$as_me:3606: 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 @@ -3619,7 +3620,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:3622: found $ac_dir/$ac_word" >&5 + echo "$as_me:3623: found $ac_dir/$ac_word" >&5 break fi done @@ -3630,10 +3631,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:3633: result: $PKG_CONFIG" >&5 + echo "$as_me:3634: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:3636: result: no" >&5 + echo "$as_me:3637: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3642,7 +3643,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:3645: checking for $ac_word" >&5 +echo "$as_me:3646: 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 @@ -3659,7 +3660,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:3662: found $ac_dir/$ac_word" >&5 + echo "$as_me:3663: found $ac_dir/$ac_word" >&5 break fi done @@ -3671,10 +3672,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:3674: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:3675: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:3677: result: no" >&5 + echo "$as_me:3678: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3717,7 +3718,7 @@ case ".$PKG_CONFIG" in #(vi PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:3720: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:3721: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -3726,7 +3727,7 @@ esac fi if test "$PKG_CONFIG" != none ; then - echo "$as_me:3729: checking for $PKG_CONFIG library directory" >&5 + echo "$as_me:3730: checking for $PKG_CONFIG library directory" >&5 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 # Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given. @@ -3763,13 +3764,13 @@ fi; ;; esac - echo "$as_me:3766: result: $PKG_CONFIG_LIBDIR" >&5 + echo "$as_me:3767: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 fi if test "$PKG_CONFIG" != none ; then if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then - echo "$as_me:3772: checking if we should install .pc files for $PKG_CONFIG" >&5 + echo "$as_me:3773: checking if we should install .pc files for $PKG_CONFIG" >&5 echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 # Check whether --enable-pc-files or --disable-pc-files was given. @@ -3779,18 +3780,18 @@ if test "${enable_pc_files+set}" = set; then else enable_pc_files=no fi; - echo "$as_me:3782: result: $enable_pc_files" >&5 + echo "$as_me:3783: result: $enable_pc_files" >&5 echo "${ECHO_T}$enable_pc_files" >&6 elif test -z "$PKG_CONFIG_LIBDIR" || test "$PKG_CONFIG_LIBDIR" != no; then enable_pc_files=no - { echo "$as_me:3786: WARNING: did not find $PKG_CONFIG library" >&5 + { echo "$as_me:3787: WARNING: did not find $PKG_CONFIG library" >&5 echo "$as_me: WARNING: did not find $PKG_CONFIG library" >&2;} fi else enable_pc_files=no fi -echo "$as_me:3793: checking if we should assume mixed-case filenames" >&5 +echo "$as_me:3794: checking if we should assume mixed-case filenames" >&5 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 # Check whether --enable-mixed-case or --disable-mixed-case was given. @@ -3800,11 +3801,11 @@ if test "${enable_mixed_case+set}" = set; then else enable_mixedcase=auto fi; -echo "$as_me:3803: result: $enable_mixedcase" >&5 +echo "$as_me:3804: result: $enable_mixedcase" >&5 echo "${ECHO_T}$enable_mixedcase" >&6 if test "$enable_mixedcase" = "auto" ; then -echo "$as_me:3807: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:3808: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3831,7 +3832,7 @@ else fi fi -echo "$as_me:3834: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3835: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF #define MIXEDCASE_FILENAMES 1 @@ -3848,7 +3849,7 @@ EOF fi # do this after mixed-case option (tags/TAGS is not as important as tic). -echo "$as_me:3851: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:3852: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -3868,11 +3869,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:3871: result: yes" >&5 + echo "$as_me:3872: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:3875: result: no" >&5 + echo "$as_me:3876: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -3881,7 +3882,7 @@ for ac_prog in exctags ctags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3884: checking for $ac_word" >&5 +echo "$as_me:3885: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CTAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3896,7 +3897,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CTAGS="$ac_prog" -echo "$as_me:3899: found $ac_dir/$ac_word" >&5 +echo "$as_me:3900: found $ac_dir/$ac_word" >&5 break done @@ -3904,10 +3905,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:3907: result: $CTAGS" >&5 + echo "$as_me:3908: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:3910: result: no" >&5 + echo "$as_me:3911: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3918,7 +3919,7 @@ for ac_prog in exetags etags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3921: checking for $ac_word" >&5 +echo "$as_me:3922: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ETAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3933,7 +3934,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ETAGS="$ac_prog" -echo "$as_me:3936: found $ac_dir/$ac_word" >&5 +echo "$as_me:3937: found $ac_dir/$ac_word" >&5 break done @@ -3941,10 +3942,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:3944: result: $ETAGS" >&5 + echo "$as_me:3945: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:3947: result: no" >&5 + echo "$as_me:3948: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3953,7 +3954,7 @@ done # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. set dummy ${CTAGS:-ctags}; ac_word=$2 -echo "$as_me:3956: checking for $ac_word" >&5 +echo "$as_me:3957: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3968,7 +3969,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_LOWER_TAGS="yes" -echo "$as_me:3971: found $ac_dir/$ac_word" >&5 +echo "$as_me:3972: found $ac_dir/$ac_word" >&5 break done @@ -3977,17 +3978,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:3980: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:3981: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:3983: result: no" >&5 + echo "$as_me:3984: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cf_cv_mixedcase" = yes ; then # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. set dummy ${ETAGS:-etags}; ac_word=$2 -echo "$as_me:3990: checking for $ac_word" >&5 +echo "$as_me:3991: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4002,7 +4003,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_UPPER_TAGS="yes" -echo "$as_me:4005: found $ac_dir/$ac_word" >&5 +echo "$as_me:4006: found $ac_dir/$ac_word" >&5 break done @@ -4011,10 +4012,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:4014: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:4015: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:4017: result: no" >&5 + echo "$as_me:4018: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4034,7 +4035,7 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:4037: checking for makeflags variable" >&5 +echo "$as_me:4038: checking for makeflags variable" >&5 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 if test "${cf_cv_makeflags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4068,13 +4069,13 @@ CF_EOF rm -f cf_makeflags.tmp fi -echo "$as_me:4071: result: $cf_cv_makeflags" >&5 +echo "$as_me:4072: result: $cf_cv_makeflags" >&5 echo "${ECHO_T}$cf_cv_makeflags" >&6 if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:4077: checking for $ac_word" >&5 +echo "$as_me:4078: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4089,7 +4090,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:4092: found $ac_dir/$ac_word" >&5 +echo "$as_me:4093: found $ac_dir/$ac_word" >&5 break done @@ -4097,10 +4098,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:4100: result: $RANLIB" >&5 + echo "$as_me:4101: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:4103: result: no" >&5 + echo "$as_me:4104: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4109,7 +4110,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:4112: checking for $ac_word" >&5 +echo "$as_me:4113: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4124,7 +4125,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:4127: found $ac_dir/$ac_word" >&5 +echo "$as_me:4128: found $ac_dir/$ac_word" >&5 break done @@ -4133,10 +4134,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:4136: result: $ac_ct_RANLIB" >&5 + echo "$as_me:4137: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:4139: result: no" >&5 + echo "$as_me:4140: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4148,7 +4149,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 -echo "$as_me:4151: checking for $ac_word" >&5 +echo "$as_me:4152: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4163,7 +4164,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LD="${ac_tool_prefix}ld" -echo "$as_me:4166: found $ac_dir/$ac_word" >&5 +echo "$as_me:4167: found $ac_dir/$ac_word" >&5 break done @@ -4171,10 +4172,10 @@ fi fi LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$as_me:4174: result: $LD" >&5 + echo "$as_me:4175: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:4177: result: no" >&5 + echo "$as_me:4178: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4183,7 +4184,7 @@ if test -z "$ac_cv_prog_LD"; then ac_ct_LD=$LD # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 -echo "$as_me:4186: checking for $ac_word" >&5 +echo "$as_me:4187: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4198,7 +4199,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_LD="ld" -echo "$as_me:4201: found $ac_dir/$ac_word" >&5 +echo "$as_me:4202: found $ac_dir/$ac_word" >&5 break done @@ -4207,10 +4208,10 @@ fi fi ac_ct_LD=$ac_cv_prog_ac_ct_LD if test -n "$ac_ct_LD"; then - echo "$as_me:4210: result: $ac_ct_LD" >&5 + echo "$as_me:4211: result: $ac_ct_LD" >&5 echo "${ECHO_T}$ac_ct_LD" >&6 else - echo "$as_me:4213: result: no" >&5 + echo "$as_me:4214: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4222,7 +4223,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:4225: checking for $ac_word" >&5 +echo "$as_me:4226: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4237,7 +4238,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AR="${ac_tool_prefix}ar" -echo "$as_me:4240: found $ac_dir/$ac_word" >&5 +echo "$as_me:4241: found $ac_dir/$ac_word" >&5 break done @@ -4245,10 +4246,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:4248: result: $AR" >&5 + echo "$as_me:4249: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:4251: result: no" >&5 + echo "$as_me:4252: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4257,7 +4258,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:4260: checking for $ac_word" >&5 +echo "$as_me:4261: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4272,7 +4273,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_AR="ar" -echo "$as_me:4275: found $ac_dir/$ac_word" >&5 +echo "$as_me:4276: found $ac_dir/$ac_word" >&5 break done @@ -4281,10 +4282,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:4284: result: $ac_ct_AR" >&5 + echo "$as_me:4285: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4287: result: no" >&5 + echo "$as_me:4288: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4296,7 +4297,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:4299: checking for $ac_word" >&5 +echo "$as_me:4300: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4311,7 +4312,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AR="${ac_tool_prefix}ar" -echo "$as_me:4314: found $ac_dir/$ac_word" >&5 +echo "$as_me:4315: found $ac_dir/$ac_word" >&5 break done @@ -4319,10 +4320,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:4322: result: $AR" >&5 + echo "$as_me:4323: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:4325: result: no" >&5 + echo "$as_me:4326: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4331,7 +4332,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:4334: checking for $ac_word" >&5 +echo "$as_me:4335: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4346,7 +4347,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_AR="ar" -echo "$as_me:4349: found $ac_dir/$ac_word" >&5 +echo "$as_me:4350: found $ac_dir/$ac_word" >&5 break done @@ -4355,10 +4356,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:4358: result: $ac_ct_AR" >&5 + echo "$as_me:4359: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4361: result: no" >&5 + echo "$as_me:4362: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4367,7 +4368,7 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:4370: checking for options to update archives" >&5 +echo "$as_me:4371: checking for options to update archives" >&5 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 if test "${cf_cv_ar_flags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4390,13 +4391,13 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:4397: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4399: \$? = $ac_status" >&5 + echo "$as_me:4400: \$? = $ac_status" >&5 (exit $ac_status); } ; then echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null @@ -4407,7 +4408,7 @@ EOF else test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me:-configure}:4410: testing cannot compile test-program ..." 1>&5 +echo "${as_me:-configure}:4411: testing cannot compile test-program ..." 1>&5 break fi @@ -4415,7 +4416,7 @@ echo "${as_me:-configure}:4410: testing cannot compile test-program ..." 1>&5 rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext fi -echo "$as_me:4418: result: $cf_cv_ar_flags" >&5 +echo "$as_me:4419: result: $cf_cv_ar_flags" >&5 echo "${ECHO_T}$cf_cv_ar_flags" >&6 if test -n "$ARFLAGS" ; then @@ -4426,7 +4427,7 @@ else ARFLAGS=$cf_cv_ar_flags fi -echo "$as_me:4429: checking if you have specified an install-prefix" >&5 +echo "$as_me:4430: checking if you have specified an install-prefix" >&5 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 # Check whether --with-install-prefix or --without-install-prefix was given. @@ -4439,7 +4440,7 @@ if test "${with_install_prefix+set}" = set; then ;; esac fi; -echo "$as_me:4442: result: $DESTDIR" >&5 +echo "$as_me:4443: result: $DESTDIR" >&5 echo "${ECHO_T}$DESTDIR" >&6 ############################################################################### @@ -4467,7 +4468,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:4470: checking for $ac_word" >&5 +echo "$as_me:4471: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_BUILD_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4482,7 +4483,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_BUILD_CC="$ac_prog" -echo "$as_me:4485: found $ac_dir/$ac_word" >&5 +echo "$as_me:4486: found $ac_dir/$ac_word" >&5 break done @@ -4490,10 +4491,10 @@ fi fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - echo "$as_me:4493: result: $BUILD_CC" >&5 + echo "$as_me:4494: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 else - echo "$as_me:4496: result: no" >&5 + echo "$as_me:4497: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4501,12 +4502,12 @@ fi done fi; - echo "$as_me:4504: checking for native build C compiler" >&5 + echo "$as_me:4505: checking for native build C compiler" >&5 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 - echo "$as_me:4506: result: $BUILD_CC" >&5 + echo "$as_me:4507: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 - echo "$as_me:4509: checking for native build C preprocessor" >&5 + echo "$as_me:4510: checking for native build C preprocessor" >&5 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 # Check whether --with-build-cpp or --without-build-cpp was given. @@ -4516,10 +4517,10 @@ if test "${with_build_cpp+set}" = set; then else BUILD_CPP='${BUILD_CC} -E' fi; - echo "$as_me:4519: result: $BUILD_CPP" >&5 + echo "$as_me:4520: result: $BUILD_CPP" >&5 echo "${ECHO_T}$BUILD_CPP" >&6 - echo "$as_me:4522: checking for native build C flags" >&5 + echo "$as_me:4523: checking for native build C flags" >&5 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 # Check whether --with-build-cflags or --without-build-cflags was given. @@ -4527,10 +4528,10 @@ if test "${with_build_cflags+set}" = set; then withval="$with_build_cflags" BUILD_CFLAGS="$withval" fi; - echo "$as_me:4530: result: $BUILD_CFLAGS" >&5 + echo "$as_me:4531: result: $BUILD_CFLAGS" >&5 echo "${ECHO_T}$BUILD_CFLAGS" >&6 - echo "$as_me:4533: checking for native build C preprocessor-flags" >&5 + echo "$as_me:4534: checking for native build C preprocessor-flags" >&5 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 # Check whether --with-build-cppflags or --without-build-cppflags was given. @@ -4538,10 +4539,10 @@ if test "${with_build_cppflags+set}" = set; then withval="$with_build_cppflags" BUILD_CPPFLAGS="$withval" fi; - echo "$as_me:4541: result: $BUILD_CPPFLAGS" >&5 + echo "$as_me:4542: result: $BUILD_CPPFLAGS" >&5 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - echo "$as_me:4544: checking for native build linker-flags" >&5 + echo "$as_me:4545: checking for native build linker-flags" >&5 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 # Check whether --with-build-ldflags or --without-build-ldflags was given. @@ -4549,10 +4550,10 @@ if test "${with_build_ldflags+set}" = set; then withval="$with_build_ldflags" BUILD_LDFLAGS="$withval" fi; - echo "$as_me:4552: result: $BUILD_LDFLAGS" >&5 + echo "$as_me:4553: result: $BUILD_LDFLAGS" >&5 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - echo "$as_me:4555: checking for native build linker-libraries" >&5 + echo "$as_me:4556: checking for native build linker-libraries" >&5 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 # Check whether --with-build-libs or --without-build-libs was given. @@ -4560,7 +4561,7 @@ if test "${with_build_libs+set}" = set; then withval="$with_build_libs" BUILD_LIBS="$withval" fi; - echo "$as_me:4563: result: $BUILD_LIBS" >&5 + echo "$as_me:4564: result: $BUILD_LIBS" >&5 echo "${ECHO_T}$BUILD_LIBS" >&6 # this assumes we're on Unix. @@ -4570,7 +4571,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6 : ${BUILD_CC:='${CC}'} if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then - { { echo "$as_me:4573: error: Cross-build requires two compilers. + { { echo "$as_me:4574: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&5 echo "$as_me: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&2;} @@ -4595,7 +4596,7 @@ fi ### shared, for example. cf_list_models="" -echo "$as_me:4598: checking if libtool -version-number should be used" >&5 +echo "$as_me:4599: checking if libtool -version-number should be used" >&5 echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6 # Check whether --enable-libtool-version or --disable-libtool-version was given. @@ -4612,7 +4613,7 @@ else cf_libtool_version=yes fi; -echo "$as_me:4615: result: $cf_libtool_version" >&5 +echo "$as_me:4616: result: $cf_libtool_version" >&5 echo "${ECHO_T}$cf_libtool_version" >&6 if test "$cf_libtool_version" = yes ; then @@ -4637,7 +4638,7 @@ LIB_LINK='${CC}' LIB_INSTALL= LIB_UNINSTALL= -echo "$as_me:4640: checking if you want to build libraries with libtool" >&5 +echo "$as_me:4641: checking if you want to build libraries with libtool" >&5 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6 # Check whether --with-libtool or --without-libtool was given. @@ -4647,7 +4648,7 @@ if test "${with_libtool+set}" = set; then else with_libtool=no fi; -echo "$as_me:4650: result: $with_libtool" >&5 +echo "$as_me:4651: result: $with_libtool" >&5 echo "${ECHO_T}$with_libtool" >&6 if test "$with_libtool" != "no"; then @@ -4678,7 +4679,7 @@ case ".$with_libtool" in #(vi with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:4681: error: expected a pathname, not \"$with_libtool\"" >&5 + { { echo "$as_me:4682: error: expected a pathname, not \"$with_libtool\"" >&5 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -4688,7 +4689,7 @@ esac else # Extract the first word of "libtool", so it can be a program name with args. set dummy libtool; ac_word=$2 -echo "$as_me:4691: checking for $ac_word" >&5 +echo "$as_me:4692: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4705,7 +4706,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_LIBTOOL="$ac_dir/$ac_word" - echo "$as_me:4708: found $ac_dir/$ac_word" >&5 + echo "$as_me:4709: found $ac_dir/$ac_word" >&5 break fi done @@ -4716,16 +4717,16 @@ fi LIBTOOL=$ac_cv_path_LIBTOOL if test -n "$LIBTOOL"; then - echo "$as_me:4719: result: $LIBTOOL" >&5 + echo "$as_me:4720: result: $LIBTOOL" >&5 echo "${ECHO_T}$LIBTOOL" >&6 else - echo "$as_me:4722: result: no" >&5 + echo "$as_me:4723: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi if test -z "$LIBTOOL" ; then - { { echo "$as_me:4728: error: Cannot find libtool" >&5 + { { echo "$as_me:4729: error: Cannot find libtool" >&5 echo "$as_me: error: Cannot find libtool" >&2;} { (exit 1); exit 1; }; } fi @@ -4740,17 +4741,17 @@ echo "$as_me: error: Cannot find libtool" >&2;} LIB_PREP=: # Show the version of libtool - echo "$as_me:4743: checking version of libtool" >&5 + echo "$as_me:4744: checking version of libtool" >&5 echo $ECHO_N "checking version of libtool... $ECHO_C" >&6 # Save the version in a cache variable - this is not entirely a good # thing, but the version string from libtool is very ugly, and for # bug reports it might be useful to have the original string. "(" cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'` - echo "$as_me:4750: result: $cf_cv_libtool_version" >&5 + echo "$as_me:4751: result: $cf_cv_libtool_version" >&5 echo "${ECHO_T}$cf_cv_libtool_version" >&6 if test -z "$cf_cv_libtool_version" ; then - { { echo "$as_me:4753: error: This is not GNU libtool" >&5 + { { echo "$as_me:4754: error: This is not GNU libtool" >&5 echo "$as_me: error: This is not GNU libtool" >&2;} { (exit 1); exit 1; }; } fi @@ -4786,7 +4787,7 @@ cf_list_models="$cf_list_models libtool" else -echo "$as_me:4789: checking if you want to build shared libraries" >&5 +echo "$as_me:4790: checking if you want to build shared libraries" >&5 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 # Check whether --with-shared or --without-shared was given. @@ -4796,11 +4797,11 @@ if test "${with_shared+set}" = set; then else with_shared=no fi; -echo "$as_me:4799: result: $with_shared" >&5 +echo "$as_me:4800: result: $with_shared" >&5 echo "${ECHO_T}$with_shared" >&6 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" -echo "$as_me:4803: checking if you want to build static libraries" >&5 +echo "$as_me:4804: checking if you want to build static libraries" >&5 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6 # Check whether --with-normal or --without-normal was given. @@ -4810,11 +4811,11 @@ if test "${with_normal+set}" = set; then else with_normal=yes fi; -echo "$as_me:4813: result: $with_normal" >&5 +echo "$as_me:4814: result: $with_normal" >&5 echo "${ECHO_T}$with_normal" >&6 test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal" -echo "$as_me:4817: checking if you want to build debug libraries" >&5 +echo "$as_me:4818: checking if you want to build debug libraries" >&5 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6 # Check whether --with-debug or --without-debug was given. @@ -4824,11 +4825,11 @@ if test "${with_debug+set}" = set; then else with_debug=yes fi; -echo "$as_me:4827: result: $with_debug" >&5 +echo "$as_me:4828: result: $with_debug" >&5 echo "${ECHO_T}$with_debug" >&6 test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug" -echo "$as_me:4831: checking if you want to build profiling libraries" >&5 +echo "$as_me:4832: checking if you want to build profiling libraries" >&5 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6 # Check whether --with-profile or --without-profile was given. @@ -4838,7 +4839,7 @@ if test "${with_profile+set}" = set; then else with_profile=no fi; -echo "$as_me:4841: result: $with_profile" >&5 +echo "$as_me:4842: result: $with_profile" >&5 echo "${ECHO_T}$with_profile" >&6 test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile" @@ -4846,19 +4847,19 @@ fi ############################################################################### -echo "$as_me:4849: checking for specified models" >&5 +echo "$as_me:4850: checking for specified models" >&5 echo $ECHO_N "checking for specified models... $ECHO_C" >&6 test -z "$cf_list_models" && cf_list_models=normal test "$with_libtool" != "no" && cf_list_models=libtool -echo "$as_me:4853: result: $cf_list_models" >&5 +echo "$as_me:4854: result: $cf_list_models" >&5 echo "${ECHO_T}$cf_list_models" >&6 ### Use the first model as the default, and save its suffix for use in building ### up test-applications. -echo "$as_me:4858: checking for default model" >&5 +echo "$as_me:4859: checking for default model" >&5 echo $ECHO_N "checking for default model... $ECHO_C" >&6 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` -echo "$as_me:4861: result: $DFT_LWR_MODEL" >&5 +echo "$as_me:4862: result: $DFT_LWR_MODEL" >&5 echo "${ECHO_T}$DFT_LWR_MODEL" >&6 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -4872,7 +4873,7 @@ LIB_NAME=ncurses LIB_DIR=../lib LIB_2ND=../../lib -echo "$as_me:4875: checking if you want to have a library-prefix" >&5 +echo "$as_me:4876: checking if you want to have a library-prefix" >&5 echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 # Check whether --with-lib-prefix or --without-lib-prefix was given. @@ -4882,7 +4883,7 @@ if test "${with_lib_prefix+set}" = set; then else with_lib_prefix=auto fi; -echo "$as_me:4885: result: $with_lib_prefix" >&5 +echo "$as_me:4886: result: $with_lib_prefix" >&5 echo "${ECHO_T}$with_lib_prefix" >&6 if test $with_lib_prefix = auto @@ -4908,7 +4909,7 @@ LIB_SUFFIX= ############################################################################### -echo "$as_me:4911: checking if you want to build a separate terminfo library" >&5 +echo "$as_me:4912: checking if you want to build a separate terminfo library" >&5 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6 # Check whether --with-termlib or --without-termlib was given. @@ -4918,10 +4919,10 @@ if test "${with_termlib+set}" = set; then else with_termlib=no fi; -echo "$as_me:4921: result: $with_termlib" >&5 +echo "$as_me:4922: result: $with_termlib" >&5 echo "${ECHO_T}$with_termlib" >&6 -echo "$as_me:4924: checking if you want to build a separate tic library" >&5 +echo "$as_me:4925: checking if you want to build a separate tic library" >&5 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6 # Check whether --with-ticlib or --without-ticlib was given. @@ -4931,13 +4932,13 @@ if test "${with_ticlib+set}" = set; then else with_ticlib=no fi; -echo "$as_me:4934: result: $with_ticlib" >&5 +echo "$as_me:4935: result: $with_ticlib" >&5 echo "${ECHO_T}$with_ticlib" >&6 ### Checks for special libraries, must be done up-front. SHLIB_LIST="" -echo "$as_me:4940: checking if you want to link with the GPM mouse library" >&5 +echo "$as_me:4941: checking if you want to link with the GPM mouse library" >&5 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6 # Check whether --with-gpm or --without-gpm was given. @@ -4947,27 +4948,27 @@ if test "${with_gpm+set}" = set; then else with_gpm=maybe fi; -echo "$as_me:4950: result: $with_gpm" >&5 +echo "$as_me:4951: result: $with_gpm" >&5 echo "${ECHO_T}$with_gpm" >&6 if test "$with_gpm" != no ; then - echo "$as_me:4954: checking for gpm.h" >&5 + echo "$as_me:4955: checking for gpm.h" >&5 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6 if test "${ac_cv_header_gpm_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4960 "configure" +#line 4961 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:4964: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4965: \"$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:4970: \$? = $ac_status" >&5 + echo "$as_me:4971: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4986,7 +4987,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4989: result: $ac_cv_header_gpm_h" >&5 +echo "$as_me:4990: result: $ac_cv_header_gpm_h" >&5 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6 if test $ac_cv_header_gpm_h = yes; then @@ -4997,14 +4998,14 @@ EOF if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then test -n "$verbose" && echo " assuming we really have GPM library" 1>&6 -echo "${as_me:-configure}:5000: testing assuming we really have GPM library ..." 1>&5 +echo "${as_me:-configure}:5001: testing assuming we really have GPM library ..." 1>&5 cat >>confdefs.h <<\EOF #define HAVE_LIBGPM 1 EOF else - echo "$as_me:5007: checking for Gpm_Open in -lgpm" >&5 + echo "$as_me:5008: 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 @@ -5012,7 +5013,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5015 "configure" +#line 5016 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5031,16 +5032,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5034: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5035: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5037: \$? = $ac_status" >&5 + echo "$as_me:5038: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5040: \"$ac_try\"") >&5 + { (eval echo "$as_me:5041: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5043: \$? = $ac_status" >&5 + echo "$as_me:5044: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -5051,13 +5052,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5054: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:5055: 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 : else - { { echo "$as_me:5060: error: Cannot link with GPM library" >&5 + { { echo "$as_me:5061: error: Cannot link with GPM library" >&5 echo "$as_me: error: Cannot link with GPM library" >&2;} { (exit 1); exit 1; }; } fi @@ -5067,7 +5068,7 @@ fi else - test "$with_gpm" != maybe && { echo "$as_me:5070: WARNING: Cannot find GPM header" >&5 + test "$with_gpm" != maybe && { echo "$as_me:5071: WARNING: Cannot find GPM header" >&5 echo "$as_me: WARNING: Cannot find GPM header" >&2;} with_gpm=no @@ -5076,7 +5077,7 @@ fi fi if test "$with_gpm" != no ; then - echo "$as_me:5079: checking if you want to load GPM dynamically" >&5 + echo "$as_me:5080: checking if you want to load GPM dynamically" >&5 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6 # Check whether --with-dlsym or --without-dlsym was given. @@ -5086,18 +5087,18 @@ if test "${with_dlsym+set}" = set; then else with_dlsym=yes fi; - echo "$as_me:5089: result: $with_dlsym" >&5 + echo "$as_me:5090: result: $with_dlsym" >&5 echo "${ECHO_T}$with_dlsym" >&6 if test "$with_dlsym" = yes ; then cf_have_dlsym=no -echo "$as_me:5094: checking for dlsym" >&5 +echo "$as_me:5095: checking for dlsym" >&5 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6 if test "${ac_cv_func_dlsym+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5100 "configure" +#line 5101 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlsym (); below. */ @@ -5128,16 +5129,16 @@ f = dlsym; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5131: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5132: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5134: \$? = $ac_status" >&5 + echo "$as_me:5135: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5137: \"$ac_try\"") >&5 + { (eval echo "$as_me:5138: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5140: \$? = $ac_status" >&5 + echo "$as_me:5141: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_dlsym=yes else @@ -5147,14 +5148,14 @@ ac_cv_func_dlsym=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5150: result: $ac_cv_func_dlsym" >&5 +echo "$as_me:5151: result: $ac_cv_func_dlsym" >&5 echo "${ECHO_T}$ac_cv_func_dlsym" >&6 if test $ac_cv_func_dlsym = yes; then cf_have_dlsym=yes else cf_have_libdl=no -echo "$as_me:5157: checking for dlsym in -ldl" >&5 +echo "$as_me:5158: checking for dlsym in -ldl" >&5 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 if test "${ac_cv_lib_dl_dlsym+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5162,7 +5163,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5165 "configure" +#line 5166 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5181,16 +5182,16 @@ dlsym (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5184: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5185: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5187: \$? = $ac_status" >&5 + echo "$as_me:5188: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5190: \"$ac_try\"") >&5 + { (eval echo "$as_me:5191: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5193: \$? = $ac_status" >&5 + echo "$as_me:5194: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dl_dlsym=yes else @@ -5201,7 +5202,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5204: result: $ac_cv_lib_dl_dlsym" >&5 +echo "$as_me:5205: result: $ac_cv_lib_dl_dlsym" >&5 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 if test $ac_cv_lib_dl_dlsym = yes; then @@ -5214,10 +5215,10 @@ fi if test "$cf_have_dlsym" = yes ; then test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS" - echo "$as_me:5217: checking whether able to link to dl*() functions" >&5 + echo "$as_me:5218: checking whether able to link to dl*() functions" >&5 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 5220 "configure" +#line 5221 "configure" #include "confdefs.h" #include int @@ -5235,16 +5236,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5238: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5239: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5241: \$? = $ac_status" >&5 + echo "$as_me:5242: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5244: \"$ac_try\"") >&5 + { (eval echo "$as_me:5245: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5247: \$? = $ac_status" >&5 + echo "$as_me:5248: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\EOF @@ -5255,15 +5256,15 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - { { echo "$as_me:5258: error: Cannot link test program for libdl" >&5 + { { echo "$as_me:5259: error: Cannot link test program for libdl" >&5 echo "$as_me: error: Cannot link test program for libdl" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:5263: result: ok" >&5 + echo "$as_me:5264: result: ok" >&5 echo "${ECHO_T}ok" >&6 else - { { echo "$as_me:5266: error: Cannot find dlsym function" >&5 + { { echo "$as_me:5267: error: Cannot find dlsym function" >&5 echo "$as_me: error: Cannot find dlsym function" >&2;} { (exit 1); exit 1; }; } fi @@ -5271,12 +5272,12 @@ fi if test "$with_gpm" != yes ; then test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 -echo "${as_me:-configure}:5274: testing assuming soname for gpm is $with_gpm ..." 1>&5 +echo "${as_me:-configure}:5275: testing assuming soname for gpm is $with_gpm ..." 1>&5 cf_cv_gpm_soname="$with_gpm" else -echo "$as_me:5279: checking for soname of gpm library" >&5 +echo "$as_me:5280: checking for soname of gpm library" >&5 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6 if test "${cf_cv_gpm_soname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5294,15 +5295,15 @@ if (Gpm_Open(0,0)) Gpm_Close(); CF_EOF cf_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" - if { (eval echo "$as_me:5297: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5298: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5300: \$? = $ac_status" >&5 + echo "$as_me:5301: \$? = $ac_status" >&5 (exit $ac_status); } ; then - if { (eval echo "$as_me:5302: \"$ac_link\"") >&5 + if { (eval echo "$as_me:5303: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5305: \$? = $ac_status" >&5 + echo "$as_me:5306: \$? = $ac_status" >&5 (exit $ac_status); } ; then cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.` test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown @@ -5313,7 +5314,7 @@ LIBS="$cf_save_LIBS" fi fi -echo "$as_me:5316: result: $cf_cv_gpm_soname" >&5 +echo "$as_me:5317: result: $cf_cv_gpm_soname" >&5 echo "${ECHO_T}$cf_cv_gpm_soname" >&6 fi @@ -5330,7 +5331,7 @@ EOF #define HAVE_LIBGPM 1 EOF -echo "$as_me:5333: checking for Gpm_Wgetch in -lgpm" >&5 +echo "$as_me:5334: checking for Gpm_Wgetch in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5338,7 +5339,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5341 "configure" +#line 5342 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5357,16 +5358,16 @@ Gpm_Wgetch (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5360: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5361: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5363: \$? = $ac_status" >&5 + echo "$as_me:5364: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5366: \"$ac_try\"") >&5 + { (eval echo "$as_me:5367: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5369: \$? = $ac_status" >&5 + echo "$as_me:5370: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Wgetch=yes else @@ -5377,11 +5378,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5380: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 +echo "$as_me:5381: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6 if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then -echo "$as_me:5384: checking if GPM is weakly bound to curses library" >&5 +echo "$as_me:5385: checking if GPM is weakly bound to curses library" >&5 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6 if test "${cf_cv_check_gpm_wgetch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5405,15 +5406,15 @@ CF_EOF # to rely on the static library, noting that some packagers may not # include it. LIBS="-static -lgpm -dynamic $LIBS" - if { (eval echo "$as_me:5408: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5409: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5411: \$? = $ac_status" >&5 + echo "$as_me:5412: \$? = $ac_status" >&5 (exit $ac_status); } ; then - if { (eval echo "$as_me:5413: \"$ac_link\"") >&5 + if { (eval echo "$as_me:5414: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5416: \$? = $ac_status" >&5 + echo "$as_me:5417: \$? = $ac_status" >&5 (exit $ac_status); } ; then cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\' | egrep '\<[vVwW]\>'` test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes @@ -5425,11 +5426,11 @@ CF_EOF fi fi -echo "$as_me:5428: result: $cf_cv_check_gpm_wgetch" >&5 +echo "$as_me:5429: result: $cf_cv_check_gpm_wgetch" >&5 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6 if test "$cf_cv_check_gpm_wgetch" != yes ; then - { echo "$as_me:5432: WARNING: GPM library is already linked with curses - read the FAQ" >&5 + { echo "$as_me:5433: WARNING: GPM library is already linked with curses - read the FAQ" >&5 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;} fi @@ -5439,7 +5440,7 @@ fi # not everyone has "test -c" if test -c /dev/sysmouse 2>/dev/null ; then -echo "$as_me:5442: checking if you want to use sysmouse" >&5 +echo "$as_me:5443: checking if you want to use sysmouse" >&5 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6 # Check whether --with-sysmouse or --without-sysmouse was given. @@ -5451,7 +5452,7 @@ else fi; if test "$cf_with_sysmouse" != no ; then cat >conftest.$ac_ext <<_ACEOF -#line 5454 "configure" +#line 5455 "configure" #include "confdefs.h" #include @@ -5474,16 +5475,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5477: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5478: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5480: \$? = $ac_status" >&5 + echo "$as_me:5481: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5483: \"$ac_try\"") >&5 + { (eval echo "$as_me:5484: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5486: \$? = $ac_status" >&5 + echo "$as_me:5487: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_with_sysmouse=yes else @@ -5493,7 +5494,7 @@ cf_with_sysmouse=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5496: result: $cf_with_sysmouse" >&5 +echo "$as_me:5497: result: $cf_with_sysmouse" >&5 echo "${ECHO_T}$cf_with_sysmouse" >&6 test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF #define USE_SYSMOUSE 1 @@ -5511,7 +5512,7 @@ if test X"$CXX_G_OPT" = X"" ; then test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT='' fi -echo "$as_me:5514: checking for default loader flags" >&5 +echo "$as_me:5515: checking for default loader flags" >&5 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 case $DFT_LWR_MODEL in libtool) LD_MODEL='' ;; @@ -5520,13 +5521,13 @@ debug) LD_MODEL=$CC_G_OPT ;; profile) LD_MODEL='-pg';; shared) LD_MODEL='' ;; esac -echo "$as_me:5523: result: $LD_MODEL" >&5 +echo "$as_me:5524: result: $LD_MODEL" >&5 echo "${ECHO_T}$LD_MODEL" >&6 case $DFT_LWR_MODEL in shared) -echo "$as_me:5529: checking if rpath option should be used" >&5 +echo "$as_me:5530: checking if rpath option should be used" >&5 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 # Check whether --enable-rpath or --disable-rpath was given. @@ -5536,10 +5537,10 @@ if test "${enable_rpath+set}" = set; then else cf_cv_enable_rpath=no fi; -echo "$as_me:5539: result: $cf_cv_enable_rpath" >&5 +echo "$as_me:5540: result: $cf_cv_enable_rpath" >&5 echo "${ECHO_T}$cf_cv_enable_rpath" >&6 -echo "$as_me:5542: checking if shared libraries should be relinked during install" >&5 +echo "$as_me:5543: checking if shared libraries should be relinked during install" >&5 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6 # Check whether --enable-relink or --disable-relink was given. @@ -5549,13 +5550,13 @@ if test "${enable_relink+set}" = set; then else cf_cv_do_relink=yes fi; -echo "$as_me:5552: result: $cf_cv_do_relink" >&5 +echo "$as_me:5553: result: $cf_cv_do_relink" >&5 echo "${ECHO_T}$cf_cv_do_relink" >&6 ;; esac LD_RPATH_OPT= -echo "$as_me:5558: checking for an rpath option" >&5 +echo "$as_me:5559: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case $cf_cv_system_name in #(vi irix*) #(vi @@ -5586,17 +5587,17 @@ solaris2*) #(vi *) ;; esac -echo "$as_me:5589: result: $LD_RPATH_OPT" >&5 +echo "$as_me:5590: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in #(vi x-R*) - echo "$as_me:5594: checking if we need a space after rpath option" >&5 + echo "$as_me:5595: checking if we need a space after rpath option" >&5 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 cf_save_LIBS="$LIBS" LIBS="${LD_RPATH_OPT}$libdir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5599 "configure" +#line 5600 "configure" #include "confdefs.h" int @@ -5608,16 +5609,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5611: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5612: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5614: \$? = $ac_status" >&5 + echo "$as_me:5615: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5617: \"$ac_try\"") >&5 + { (eval echo "$as_me:5618: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5620: \$? = $ac_status" >&5 + echo "$as_me:5621: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_space=no else @@ -5627,7 +5628,7 @@ cf_rpath_space=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:5630: result: $cf_rpath_space" >&5 + echo "$as_me:5631: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; @@ -5642,7 +5643,7 @@ esac cf_ld_rpath_opt= test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - echo "$as_me:5645: checking if release/abi version should be used for shared libs" >&5 + echo "$as_me:5646: checking if release/abi version should be used for shared libs" >&5 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 # Check whether --with-shlib-version or --without-shlib-version was given. @@ -5657,7 +5658,7 @@ if test "${with_shlib_version+set}" = set; then cf_cv_shlib_version=$withval ;; *) - { { echo "$as_me:5660: error: option value must be one of: rel, abi, auto or no" >&5 + { { echo "$as_me:5661: error: option value must be one of: rel, abi, auto or no" >&5 echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} { (exit 1); exit 1; }; } ;; @@ -5666,7 +5667,7 @@ echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} else cf_cv_shlib_version=auto fi; - echo "$as_me:5669: result: $cf_cv_shlib_version" >&5 + echo "$as_me:5670: result: $cf_cv_shlib_version" >&5 echo "${ECHO_T}$cf_cv_shlib_version" >&6 cf_cv_rm_so_locs=no @@ -5675,14 +5676,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 CC_SHARED_OPTS= if test "$GCC" = yes then - echo "$as_me:5678: checking which $CC option to use" >&5 + echo "$as_me:5679: checking which $CC option to use" >&5 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" for CC_SHARED_OPTS in -fPIC -fpic '' do CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" cat >conftest.$ac_ext <<_ACEOF -#line 5685 "configure" +#line 5686 "configure" #include "confdefs.h" #include int @@ -5694,16 +5695,16 @@ int x = 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5697: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5698: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5700: \$? = $ac_status" >&5 + echo "$as_me:5701: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5703: \"$ac_try\"") >&5 + { (eval echo "$as_me:5704: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5706: \$? = $ac_status" >&5 + echo "$as_me:5707: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -5712,7 +5713,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done - echo "$as_me:5715: result: $CC_SHARED_OPTS" >&5 + echo "$as_me:5716: result: $CC_SHARED_OPTS" >&5 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 CFLAGS="$cf_save_CFLAGS" fi @@ -5758,7 +5759,7 @@ CF_EOF MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi cf_cv_shlib_version_infix=yes - echo "$as_me:5761: checking if ld -search_paths_first works" >&5 + echo "$as_me:5762: checking if ld -search_paths_first works" >&5 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5767,7 +5768,7 @@ else cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" cat >conftest.$ac_ext <<_ACEOF -#line 5770 "configure" +#line 5771 "configure" #include "confdefs.h" int @@ -5779,16 +5780,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5782: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5783: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5785: \$? = $ac_status" >&5 + echo "$as_me:5786: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5788: \"$ac_try\"") >&5 + { (eval echo "$as_me:5789: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5791: \$? = $ac_status" >&5 + echo "$as_me:5792: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ldflags_search_paths_first=yes else @@ -5799,7 +5800,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS=$cf_save_LDFLAGS fi -echo "$as_me:5802: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "$as_me:5803: result: $cf_cv_ldflags_search_paths_first" >&5 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 if test $cf_cv_ldflags_search_paths_first = yes; then LDFLAGS="$LDFLAGS -Wl,-search_paths_first" @@ -5859,6 +5860,27 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' ;; + mingw*) #(vi + cf_cv_shlib_version=mingw + cf_cv_shlib_version_infix=mingw + CC_SHARED_OPTS= + MK_SHARED_LIB='sh ../mk_shared_lib.sh $@ ${CC} ${CFLAGS}' + #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]' + #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]' + cat >mk_shared_lib.sh <<-CF_EOF + #!/bin/sh + SHARED_LIB=\$1 + IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$/.dll.a/'\` + shift + cat <<-EOF + Linking shared library + ** SHARED_LIB \$SHARED_LIB + ** IMPORT_LIB \$IMPORT_LIB +EOF + exec \$* -shared -Wl,--out-implib=../lib/\${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\${SHARED_LIB} +CF_EOF + chmod +x mk_shared_lib.sh + ;; openbsd[2-9].*|mirbsd*) #(vi if test "$DFT_LWR_MODEL" = "shared" ; then LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" @@ -5989,7 +6011,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" cat >conftest.$ac_ext <<_ACEOF -#line 5992 "configure" +#line 6014 "configure" #include "confdefs.h" #include int @@ -6001,16 +6023,16 @@ printf("Hello\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6004: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6026: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6007: \$? = $ac_status" >&5 + echo "$as_me:6029: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6010: \"$ac_try\"") >&5 + { (eval echo "$as_me:6032: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6013: \$? = $ac_status" >&5 + echo "$as_me:6035: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -6047,7 +6069,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes ;; *) - { echo "$as_me:6050: WARNING: ignored --with-shlib-version" >&5 + { echo "$as_me:6072: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac @@ -6058,10 +6080,18 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}" test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}" + test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 + +echo "${as_me:-configure}:6085: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 + + test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 + +echo "${as_me:-configure}:6089: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + if test "$CC_SHARED_OPTS" = "unknown"; then for model in $cf_list_models; do if test "$model" = "shared"; then - { { echo "$as_me:6064: error: Shared libraries are not supported in this version" >&5 + { { echo "$as_me:6094: error: Shared libraries are not supported in this version" >&5 echo "$as_me: error: Shared libraries are not supported in this version" >&2;} { (exit 1); exit 1; }; } fi @@ -6071,7 +6101,7 @@ fi ### If we're building with rpath, try to link non-standard libs that way too. if test "$DFT_LWR_MODEL" = "shared"; then -echo "$as_me:6074: checking if rpath-hack should be disabled" >&5 +echo "$as_me:6104: 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. @@ -6088,21 +6118,21 @@ else cf_disable_rpath_hack=no fi; -echo "$as_me:6091: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:6121: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 if test "$cf_disable_rpath_hack" = no ; then -echo "$as_me:6095: checking for updated LDFLAGS" >&5 +echo "$as_me:6125: 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:6098: result: maybe" >&5 + echo "$as_me:6128: 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:6105: checking for $ac_word" >&5 +echo "$as_me:6135: 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 @@ -6117,7 +6147,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:6120: found $ac_dir/$ac_word" >&5 +echo "$as_me:6150: found $ac_dir/$ac_word" >&5 break done @@ -6125,10 +6155,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:6128: result: $cf_ldd_prog" >&5 + echo "$as_me:6158: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:6131: result: no" >&5 + echo "$as_me:6161: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6142,7 +6172,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >conftest.$ac_ext <<_ACEOF -#line 6145 "configure" +#line 6175 "configure" #include "confdefs.h" #include int @@ -6154,16 +6184,16 @@ printf("Hello"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6157: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6187: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6160: \$? = $ac_status" >&5 + echo "$as_me:6190: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6163: \"$ac_try\"") >&5 + { (eval echo "$as_me:6193: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6166: \$? = $ac_status" >&5 + echo "$as_me:6196: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u` cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort -u` @@ -6191,7 +6221,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}:6194: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:6224: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -6203,11 +6233,11 @@ echo "${as_me:-configure}:6194: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:6206: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:6236: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:6210: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:6240: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -6244,7 +6274,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:6247: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:6277: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -6257,11 +6287,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:6260: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:6290: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:6264: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:6294: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -6298,7 +6328,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:6301: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:6331: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -6311,11 +6341,11 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:6314: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:6344: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:6318: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:6348: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 fi @@ -6326,7 +6356,7 @@ fi ############################################################################### ### use option --disable-overwrite to leave out the link to -lcurses -echo "$as_me:6329: checking if you wish to install ncurses overwriting curses" >&5 +echo "$as_me:6359: checking if you wish to install ncurses overwriting curses" >&5 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6 # Check whether --enable-overwrite or --disable-overwrite was given. @@ -6336,10 +6366,10 @@ if test "${enable_overwrite+set}" = set; then else if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi fi; -echo "$as_me:6339: result: $with_overwrite" >&5 +echo "$as_me:6369: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 -echo "$as_me:6342: checking if external terminfo-database is used" >&5 +echo "$as_me:6372: checking if external terminfo-database is used" >&5 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 # Check whether --enable-database or --disable-database was given. @@ -6349,7 +6379,7 @@ if test "${enable_database+set}" = set; then else use_database=yes fi; -echo "$as_me:6352: result: $use_database" >&5 +echo "$as_me:6382: result: $use_database" >&5 echo "${ECHO_T}$use_database" >&6 case $host_os in #(vi @@ -6366,7 +6396,7 @@ if test "$use_database" != no ; then #define USE_DATABASE 1 EOF - echo "$as_me:6369: checking which terminfo source-file will be installed" >&5 + echo "$as_me:6399: checking which terminfo source-file will be installed" >&5 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6 # Check whether --with-database or --without-database was given. @@ -6374,10 +6404,10 @@ if test "${with_database+set}" = set; then withval="$with_database" TERMINFO_SRC=$withval fi; - echo "$as_me:6377: result: $TERMINFO_SRC" >&5 + echo "$as_me:6407: result: $TERMINFO_SRC" >&5 echo "${ECHO_T}$TERMINFO_SRC" >&6 - echo "$as_me:6380: checking whether to use hashed database instead of directory/tree" >&5 + echo "$as_me:6410: checking whether to use hashed database instead of directory/tree" >&5 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6 # Check whether --with-hashed-db or --without-hashed-db was given. @@ -6387,13 +6417,13 @@ if test "${with_hashed_db+set}" = set; then else with_hashed_db=no fi; - echo "$as_me:6390: result: $with_hashed_db" >&5 + echo "$as_me:6420: result: $with_hashed_db" >&5 echo "${ECHO_T}$with_hashed_db" >&6 else with_hashed_db=no fi -echo "$as_me:6396: checking for list of fallback descriptions" >&5 +echo "$as_me:6426: checking for list of fallback descriptions" >&5 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6 # Check whether --with-fallbacks or --without-fallbacks was given. @@ -6403,11 +6433,11 @@ if test "${with_fallbacks+set}" = set; then else with_fallback= fi; -echo "$as_me:6406: result: $with_fallback" >&5 +echo "$as_me:6436: result: $with_fallback" >&5 echo "${ECHO_T}$with_fallback" >&6 FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'` -echo "$as_me:6410: checking if you want modern xterm or antique" >&5 +echo "$as_me:6440: checking if you want modern xterm or antique" >&5 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6 # Check whether --with-xterm-new or --without-xterm-new was given. @@ -6421,11 +6451,11 @@ case $with_xterm_new in no) with_xterm_new=xterm-old;; *) with_xterm_new=xterm-new;; esac -echo "$as_me:6424: result: $with_xterm_new" >&5 +echo "$as_me:6454: result: $with_xterm_new" >&5 echo "${ECHO_T}$with_xterm_new" >&6 WHICH_XTERM=$with_xterm_new -echo "$as_me:6428: checking if xterm backspace sends BS or DEL" >&5 +echo "$as_me:6458: checking if xterm backspace sends BS or DEL" >&5 echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6 # Check whether --with-xterm-kbs or --without-xterm-kbs was given. @@ -6446,7 +6476,7 @@ xDEL|xdel|x127) with_xterm_kbs=$withval ;; esac -echo "$as_me:6449: result: $with_xterm_kbs" >&5 +echo "$as_me:6479: result: $with_xterm_kbs" >&5 echo "${ECHO_T}$with_xterm_kbs" >&6 XTERM_KBS=$with_xterm_kbs @@ -6456,7 +6486,7 @@ if test "$use_database" = no ; then MAKE_TERMINFO="#" else -echo "$as_me:6459: checking for list of terminfo directories" >&5 +echo "$as_me:6489: checking for list of terminfo directories" >&5 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 case $cf_cv_system_name in @@ -6501,7 +6531,7 @@ case ".$cf_src_path" in #(vi cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:6504: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:6534: error: expected a pathname, not \"$cf_src_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -6514,13 +6544,13 @@ IFS="$ac_save_ifs" eval 'TERMINFO_DIRS="$cf_dst_path"' -echo "$as_me:6517: result: $TERMINFO_DIRS" >&5 +echo "$as_me:6547: result: $TERMINFO_DIRS" >&5 echo "${ECHO_T}$TERMINFO_DIRS" >&6 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <&5 +echo "$as_me:6553: checking for default terminfo directory" >&5 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given. @@ -6556,7 +6586,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:6559: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:6589: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -6565,7 +6595,7 @@ esac fi TERMINFO="$withval" -echo "$as_me:6568: result: $TERMINFO" >&5 +echo "$as_me:6598: result: $TERMINFO" >&5 echo "${ECHO_T}$TERMINFO" >&6 cat >>confdefs.h <&5 +echo "$as_me:6608: checking if big-core option selected" >&5 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6 # Check whether --enable-big-core or --disable-big-core was given. @@ -6587,7 +6617,7 @@ else with_big_core=no else cat >conftest.$ac_ext <<_ACEOF -#line 6590 "configure" +#line 6620 "configure" #include "confdefs.h" #include @@ -6601,15 +6631,15 @@ int main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6604: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6634: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6607: \$? = $ac_status" >&5 + echo "$as_me:6637: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6609: \"$ac_try\"") >&5 + { (eval echo "$as_me:6639: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6612: \$? = $ac_status" >&5 + echo "$as_me:6642: \$? = $ac_status" >&5 (exit $ac_status); }; }; then with_big_core=yes else @@ -6621,7 +6651,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi; -echo "$as_me:6624: result: $with_big_core" >&5 +echo "$as_me:6654: result: $with_big_core" >&5 echo "${ECHO_T}$with_big_core" >&6 test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF #define HAVE_BIG_CORE 1 @@ -6630,7 +6660,7 @@ EOF ### ISO C only guarantees 512-char strings, we have tables which load faster ### when constructed using "big" strings. More than the C compiler, the awk ### program is a limit on most vendor UNIX systems. Check that we can build. -echo "$as_me:6633: checking if big-strings option selected" >&5 +echo "$as_me:6663: checking if big-strings option selected" >&5 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6 # Check whether --enable-big-strings or --disable-big-strings was given. @@ -6654,14 +6684,14 @@ else esac fi; -echo "$as_me:6657: result: $with_big_strings" >&5 +echo "$as_me:6687: result: $with_big_strings" >&5 echo "${ECHO_T}$with_big_strings" >&6 USE_BIG_STRINGS=0 test "$with_big_strings" = "yes" && USE_BIG_STRINGS=1 ### use option --enable-termcap to compile in the termcap fallback support -echo "$as_me:6664: checking if you want termcap-fallback support" >&5 +echo "$as_me:6694: checking if you want termcap-fallback support" >&5 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6 # Check whether --enable-termcap or --disable-termcap was given. @@ -6671,13 +6701,13 @@ if test "${enable_termcap+set}" = set; then else with_termcap=no fi; -echo "$as_me:6674: result: $with_termcap" >&5 +echo "$as_me:6704: result: $with_termcap" >&5 echo "${ECHO_T}$with_termcap" >&6 if test "$with_termcap" != "yes" ; then if test "$use_database" = no ; then if test -z "$with_fallback" ; then - { { echo "$as_me:6680: error: You have disabled the database w/o specifying fallbacks" >&5 + { { echo "$as_me:6710: error: You have disabled the database w/o specifying fallbacks" >&5 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;} { (exit 1); exit 1; }; } fi @@ -6689,7 +6719,7 @@ EOF else if test "$with_ticlib" != no ; then - { { echo "$as_me:6692: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 + { { echo "$as_me:6722: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} { (exit 1); exit 1; }; } fi @@ -6698,7 +6728,7 @@ cat >>confdefs.h <<\EOF #define USE_TERMCAP 1 EOF -echo "$as_me:6701: checking for list of termcap files" >&5 +echo "$as_me:6731: checking for list of termcap files" >&5 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6 # Check whether --with-termpath or --without-termpath was given. @@ -6738,7 +6768,7 @@ case ".$cf_src_path" in #(vi cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:6741: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:6771: error: expected a pathname, not \"$cf_src_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -6751,14 +6781,14 @@ IFS="$ac_save_ifs" eval 'TERMPATH="$cf_dst_path"' -echo "$as_me:6754: result: $TERMPATH" >&5 +echo "$as_me:6784: result: $TERMPATH" >&5 echo "${ECHO_T}$TERMPATH" >&6 test -n "$TERMPATH" && cat >>confdefs.h <&5 +echo "$as_me:6791: checking if fast termcap-loader is needed" >&5 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6 # Check whether --enable-getcap or --disable-getcap was given. @@ -6768,13 +6798,13 @@ if test "${enable_getcap+set}" = set; then else with_getcap=no fi; -echo "$as_me:6771: result: $with_getcap" >&5 +echo "$as_me:6801: result: $with_getcap" >&5 echo "${ECHO_T}$with_getcap" >&6 test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF #define USE_GETCAP 1 EOF -echo "$as_me:6777: checking if translated termcaps will be cached in ~/.terminfo" >&5 +echo "$as_me:6807: checking if translated termcaps will be cached in ~/.terminfo" >&5 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6 # Check whether --enable-getcap-cache or --disable-getcap-cache was given. @@ -6784,7 +6814,7 @@ if test "${enable_getcap_cache+set}" = set; then else with_getcap_cache=no fi; -echo "$as_me:6787: result: $with_getcap_cache" >&5 +echo "$as_me:6817: result: $with_getcap_cache" >&5 echo "${ECHO_T}$with_getcap_cache" >&6 test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF #define USE_GETCAP_CACHE 1 @@ -6793,7 +6823,7 @@ EOF fi ### Use option --disable-home-terminfo to completely remove ~/.terminfo -echo "$as_me:6796: checking if ~/.terminfo is wanted" >&5 +echo "$as_me:6826: checking if ~/.terminfo is wanted" >&5 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6 # Check whether --enable-home-terminfo or --disable-home-terminfo was given. @@ -6803,13 +6833,13 @@ if test "${enable_home_terminfo+set}" = set; then else with_home_terminfo=yes fi; -echo "$as_me:6806: result: $with_home_terminfo" >&5 +echo "$as_me:6836: result: $with_home_terminfo" >&5 echo "${ECHO_T}$with_home_terminfo" >&6 test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF #define USE_HOME_TERMINFO 1 EOF -echo "$as_me:6812: checking if you want to use restricted environment when running as root" >&5 +echo "$as_me:6842: checking if you want to use restricted environment when running as root" >&5 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6 # Check whether --enable-root-environ or --disable-root-environ was given. @@ -6819,7 +6849,7 @@ if test "${enable_root_environ+set}" = set; then else with_root_environ=yes fi; -echo "$as_me:6822: result: $with_root_environ" >&5 +echo "$as_me:6852: result: $with_root_environ" >&5 echo "${ECHO_T}$with_root_environ" >&6 test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF #define USE_ROOT_ENVIRON 1 @@ -6833,13 +6863,13 @@ for ac_func in \ unlink do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:6836: checking for $ac_func" >&5 +echo "$as_me:6866: 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 6842 "configure" +#line 6872 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6870,16 +6900,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6873: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6903: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6876: \$? = $ac_status" >&5 + echo "$as_me:6906: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6879: \"$ac_try\"") >&5 + { (eval echo "$as_me:6909: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6882: \$? = $ac_status" >&5 + echo "$as_me:6912: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6889,7 +6919,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6892: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6922: 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:6939: 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 6915 "configure" +#line 6945 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6943,16 +6973,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6946: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6976: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6949: \$? = $ac_status" >&5 + echo "$as_me:6979: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6952: \"$ac_try\"") >&5 + { (eval echo "$as_me:6982: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6955: \$? = $ac_status" >&5 + echo "$as_me:6985: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6962,7 +6992,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6965: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6995: 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:7006: checking if link/symlink functions work" >&5 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6 if test "${cf_cv_link_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6986,7 +7016,7 @@ else eval 'ac_cv_func_'$cf_func'=error' else cat >conftest.$ac_ext <<_ACEOF -#line 6989 "configure" +#line 7019 "configure" #include "confdefs.h" #include @@ -7016,15 +7046,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:7019: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7049: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7022: \$? = $ac_status" >&5 + echo "$as_me:7052: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7024: \"$ac_try\"") >&5 + { (eval echo "$as_me:7054: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7027: \$? = $ac_status" >&5 + echo "$as_me:7057: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" @@ -7042,7 +7072,7 @@ fi test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no fi -echo "$as_me:7045: result: $cf_cv_link_funcs" >&5 +echo "$as_me:7075: result: $cf_cv_link_funcs" >&5 echo "${ECHO_T}$cf_cv_link_funcs" >&6 test "$ac_cv_func_link" = yes && cat >>confdefs.h <<\EOF #define HAVE_LINK 1 @@ -7060,7 +7090,7 @@ with_symlinks=no # soft links (symbolic links) are useful for some systems where hard links do # not work, or to make it simpler to copy terminfo trees around. if test "$ac_cv_func_symlink" = yes ; then - echo "$as_me:7063: checking if tic should use symbolic links" >&5 + echo "$as_me:7093: checking if tic should use symbolic links" >&5 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6 # Check whether --enable-symlinks or --disable-symlinks was given. @@ -7070,21 +7100,21 @@ if test "${enable_symlinks+set}" = set; then else with_symlinks=no fi; - echo "$as_me:7073: result: $with_symlinks" >&5 + echo "$as_me:7103: result: $with_symlinks" >&5 echo "${ECHO_T}$with_symlinks" >&6 fi # If we have hard links and did not choose to use soft links instead, there is # no reason to make this choice optional - use the hard links. if test "$with_symlinks" = no ; then - echo "$as_me:7080: checking if tic should use hard links" >&5 + echo "$as_me:7110: checking if tic should use hard links" >&5 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 if test "$ac_cv_func_link" = yes ; then with_links=yes else with_links=no fi - echo "$as_me:7087: result: $with_links" >&5 + echo "$as_me:7117: result: $with_links" >&5 echo "${ECHO_T}$with_links" >&6 fi @@ -7097,7 +7127,7 @@ test "$with_symlinks" = yes && cat >>confdefs.h <<\EOF EOF ### use option --enable-broken-linker to force on use of broken-linker support -echo "$as_me:7100: checking if you want broken-linker support code" >&5 +echo "$as_me:7130: checking if you want broken-linker support code" >&5 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 # Check whether --enable-broken_linker or --disable-broken_linker was given. @@ -7107,7 +7137,7 @@ if test "${enable_broken_linker+set}" = set; then else with_broken_linker=${BROKEN_LINKER:-no} fi; -echo "$as_me:7110: result: $with_broken_linker" >&5 +echo "$as_me:7140: result: $with_broken_linker" >&5 echo "${ECHO_T}$with_broken_linker" >&6 BROKEN_LINKER=0 @@ -7127,14 +7157,14 @@ EOF BROKEN_LINKER=1 test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 -echo "${as_me:-configure}:7130: testing cygwin linker is broken anyway ..." 1>&5 +echo "${as_me:-configure}:7160: testing cygwin linker is broken anyway ..." 1>&5 ;; esac fi ### use option --enable-bsdpad to have tputs process BSD-style prefix padding -echo "$as_me:7137: checking if tputs should process BSD-style prefix padding" >&5 +echo "$as_me:7167: checking if tputs should process BSD-style prefix padding" >&5 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6 # Check whether --enable-bsdpad or --disable-bsdpad was given. @@ -7144,7 +7174,7 @@ if test "${enable_bsdpad+set}" = set; then else with_bsdpad=no fi; -echo "$as_me:7147: result: $with_bsdpad" >&5 +echo "$as_me:7177: result: $with_bsdpad" >&5 echo "${ECHO_T}$with_bsdpad" >&6 test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF #define BSD_TPUTS 1 @@ -7199,14 +7229,14 @@ irix[56].*) #(vi ;; linux*|gnu*|mint*|k*bsd*-gnu) #(vi -echo "$as_me:7202: checking if we must define _GNU_SOURCE" >&5 +echo "$as_me:7232: 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 7209 "configure" +#line 7239 "configure" #include "confdefs.h" #include int @@ -7221,16 +7251,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7224: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7254: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7227: \$? = $ac_status" >&5 + echo "$as_me:7257: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7230: \"$ac_try\"") >&5 + { (eval echo "$as_me:7260: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7233: \$? = $ac_status" >&5 + echo "$as_me:7263: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -7239,7 +7269,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 7242 "configure" +#line 7272 "configure" #include "confdefs.h" #include int @@ -7254,16 +7284,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7257: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7287: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7260: \$? = $ac_status" >&5 + echo "$as_me:7290: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7263: \"$ac_try\"") >&5 + { (eval echo "$as_me:7293: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7266: \$? = $ac_status" >&5 + echo "$as_me:7296: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -7278,7 +7308,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7281: result: $cf_cv_gnu_source" >&5 +echo "$as_me:7311: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" @@ -7300,16 +7330,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:7303: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:7333: 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}:7309: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:7339: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 7312 "configure" +#line 7342 "configure" #include "confdefs.h" #include int @@ -7324,16 +7354,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7327: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7357: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7330: \$? = $ac_status" >&5 + echo "$as_me:7360: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7333: \"$ac_try\"") >&5 + { (eval echo "$as_me:7363: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7336: \$? = $ac_status" >&5 + echo "$as_me:7366: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -7354,7 +7384,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 7357 "configure" +#line 7387 "configure" #include "confdefs.h" #include int @@ -7369,16 +7399,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7372: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7402: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7375: \$? = $ac_status" >&5 + echo "$as_me:7405: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7378: \"$ac_try\"") >&5 + { (eval echo "$as_me:7408: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7381: \$? = $ac_status" >&5 + echo "$as_me:7411: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7389,15 +7419,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:7392: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:7422: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:7397: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:7427: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 7400 "configure" +#line 7430 "configure" #include "confdefs.h" #include int @@ -7412,16 +7442,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7415: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7445: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7418: \$? = $ac_status" >&5 + echo "$as_me:7448: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7421: \"$ac_try\"") >&5 + { (eval echo "$as_me:7451: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7424: \$? = $ac_status" >&5 + echo "$as_me:7454: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7437,7 +7467,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7440: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:7470: 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 @@ -7550,14 +7580,14 @@ solaris2.*) #(vi ;; *) -echo "$as_me:7553: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:7583: 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 7560 "configure" +#line 7590 "configure" #include "confdefs.h" #include @@ -7576,16 +7606,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7579: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7609: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7582: \$? = $ac_status" >&5 + echo "$as_me:7612: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7585: \"$ac_try\"") >&5 + { (eval echo "$as_me:7615: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7588: \$? = $ac_status" >&5 + echo "$as_me:7618: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -7594,7 +7624,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 7597 "configure" +#line 7627 "configure" #include "confdefs.h" #include @@ -7613,16 +7643,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7616: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7646: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7619: \$? = $ac_status" >&5 + echo "$as_me:7649: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7622: \"$ac_try\"") >&5 + { (eval echo "$as_me:7652: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7625: \$? = $ac_status" >&5 + echo "$as_me:7655: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -7637,7 +7667,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7640: result: $cf_cv_xopen_source" >&5 +echo "$as_me:7670: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -7745,16 +7775,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:7748: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:7778: 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}:7754: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:7784: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 7757 "configure" +#line 7787 "configure" #include "confdefs.h" #include int @@ -7769,16 +7799,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7772: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7802: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7775: \$? = $ac_status" >&5 + echo "$as_me:7805: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7778: \"$ac_try\"") >&5 + { (eval echo "$as_me:7808: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7781: \$? = $ac_status" >&5 + echo "$as_me:7811: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -7799,7 +7829,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 7802 "configure" +#line 7832 "configure" #include "confdefs.h" #include int @@ -7814,16 +7844,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7817: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7847: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7820: \$? = $ac_status" >&5 + echo "$as_me:7850: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7823: \"$ac_try\"") >&5 + { (eval echo "$as_me:7853: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7826: \$? = $ac_status" >&5 + echo "$as_me:7856: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7834,15 +7864,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:7837: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:7867: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:7842: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:7872: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 7845 "configure" +#line 7875 "configure" #include "confdefs.h" #include int @@ -7857,16 +7887,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7860: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7890: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7863: \$? = $ac_status" >&5 + echo "$as_me:7893: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7866: \"$ac_try\"") >&5 + { (eval echo "$as_me:7896: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7869: \$? = $ac_status" >&5 + echo "$as_me:7899: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7882,7 +7912,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7885: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:7915: 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 @@ -8055,10 +8085,10 @@ fi fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:8058: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:8088: 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 8061 "configure" +#line 8091 "configure" #include "confdefs.h" #include int @@ -8073,16 +8103,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8076: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8106: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8079: \$? = $ac_status" >&5 + echo "$as_me:8109: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8082: \"$ac_try\"") >&5 + { (eval echo "$as_me:8112: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8085: \$? = $ac_status" >&5 + echo "$as_me:8115: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -8091,12 +8121,12 @@ cat conftest.$ac_ext >&5 cf_XOPEN_SOURCE_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:8094: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:8124: 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 8099 "configure" +#line 8129 "configure" #include "confdefs.h" #include int @@ -8111,16 +8141,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8114: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8144: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8117: \$? = $ac_status" >&5 + echo "$as_me:8147: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8120: \"$ac_try\"") >&5 + { (eval echo "$as_me:8150: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8123: \$? = $ac_status" >&5 + echo "$as_me:8153: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -8131,19 +8161,19 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext if test $cf_XOPEN_SOURCE_set_ok = no then - { echo "$as_me:8134: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:8164: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:8139: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:8169: 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 8146 "configure" +#line 8176 "configure" #include "confdefs.h" #include @@ -8162,16 +8192,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8165: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8195: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8168: \$? = $ac_status" >&5 + echo "$as_me:8198: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8171: \"$ac_try\"") >&5 + { (eval echo "$as_me:8201: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8174: \$? = $ac_status" >&5 + echo "$as_me:8204: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8180,7 +8210,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 8183 "configure" +#line 8213 "configure" #include "confdefs.h" #include @@ -8199,16 +8229,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8202: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8232: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8205: \$? = $ac_status" >&5 + echo "$as_me:8235: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8208: \"$ac_try\"") >&5 + { (eval echo "$as_me:8238: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8211: \$? = $ac_status" >&5 + echo "$as_me:8241: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8223,7 +8253,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8226: result: $cf_cv_xopen_source" >&5 +echo "$as_me:8256: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -8323,14 +8353,14 @@ fi # Work around breakage on OS X -echo "$as_me:8326: checking if SIGWINCH is defined" >&5 +echo "$as_me:8356: 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 8333 "configure" +#line 8363 "configure" #include "confdefs.h" #include @@ -8345,23 +8375,23 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8348: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8378: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8351: \$? = $ac_status" >&5 + echo "$as_me:8381: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8354: \"$ac_try\"") >&5 + { (eval echo "$as_me:8384: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8357: \$? = $ac_status" >&5 + echo "$as_me:8387: \$? = $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 8364 "configure" +#line 8394 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -8379,16 +8409,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8382: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8412: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8385: \$? = $ac_status" >&5 + echo "$as_me:8415: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8388: \"$ac_try\"") >&5 + { (eval echo "$as_me:8418: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8391: \$? = $ac_status" >&5 + echo "$as_me:8421: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=maybe else @@ -8402,11 +8432,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8405: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:8435: 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:8409: checking for actual SIGWINCH definition" >&5 +echo "$as_me:8439: 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 @@ -8417,7 +8447,7 @@ cf_sigwinch=32 while test $cf_sigwinch != 1 do cat >conftest.$ac_ext <<_ACEOF -#line 8420 "configure" +#line 8450 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -8439,16 +8469,16 @@ int x = SIGWINCH } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8442: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8472: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8445: \$? = $ac_status" >&5 + echo "$as_me:8475: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8448: \"$ac_try\"") >&5 + { (eval echo "$as_me:8478: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8451: \$? = $ac_status" >&5 + echo "$as_me:8481: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -8462,7 +8492,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1` done fi -echo "$as_me:8465: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:8495: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -8472,13 +8502,13 @@ fi # Checks for CODESET support. - echo "$as_me:8475: checking for nl_langinfo and CODESET" >&5 + echo "$as_me:8505: 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 8481 "configure" +#line 8511 "configure" #include "confdefs.h" #include int @@ -8490,16 +8520,16 @@ char* cs = nl_langinfo(CODESET); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8493: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8523: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8496: \$? = $ac_status" >&5 + echo "$as_me:8526: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8499: \"$ac_try\"") >&5 + { (eval echo "$as_me:8529: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8502: \$? = $ac_status" >&5 + echo "$as_me:8532: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else @@ -8510,7 +8540,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8513: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:8543: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test $am_cv_langinfo_codeset = yes; then @@ -8524,7 +8554,7 @@ EOF NCURSES_OK_WCHAR_T= NCURSES_OK_WINT_T= -echo "$as_me:8527: checking if you want wide-character code" >&5 +echo "$as_me:8557: checking if you want wide-character code" >&5 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -8534,7 +8564,7 @@ if test "${enable_widec+set}" = set; then else with_widec=no fi; -echo "$as_me:8537: result: $with_widec" >&5 +echo "$as_me:8567: result: $with_widec" >&5 echo "${ECHO_T}$with_widec" >&6 if test "$with_widec" = yes ; then LIB_SUFFIX="w${LIB_SUFFIX}" @@ -8546,14 +8576,14 @@ EOF #define NCURSES_WIDECHAR 1 EOF -echo "$as_me:8549: checking if wchar.h can be used as is" >&5 +echo "$as_me:8579: checking if wchar.h can be used as is" >&5 echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6 if test "${cf_cv_wchar_h_okay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8556 "configure" +#line 8586 "configure" #include "confdefs.h" #include @@ -8570,16 +8600,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8573: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8603: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8576: \$? = $ac_status" >&5 + echo "$as_me:8606: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8579: \"$ac_try\"") >&5 + { (eval echo "$as_me:8609: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8582: \$? = $ac_status" >&5 + echo "$as_me:8612: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_h_okay=yes else @@ -8589,16 +8619,16 @@ cf_cv_wchar_h_okay=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8592: result: $cf_cv_wchar_h_okay" >&5 +echo "$as_me:8622: result: $cf_cv_wchar_h_okay" >&5 echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6 if test $cf_cv_wchar_h_okay = no then -echo "$as_me:8598: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "$as_me:8628: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 8601 "configure" +#line 8631 "configure" #include "confdefs.h" #include @@ -8614,16 +8644,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8617: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8647: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8620: \$? = $ac_status" >&5 + echo "$as_me:8650: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8623: \"$ac_try\"") >&5 + { (eval echo "$as_me:8653: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8626: \$? = $ac_status" >&5 + echo "$as_me:8656: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=no else @@ -8632,16 +8662,16 @@ cat conftest.$ac_ext >&5 cf_result=yes fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:8635: result: $cf_result" >&5 +echo "$as_me:8665: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" elif test "x" != "x" ; then - echo "$as_me:8641: checking checking for compatible value versus " >&5 + echo "$as_me:8671: checking checking for compatible value versus " >&5 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 8644 "configure" +#line 8674 "configure" #include "confdefs.h" #include @@ -8657,16 +8687,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8660: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8690: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8663: \$? = $ac_status" >&5 + echo "$as_me:8693: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8666: \"$ac_try\"") >&5 + { (eval echo "$as_me:8696: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8669: \$? = $ac_status" >&5 + echo "$as_me:8699: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -8675,7 +8705,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:8678: result: $cf_result" >&5 + echo "$as_me:8708: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then # perhaps we can override it - try... @@ -8691,13 +8721,13 @@ fi for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:8694: checking for $ac_func" >&5 +echo "$as_me:8724: 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 8700 "configure" +#line 8730 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -8728,16 +8758,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8731: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8761: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8734: \$? = $ac_status" >&5 + echo "$as_me:8764: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8737: \"$ac_try\"") >&5 + { (eval echo "$as_me:8767: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8740: \$? = $ac_status" >&5 + echo "$as_me:8770: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -8747,7 +8777,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8750: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:8780: 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:8792: 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 @@ -8767,7 +8797,7 @@ else cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8770 "configure" +#line 8800 "configure" #include "confdefs.h" #include @@ -8780,16 +8810,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8783: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8813: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8786: \$? = $ac_status" >&5 + echo "$as_me:8816: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8789: \"$ac_try\"") >&5 + { (eval echo "$as_me:8819: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8792: \$? = $ac_status" >&5 + echo "$as_me:8822: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_utf8_lib=yes else @@ -8801,12 +8831,12 @@ cat conftest.$ac_ext >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:8804: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:8834: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8809 "configure" +#line 8839 "configure" #include "confdefs.h" #include @@ -8819,16 +8849,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8822: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8852: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8825: \$? = $ac_status" >&5 + echo "$as_me:8855: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8828: \"$ac_try\"") >&5 + { (eval echo "$as_me:8858: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8831: \$? = $ac_status" >&5 + echo "$as_me:8861: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -8842,7 +8872,7 @@ cat conftest.$ac_ext >&5 LIBS="-lutf8 $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8845 "configure" +#line 8875 "configure" #include "confdefs.h" #include @@ -8855,16 +8885,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8858: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8888: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8861: \$? = $ac_status" >&5 + echo "$as_me:8891: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8864: \"$ac_try\"") >&5 + { (eval echo "$as_me:8894: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8867: \$? = $ac_status" >&5 + echo "$as_me:8897: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -8881,9 +8911,9 @@ cat conftest.$ac_ext >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:8884: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:8914: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:8886: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:8916: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -8996,11 +9026,11 @@ 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}:8999: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:9029: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" cat >conftest.$ac_ext <<_ACEOF -#line 9003 "configure" +#line 9033 "configure" #include "confdefs.h" #include @@ -9013,21 +9043,21 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9016: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9046: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9019: \$? = $ac_status" >&5 + echo "$as_me:9049: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9022: \"$ac_try\"") >&5 + { (eval echo "$as_me:9052: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9025: \$? = $ac_status" >&5 + echo "$as_me:9055: \$? = $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}:9030: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:9060: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -9045,7 +9075,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:9048: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:9078: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -9142,13 +9172,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}:9145: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:9175: 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 9151 "configure" +#line 9181 "configure" #include "confdefs.h" #include @@ -9161,21 +9191,21 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9164: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9194: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9167: \$? = $ac_status" >&5 + echo "$as_me:9197: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9170: \"$ac_try\"") >&5 + { (eval echo "$as_me:9200: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9173: \$? = $ac_status" >&5 + echo "$as_me:9203: \$? = $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}:9178: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:9208: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -9217,7 +9247,7 @@ fi fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9220: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:9250: 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 @@ -9251,7 +9281,7 @@ if test -n "$cf_cv_header_path_utf8" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 9254 "configure" +#line 9284 "configure" #include "confdefs.h" #include int @@ -9263,16 +9293,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9266: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9296: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9269: \$? = $ac_status" >&5 + echo "$as_me:9299: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9272: \"$ac_try\"") >&5 + { (eval echo "$as_me:9302: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9275: \$? = $ac_status" >&5 + echo "$as_me:9305: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9289,7 +9319,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}:9292: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9322: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9323,7 +9353,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}:9326: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:9356: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -9340,14 +9370,14 @@ fi fi # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:9343: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:9373: 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 9350 "configure" +#line 9380 "configure" #include "confdefs.h" #include @@ -9365,23 +9395,23 @@ mbstate_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9368: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9398: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9371: \$? = $ac_status" >&5 + echo "$as_me:9401: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9374: \"$ac_try\"") >&5 + { (eval echo "$as_me:9404: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9377: \$? = $ac_status" >&5 + echo "$as_me:9407: \$? = $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 9384 "configure" +#line 9414 "configure" #include "confdefs.h" #include @@ -9400,16 +9430,16 @@ mbstate_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9403: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9433: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9406: \$? = $ac_status" >&5 + echo "$as_me:9436: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9409: \"$ac_try\"") >&5 + { (eval echo "$as_me:9439: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9412: \$? = $ac_status" >&5 + echo "$as_me:9442: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=yes else @@ -9421,7 +9451,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9424: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:9454: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -9438,14 +9468,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:9441: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:9471: 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 9448 "configure" +#line 9478 "configure" #include "confdefs.h" #include @@ -9463,23 +9493,23 @@ wchar_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9466: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9496: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9469: \$? = $ac_status" >&5 + echo "$as_me:9499: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9472: \"$ac_try\"") >&5 + { (eval echo "$as_me:9502: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9475: \$? = $ac_status" >&5 + echo "$as_me:9505: \$? = $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 9482 "configure" +#line 9512 "configure" #include "confdefs.h" #include @@ -9498,16 +9528,16 @@ wchar_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9501: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9531: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9504: \$? = $ac_status" >&5 + echo "$as_me:9534: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9507: \"$ac_try\"") >&5 + { (eval echo "$as_me:9537: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9510: \$? = $ac_status" >&5 + echo "$as_me:9540: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_t=yes else @@ -9519,7 +9549,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9522: result: $cf_cv_wchar_t" >&5 +echo "$as_me:9552: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -9541,14 +9571,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:9544: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:9574: 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 9551 "configure" +#line 9581 "configure" #include "confdefs.h" #include @@ -9566,23 +9596,23 @@ wint_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9569: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9599: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9572: \$? = $ac_status" >&5 + echo "$as_me:9602: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9575: \"$ac_try\"") >&5 + { (eval echo "$as_me:9605: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9578: \$? = $ac_status" >&5 + echo "$as_me:9608: \$? = $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 9585 "configure" +#line 9615 "configure" #include "confdefs.h" #include @@ -9601,16 +9631,16 @@ wint_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9604: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9634: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9607: \$? = $ac_status" >&5 + echo "$as_me:9637: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9610: \"$ac_try\"") >&5 + { (eval echo "$as_me:9640: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9613: \$? = $ac_status" >&5 + echo "$as_me:9643: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wint_t=yes else @@ -9622,7 +9652,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9625: result: $cf_cv_wint_t" >&5 +echo "$as_me:9655: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -9661,7 +9691,7 @@ case $cf_cv_abi_version in ;; esac -echo "$as_me:9664: checking whether to enable _LP64 definition in curses.h" >&5 +echo "$as_me:9694: checking whether to enable _LP64 definition in curses.h" >&5 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6 # Check whether --enable-lp64 or --disable-lp64 was given. @@ -9671,7 +9701,7 @@ if test "${enable_lp64+set}" = set; then else with_lp64=$default_with_lp64 fi; -echo "$as_me:9674: result: $with_lp64" >&5 +echo "$as_me:9704: result: $with_lp64" >&5 echo "${ECHO_T}$with_lp64" >&6 if test "$with_lp64" = yes ; then @@ -9687,7 +9717,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:9690: checking for special C compiler options needed for large files" >&5 + echo "$as_me:9720: checking for special C compiler options needed for large files" >&5 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9699,7 +9729,7 @@ else # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. cat >conftest.$ac_ext <<_ACEOF -#line 9702 "configure" +#line 9732 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -9719,16 +9749,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9722: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9752: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9725: \$? = $ac_status" >&5 + echo "$as_me:9755: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9728: \"$ac_try\"") >&5 + { (eval echo "$as_me:9758: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9731: \$? = $ac_status" >&5 + echo "$as_me:9761: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -9738,16 +9768,16 @@ fi rm -f conftest.$ac_objext CC="$CC -n32" rm -f conftest.$ac_objext -if { (eval echo "$as_me:9741: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9771: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9744: \$? = $ac_status" >&5 + echo "$as_me:9774: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9747: \"$ac_try\"") >&5 + { (eval echo "$as_me:9777: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9750: \$? = $ac_status" >&5 + echo "$as_me:9780: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -9761,13 +9791,13 @@ rm -f conftest.$ac_objext rm -f conftest.$ac_ext fi fi -echo "$as_me:9764: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:9794: result: $ac_cv_sys_largefile_CC" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:9770: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:9800: checking for _FILE_OFFSET_BITS value needed for large files" >&5 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9775,7 +9805,7 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF -#line 9778 "configure" +#line 9808 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -9795,16 +9825,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9798: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9828: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9801: \$? = $ac_status" >&5 + echo "$as_me:9831: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9804: \"$ac_try\"") >&5 + { (eval echo "$as_me:9834: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9807: \$? = $ac_status" >&5 + echo "$as_me:9837: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -9813,7 +9843,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 9816 "configure" +#line 9846 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -9834,16 +9864,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9837: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9867: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9840: \$? = $ac_status" >&5 + echo "$as_me:9870: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9843: \"$ac_try\"") >&5 + { (eval echo "$as_me:9873: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9846: \$? = $ac_status" >&5 + echo "$as_me:9876: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -9854,7 +9884,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:9857: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:9887: result: $ac_cv_sys_file_offset_bits" >&5 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 if test "$ac_cv_sys_file_offset_bits" != no; then @@ -9864,7 +9894,7 @@ EOF fi rm -rf conftest* - echo "$as_me:9867: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:9897: checking for _LARGE_FILES value needed for large files" >&5 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9872,7 +9902,7 @@ else while :; do ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF -#line 9875 "configure" +#line 9905 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -9892,16 +9922,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9895: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9925: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9898: \$? = $ac_status" >&5 + echo "$as_me:9928: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9901: \"$ac_try\"") >&5 + { (eval echo "$as_me:9931: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9904: \$? = $ac_status" >&5 + echo "$as_me:9934: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -9910,7 +9940,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 9913 "configure" +#line 9943 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -9931,16 +9961,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9934: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9964: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9937: \$? = $ac_status" >&5 + echo "$as_me:9967: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9940: \"$ac_try\"") >&5 + { (eval echo "$as_me:9970: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9943: \$? = $ac_status" >&5 + echo "$as_me:9973: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_large_files=1; break else @@ -9951,7 +9981,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:9954: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:9984: result: $ac_cv_sys_large_files" >&5 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 if test "$ac_cv_sys_large_files" != no; then @@ -9964,7 +9994,7 @@ rm -rf conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:9967: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:9997: checking for _LARGEFILE_SOURCE value needed for large files" >&5 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9972,7 +10002,7 @@ else while :; do ac_cv_sys_largefile_source=no cat >conftest.$ac_ext <<_ACEOF -#line 9975 "configure" +#line 10005 "configure" #include "confdefs.h" #include int @@ -9984,16 +10014,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9987: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10017: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9990: \$? = $ac_status" >&5 + echo "$as_me:10020: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9993: \"$ac_try\"") >&5 + { (eval echo "$as_me:10023: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9996: \$? = $ac_status" >&5 + echo "$as_me:10026: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -10002,7 +10032,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 10005 "configure" +#line 10035 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include @@ -10015,16 +10045,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10018: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10048: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10021: \$? = $ac_status" >&5 + echo "$as_me:10051: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10024: \"$ac_try\"") >&5 + { (eval echo "$as_me:10054: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10027: \$? = $ac_status" >&5 + echo "$as_me:10057: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_source=1; break else @@ -10035,7 +10065,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:10038: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:10068: result: $ac_cv_sys_largefile_source" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 if test "$ac_cv_sys_largefile_source" != no; then @@ -10049,13 +10079,13 @@ rm -rf conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -echo "$as_me:10052: checking for fseeko" >&5 +echo "$as_me:10082: checking for fseeko" >&5 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 if test "${ac_cv_func_fseeko+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10058 "configure" +#line 10088 "configure" #include "confdefs.h" #include int @@ -10067,16 +10097,16 @@ return fseeko && fseeko (stdin, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10070: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10100: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10073: \$? = $ac_status" >&5 + echo "$as_me:10103: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10076: \"$ac_try\"") >&5 + { (eval echo "$as_me:10106: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10079: \$? = $ac_status" >&5 + echo "$as_me:10109: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fseeko=yes else @@ -10086,7 +10116,7 @@ ac_cv_func_fseeko=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10089: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:10119: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -10107,14 +10137,14 @@ fi test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits " - echo "$as_me:10110: checking whether to use struct dirent64" >&5 + echo "$as_me:10140: checking whether to use struct dirent64" >&5 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 if test "${cf_cv_struct_dirent64+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10117 "configure" +#line 10147 "configure" #include "confdefs.h" #include @@ -10135,16 +10165,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10138: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10168: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10141: \$? = $ac_status" >&5 + echo "$as_me:10171: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10144: \"$ac_try\"") >&5 + { (eval echo "$as_me:10174: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10147: \$? = $ac_status" >&5 + echo "$as_me:10177: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_struct_dirent64=yes else @@ -10155,7 +10185,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10158: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:10188: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF #define HAVE_STRUCT_DIRENT64 1 @@ -10164,7 +10194,7 @@ EOF fi ### use option --disable-tparm-varargs to make tparm() conform to X/Open -echo "$as_me:10167: checking if you want tparm not to use X/Open fixed-parameter list" >&5 +echo "$as_me:10197: checking if you want tparm not to use X/Open fixed-parameter list" >&5 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. @@ -10174,14 +10204,14 @@ if test "${enable_tparm_varargs+set}" = set; then else with_tparm_varargs=yes fi; -echo "$as_me:10177: result: $with_tparm_varargs" >&5 +echo "$as_me:10207: result: $with_tparm_varargs" >&5 echo "${ECHO_T}$with_tparm_varargs" >&6 NCURSES_TPARM_VARARGS=0 test "$with_tparm_varargs" = yes && NCURSES_TPARM_VARARGS=1 ### use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw if test "$with_ticlib" != no ; then -echo "$as_me:10184: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 +echo "$as_me:10214: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6 # Check whether --enable-tic-depends or --disable-tic-depends was given. @@ -10191,14 +10221,14 @@ if test "${enable_tic_depends+set}" = set; then else with_tic_depends=yes fi; -echo "$as_me:10194: result: $with_tic_depends" >&5 +echo "$as_me:10224: result: $with_tic_depends" >&5 echo "${ECHO_T}$with_tic_depends" >&6 else with_tic_depends=no fi ### use option --with-bool to override bool's type -echo "$as_me:10201: checking for type of bool" >&5 +echo "$as_me:10231: checking for type of bool" >&5 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 # Check whether --with-bool or --without-bool was given. @@ -10208,10 +10238,10 @@ if test "${with_bool+set}" = set; then else NCURSES_BOOL=auto fi; -echo "$as_me:10211: result: $NCURSES_BOOL" >&5 +echo "$as_me:10241: result: $NCURSES_BOOL" >&5 echo "${ECHO_T}$NCURSES_BOOL" >&6 -echo "$as_me:10214: checking for alternate terminal capabilities file" >&5 +echo "$as_me:10244: checking for alternate terminal capabilities file" >&5 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 # Check whether --with-caps or --without-caps was given. @@ -10222,11 +10252,11 @@ else TERMINFO_CAPS=Caps fi; test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps -echo "$as_me:10225: result: $TERMINFO_CAPS" >&5 +echo "$as_me:10255: result: $TERMINFO_CAPS" >&5 echo "${ECHO_T}$TERMINFO_CAPS" >&6 ### use option --with-chtype to override chtype's type -echo "$as_me:10229: checking for type of chtype" >&5 +echo "$as_me:10259: checking for type of chtype" >&5 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 # Check whether --with-chtype or --without-chtype was given. @@ -10236,11 +10266,11 @@ if test "${with_chtype+set}" = set; then else NCURSES_CHTYPE=auto fi; -echo "$as_me:10239: result: $NCURSES_CHTYPE" >&5 +echo "$as_me:10269: result: $NCURSES_CHTYPE" >&5 echo "${ECHO_T}$NCURSES_CHTYPE" >&6 ### use option --with-ospeed to override ospeed's type -echo "$as_me:10243: checking for type of ospeed" >&5 +echo "$as_me:10273: checking for type of ospeed" >&5 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 # Check whether --with-ospeed or --without-ospeed was given. @@ -10250,11 +10280,11 @@ if test "${with_ospeed+set}" = set; then else NCURSES_OSPEED=short fi; -echo "$as_me:10253: result: $NCURSES_OSPEED" >&5 +echo "$as_me:10283: result: $NCURSES_OSPEED" >&5 echo "${ECHO_T}$NCURSES_OSPEED" >&6 ### use option --with-mmask-t to override mmask_t's type -echo "$as_me:10257: checking for type of mmask_t" >&5 +echo "$as_me:10287: checking for type of mmask_t" >&5 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6 # Check whether --with-mmask-t or --without-mmask-t was given. @@ -10264,11 +10294,11 @@ if test "${with_mmask_t+set}" = set; then else NCURSES_MMASK_T=auto fi; -echo "$as_me:10267: result: $NCURSES_MMASK_T" >&5 +echo "$as_me:10297: result: $NCURSES_MMASK_T" >&5 echo "${ECHO_T}$NCURSES_MMASK_T" >&6 ### use option --with-ccharw-max to override CCHARW_MAX size -echo "$as_me:10271: checking for size CCHARW_MAX" >&5 +echo "$as_me:10301: checking for size CCHARW_MAX" >&5 echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6 # Check whether --with-ccharw-max or --without-ccharw-max was given. @@ -10278,11 +10308,11 @@ if test "${with_ccharw_max+set}" = set; then else NCURSES_CCHARW_MAX=5 fi; -echo "$as_me:10281: result: $NCURSES_CCHARW_MAX" >&5 +echo "$as_me:10311: result: $NCURSES_CCHARW_MAX" >&5 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6 ### use option --with-tparm-arg to override tparm's argument type -echo "$as_me:10285: checking for type of tparm args" >&5 +echo "$as_me:10315: checking for type of tparm args" >&5 echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6 # Check whether --with-tparm-arg or --without-tparm-arg was given. @@ -10292,11 +10322,11 @@ if test "${with_tparm_arg+set}" = set; then else NCURSES_TPARM_ARG=long fi; -echo "$as_me:10295: result: $NCURSES_TPARM_ARG" >&5 +echo "$as_me:10325: result: $NCURSES_TPARM_ARG" >&5 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6 ### Enable compiling-in rcs id's -echo "$as_me:10299: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:10329: checking if RCS identifiers should be compiled-in" >&5 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 # Check whether --with-rcs-ids or --without-rcs-ids was given. @@ -10306,7 +10336,7 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:10309: result: $with_rcs_ids" >&5 +echo "$as_me:10339: result: $with_rcs_ids" >&5 echo "${ECHO_T}$with_rcs_ids" >&6 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF #define USE_RCS_IDS 1 @@ -10314,7 +10344,7 @@ EOF ############################################################################### -echo "$as_me:10317: checking format of man-pages" >&5 +echo "$as_me:10347: checking format of man-pages" >&5 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 # Check whether --with-manpage-format or --without-manpage-format was given. @@ -10403,14 +10433,14 @@ unknown) ;; esac -echo "$as_me:10406: result: $MANPAGE_FORMAT" >&5 +echo "$as_me:10436: result: $MANPAGE_FORMAT" >&5 echo "${ECHO_T}$MANPAGE_FORMAT" >&6 if test -n "$cf_unknown" ; then - { echo "$as_me:10409: WARNING: Unexpected manpage-format $cf_unknown" >&5 + { echo "$as_me:10439: WARNING: Unexpected manpage-format $cf_unknown" >&5 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} fi -echo "$as_me:10413: checking for manpage renaming" >&5 +echo "$as_me:10443: checking for manpage renaming" >&5 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 # Check whether --with-manpage-renames or --without-manpage-renames was given. @@ -10438,7 +10468,7 @@ if test "$MANPAGE_RENAMES" != no ; then if test -f $srcdir/man/$MANPAGE_RENAMES ; then MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES elif test ! -f $MANPAGE_RENAMES ; then - { { echo "$as_me:10441: error: not a filename: $MANPAGE_RENAMES" >&5 + { { echo "$as_me:10471: error: not a filename: $MANPAGE_RENAMES" >&5 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} { (exit 1); exit 1; }; } fi @@ -10452,10 +10482,10 @@ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} fi fi -echo "$as_me:10455: result: $MANPAGE_RENAMES" >&5 +echo "$as_me:10485: result: $MANPAGE_RENAMES" >&5 echo "${ECHO_T}$MANPAGE_RENAMES" >&6 -echo "$as_me:10458: checking if manpage aliases will be installed" >&5 +echo "$as_me:10488: checking if manpage aliases will be installed" >&5 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 # Check whether --with-manpage-aliases or --without-manpage-aliases was given. @@ -10466,7 +10496,7 @@ else MANPAGE_ALIASES=yes fi; -echo "$as_me:10469: result: $MANPAGE_ALIASES" >&5 +echo "$as_me:10499: result: $MANPAGE_ALIASES" >&5 echo "${ECHO_T}$MANPAGE_ALIASES" >&6 case "x$LN_S" in #(vi @@ -10480,7 +10510,7 @@ esac MANPAGE_SYMLINKS=no if test "$MANPAGE_ALIASES" = yes ; then -echo "$as_me:10483: checking if manpage symlinks should be used" >&5 +echo "$as_me:10513: checking if manpage symlinks should be used" >&5 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. @@ -10493,17 +10523,17 @@ fi; if test "$$cf_use_symlinks" = no; then if test "$MANPAGE_SYMLINKS" = yes ; then - { echo "$as_me:10496: WARNING: cannot make symlinks" >&5 + { echo "$as_me:10526: WARNING: cannot make symlinks" >&5 echo "$as_me: WARNING: cannot make symlinks" >&2;} MANPAGE_SYMLINKS=no fi fi -echo "$as_me:10502: result: $MANPAGE_SYMLINKS" >&5 +echo "$as_me:10532: result: $MANPAGE_SYMLINKS" >&5 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 fi -echo "$as_me:10506: checking for manpage tbl" >&5 +echo "$as_me:10536: checking for manpage tbl" >&5 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 # Check whether --with-manpage-tbl or --without-manpage-tbl was given. @@ -10514,7 +10544,7 @@ else MANPAGE_TBL=no fi; -echo "$as_me:10517: result: $MANPAGE_TBL" >&5 +echo "$as_me:10547: result: $MANPAGE_TBL" >&5 echo "${ECHO_T}$MANPAGE_TBL" >&6 if test "$prefix" = "NONE" ; then @@ -10845,7 +10875,7 @@ chmod 755 $cf_edit_man ############################################################################### ### Note that some functions (such as const) are normally disabled anyway. -echo "$as_me:10848: checking if you want to build with function extensions" >&5 +echo "$as_me:10878: checking if you want to build with function extensions" >&5 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. @@ -10855,7 +10885,7 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:10858: result: $with_ext_funcs" >&5 +echo "$as_me:10888: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "$with_ext_funcs" = yes ; then NCURSES_EXT_FUNCS=1 @@ -10909,7 +10939,7 @@ else GENERATED_EXT_FUNCS= fi -echo "$as_me:10912: checking if you want to build with experimental SCREEN extensions" >&5 +echo "$as_me:10942: checking if you want to build with experimental SCREEN extensions" >&5 echo $ECHO_N "checking if you want to build with experimental SCREEN extensions... $ECHO_C" >&6 # Check whether --enable-sp-funcs or --disable-sp-funcs was given. @@ -10919,7 +10949,7 @@ if test "${enable_sp_funcs+set}" = set; then else with_sp_funcs=no fi; -echo "$as_me:10922: result: $with_sp_funcs" >&5 +echo "$as_me:10952: result: $with_sp_funcs" >&5 echo "${ECHO_T}$with_sp_funcs" >&6 if test "$with_sp_funcs" = yes ; then NCURSES_SP_FUNCS=1 @@ -10933,7 +10963,7 @@ else GENERATED_SP_FUNCS= fi -echo "$as_me:10936: checking if you want to build with experimental terminal-driver" >&5 +echo "$as_me:10966: checking if you want to build with experimental terminal-driver" >&5 echo $ECHO_N "checking if you want to build with experimental terminal-driver... $ECHO_C" >&6 # Check whether --enable-term-driver or --disable-term-driver was given. @@ -10943,7 +10973,7 @@ if test "${enable_term_driver+set}" = set; then else with_term_driver=no fi; -echo "$as_me:10946: result: $with_term_driver" >&5 +echo "$as_me:10976: result: $with_term_driver" >&5 echo "${ECHO_T}$with_term_driver" >&6 if test "$with_term_driver" = yes ; then cat >>confdefs.h <<\EOF @@ -10951,14 +10981,14 @@ if test "$with_term_driver" = yes ; then EOF if test "$with_sp_funcs" != yes ; then - { { echo "$as_me:10954: error: The term-driver option relies upon sp-funcs" >&5 + { { echo "$as_me:10984: error: The term-driver option relies upon sp-funcs" >&5 echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;} { (exit 1); exit 1; }; } fi fi ### use option --enable-const to turn on use of const beyond that in XSI. -echo "$as_me:10961: checking for extended use of const keyword" >&5 +echo "$as_me:10991: checking for extended use of const keyword" >&5 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 # Check whether --enable-const or --disable-const was given. @@ -10968,7 +10998,7 @@ if test "${enable_const+set}" = set; then else with_ext_const=no fi; -echo "$as_me:10971: result: $with_ext_const" >&5 +echo "$as_me:11001: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "$with_ext_const" = yes ; then @@ -10976,7 +11006,7 @@ if test "$with_ext_const" = yes ; then fi ### use option --enable-ext-colors to turn on use of colors beyond 16. -echo "$as_me:10979: checking if you want to use extended colors" >&5 +echo "$as_me:11009: checking if you want to use extended colors" >&5 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 # Check whether --enable-ext-colors or --disable-ext-colors was given. @@ -10986,12 +11016,12 @@ if test "${enable_ext_colors+set}" = set; then else with_ext_colors=no fi; -echo "$as_me:10989: result: $with_ext_colors" >&5 +echo "$as_me:11019: result: $with_ext_colors" >&5 echo "${ECHO_T}$with_ext_colors" >&6 NCURSES_EXT_COLORS=0 if test "$with_ext_colors" = yes ; then if test "$with_widec" != yes ; then - { { echo "$as_me:10994: error: This option applies only to wide-character library" >&5 + { { echo "$as_me:11024: error: This option applies only to wide-character library" >&5 echo "$as_me: error: This option applies only to wide-character library" >&2;} { (exit 1); exit 1; }; } else @@ -11002,7 +11032,7 @@ if test "${with_abi_version+set}" != set; then 5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:11005: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:11035: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -11017,7 +11047,7 @@ EOF fi ### use option --enable-ext-mouse to modify coding to support 5-button mice -echo "$as_me:11020: checking if you want to use extended mouse encoding" >&5 +echo "$as_me:11050: checking if you want to use extended mouse encoding" >&5 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 # Check whether --enable-ext-mouse or --disable-ext-mouse was given. @@ -11027,7 +11057,7 @@ if test "${enable_ext_mouse+set}" = set; then else with_ext_mouse=no fi; -echo "$as_me:11030: result: $with_ext_mouse" >&5 +echo "$as_me:11060: result: $with_ext_mouse" >&5 echo "${ECHO_T}$with_ext_mouse" >&6 NCURSES_MOUSE_VERSION=1 if test "$with_ext_mouse" = yes ; then @@ -11038,7 +11068,7 @@ if test "${with_abi_version+set}" != set; then 5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:11041: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:11071: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -11046,7 +11076,7 @@ fi fi -echo "$as_me:11049: checking if you want \$NCURSES_NO_PADDING code" >&5 +echo "$as_me:11079: checking if you want \$NCURSES_NO_PADDING code" >&5 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 # Check whether --enable-no-padding or --disable-no-padding was given. @@ -11056,19 +11086,19 @@ if test "${enable_no_padding+set}" = set; then else with_no_padding=$with_ext_funcs fi; -echo "$as_me:11059: result: $with_no_padding" >&5 +echo "$as_me:11089: result: $with_no_padding" >&5 echo "${ECHO_T}$with_no_padding" >&6 test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF #define NCURSES_NO_PADDING 1 EOF -echo "$as_me:11065: checking for ANSI C header files" >&5 +echo "$as_me:11095: 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 11071 "configure" +#line 11101 "configure" #include "confdefs.h" #include #include @@ -11076,13 +11106,13 @@ else #include _ACEOF -if { (eval echo "$as_me:11079: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:11109: \"$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:11085: \$? = $ac_status" >&5 + echo "$as_me:11115: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11104,7 +11134,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 11107 "configure" +#line 11137 "configure" #include "confdefs.h" #include @@ -11122,7 +11152,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 11125 "configure" +#line 11155 "configure" #include "confdefs.h" #include @@ -11143,7 +11173,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 11146 "configure" +#line 11176 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -11169,15 +11199,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11172: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11202: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11175: \$? = $ac_status" >&5 + echo "$as_me:11205: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11177: \"$ac_try\"") >&5 + { (eval echo "$as_me:11207: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11180: \$? = $ac_status" >&5 + echo "$as_me:11210: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -11190,7 +11220,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:11193: result: $ac_cv_header_stdc" >&5 +echo "$as_me:11223: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -11206,28 +11236,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:11209: checking for $ac_header" >&5 +echo "$as_me:11239: 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 11215 "configure" +#line 11245 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11221: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11251: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11224: \$? = $ac_status" >&5 + echo "$as_me:11254: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11227: \"$ac_try\"") >&5 + { (eval echo "$as_me:11257: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11230: \$? = $ac_status" >&5 + echo "$as_me:11260: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -11237,7 +11267,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11240: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:11270: 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:11280: checking for signed char" >&5 echo $ECHO_N "checking for signed char... $ECHO_C" >&6 if test "${ac_cv_type_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11256 "configure" +#line 11286 "configure" #include "confdefs.h" $ac_includes_default int @@ -11268,16 +11298,16 @@ if (sizeof (signed char)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11271: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11301: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11274: \$? = $ac_status" >&5 + echo "$as_me:11304: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11277: \"$ac_try\"") >&5 + { (eval echo "$as_me:11307: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11280: \$? = $ac_status" >&5 + echo "$as_me:11310: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signed_char=yes else @@ -11287,10 +11317,10 @@ ac_cv_type_signed_char=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11290: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:11320: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:11293: checking size of signed char" >&5 +echo "$as_me:11323: checking size of signed char" >&5 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 if test "${ac_cv_sizeof_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11299,7 +11329,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 11302 "configure" +#line 11332 "configure" #include "confdefs.h" $ac_includes_default int @@ -11311,21 +11341,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11314: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11344: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11317: \$? = $ac_status" >&5 + echo "$as_me:11347: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11320: \"$ac_try\"") >&5 + { (eval echo "$as_me:11350: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11323: \$? = $ac_status" >&5 + echo "$as_me:11353: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 11328 "configure" +#line 11358 "configure" #include "confdefs.h" $ac_includes_default int @@ -11337,16 +11367,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11340: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11370: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11343: \$? = $ac_status" >&5 + echo "$as_me:11373: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11346: \"$ac_try\"") >&5 + { (eval echo "$as_me:11376: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11349: \$? = $ac_status" >&5 + echo "$as_me:11379: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -11362,7 +11392,7 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 11365 "configure" +#line 11395 "configure" #include "confdefs.h" $ac_includes_default int @@ -11374,16 +11404,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11377: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11407: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11380: \$? = $ac_status" >&5 + echo "$as_me:11410: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11383: \"$ac_try\"") >&5 + { (eval echo "$as_me:11413: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11386: \$? = $ac_status" >&5 + echo "$as_me:11416: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -11399,7 +11429,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line 11402 "configure" +#line 11432 "configure" #include "confdefs.h" $ac_includes_default int @@ -11411,16 +11441,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11414: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11444: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11417: \$? = $ac_status" >&5 + echo "$as_me:11447: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11420: \"$ac_try\"") >&5 + { (eval echo "$as_me:11450: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11423: \$? = $ac_status" >&5 + echo "$as_me:11453: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -11433,12 +11463,12 @@ done ac_cv_sizeof_signed_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:11436: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:11466: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line 11441 "configure" +#line 11471 "configure" #include "confdefs.h" $ac_includes_default int @@ -11454,15 +11484,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11457: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11487: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11460: \$? = $ac_status" >&5 + echo "$as_me:11490: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11462: \"$ac_try\"") >&5 + { (eval echo "$as_me:11492: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11465: \$? = $ac_status" >&5 + echo "$as_me:11495: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_signed_char=`cat conftest.val` else @@ -11478,7 +11508,7 @@ else ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:11481: result: $ac_cv_sizeof_signed_char" >&5 +echo "$as_me:11511: result: $ac_cv_sizeof_signed_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 cat >>confdefs.h <&5 +echo "$as_me:11522: checking if you want to use signed Boolean array in term.h" >&5 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 # Check whether --enable-signed-char or --disable-signed-char was given. @@ -11499,12 +11529,12 @@ if test "${enable_signed_char+set}" = set; then else with_signed_char=no fi; -echo "$as_me:11502: result: $with_signed_char" >&5 +echo "$as_me:11532: result: $with_signed_char" >&5 echo "${ECHO_T}$with_signed_char" >&6 test "$with_signed_char" != yes && NCURSES_SBOOL="char" ### use option --enable-sigwinch to turn on use of SIGWINCH logic -echo "$as_me:11507: checking if you want SIGWINCH handler" >&5 +echo "$as_me:11537: checking if you want SIGWINCH handler" >&5 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 # Check whether --enable-sigwinch or --disable-sigwinch was given. @@ -11514,14 +11544,14 @@ if test "${enable_sigwinch+set}" = set; then else with_sigwinch=$with_ext_funcs fi; -echo "$as_me:11517: result: $with_sigwinch" >&5 +echo "$as_me:11547: result: $with_sigwinch" >&5 echo "${ECHO_T}$with_sigwinch" >&6 test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF #define USE_SIGWINCH 1 EOF ### use option --enable-tcap-names to allow user to define new capabilities -echo "$as_me:11524: checking if you want user-definable terminal capabilities like termcap" >&5 +echo "$as_me:11554: checking if you want user-definable terminal capabilities like termcap" >&5 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 # Check whether --enable-tcap-names or --disable-tcap-names was given. @@ -11531,7 +11561,7 @@ if test "${enable_tcap_names+set}" = set; then else with_tcap_names=$with_ext_funcs fi; -echo "$as_me:11534: result: $with_tcap_names" >&5 +echo "$as_me:11564: result: $with_tcap_names" >&5 echo "${ECHO_T}$with_tcap_names" >&6 NCURSES_XNAMES=0 test "$with_tcap_names" = yes && NCURSES_XNAMES=1 @@ -11539,7 +11569,7 @@ test "$with_tcap_names" = yes && NCURSES_XNAMES=1 ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:11542: checking if you want all development code" >&5 +echo "$as_me:11572: checking if you want all development code" >&5 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 # Check whether --with-develop or --without-develop was given. @@ -11549,11 +11579,11 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:11552: result: $with_develop" >&5 +echo "$as_me:11582: result: $with_develop" >&5 echo "${ECHO_T}$with_develop" >&6 ### use option --enable-hard-tabs to turn on use of hard-tabs optimize -echo "$as_me:11556: checking if you want hard-tabs code" >&5 +echo "$as_me:11586: checking if you want hard-tabs code" >&5 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 # Check whether --enable-hard-tabs or --disable-hard-tabs was given. @@ -11563,14 +11593,14 @@ if test "${enable_hard_tabs+set}" = set; then else enable_hard_tabs=$with_develop fi; -echo "$as_me:11566: result: $enable_hard_tabs" >&5 +echo "$as_me:11596: result: $enable_hard_tabs" >&5 echo "${ECHO_T}$enable_hard_tabs" >&6 test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF #define USE_HARD_TABS 1 EOF ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize -echo "$as_me:11573: checking if you want limited support for xmc" >&5 +echo "$as_me:11603: checking if you want limited support for xmc" >&5 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. @@ -11580,7 +11610,7 @@ if test "${enable_xmc_glitch+set}" = set; then else enable_xmc_glitch=$with_develop fi; -echo "$as_me:11583: result: $enable_xmc_glitch" >&5 +echo "$as_me:11613: result: $enable_xmc_glitch" >&5 echo "${ECHO_T}$enable_xmc_glitch" >&6 test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF #define USE_XMC_SUPPORT 1 @@ -11589,7 +11619,7 @@ EOF ############################################################################### # These are just experimental, probably should not be in a package: -echo "$as_me:11592: checking if you do not want to assume colors are white-on-black" >&5 +echo "$as_me:11622: checking if you do not want to assume colors are white-on-black" >&5 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 # Check whether --enable-assumed-color or --disable-assumed-color was given. @@ -11599,14 +11629,14 @@ if test "${enable_assumed_color+set}" = set; then else with_assumed_color=yes fi; -echo "$as_me:11602: result: $with_assumed_color" >&5 +echo "$as_me:11632: result: $with_assumed_color" >&5 echo "${ECHO_T}$with_assumed_color" >&6 test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF #define USE_ASSUMED_COLOR 1 EOF ### use option --enable-hashmap to turn on use of hashmap scrolling logic -echo "$as_me:11609: checking if you want hashmap scrolling-optimization code" >&5 +echo "$as_me:11639: checking if you want hashmap scrolling-optimization code" >&5 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 # Check whether --enable-hashmap or --disable-hashmap was given. @@ -11616,14 +11646,14 @@ if test "${enable_hashmap+set}" = set; then else with_hashmap=yes fi; -echo "$as_me:11619: result: $with_hashmap" >&5 +echo "$as_me:11649: result: $with_hashmap" >&5 echo "${ECHO_T}$with_hashmap" >&6 test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF #define USE_HASHMAP 1 EOF ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment -echo "$as_me:11626: checking if you want colorfgbg code" >&5 +echo "$as_me:11656: checking if you want colorfgbg code" >&5 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 # Check whether --enable-colorfgbg or --disable-colorfgbg was given. @@ -11633,14 +11663,14 @@ if test "${enable_colorfgbg+set}" = set; then else with_colorfgbg=no fi; -echo "$as_me:11636: result: $with_colorfgbg" >&5 +echo "$as_me:11666: result: $with_colorfgbg" >&5 echo "${ECHO_T}$with_colorfgbg" >&6 test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF #define USE_COLORFGBG 1 EOF ### use option --enable-interop to turn on use of bindings used for interop -echo "$as_me:11643: checking if you want interop bindings" >&5 +echo "$as_me:11673: checking if you want interop bindings" >&5 echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6 # Check whether --enable-interop or --disable-interop was given. @@ -11650,7 +11680,7 @@ if test "${enable_interop+set}" = set; then else with_exp_interop=no fi; -echo "$as_me:11653: result: $with_exp_interop" >&5 +echo "$as_me:11683: result: $with_exp_interop" >&5 echo "${ECHO_T}$with_exp_interop" >&6 NCURSES_INTEROP_FUNCS=0 @@ -11659,7 +11689,7 @@ test "$with_exp_interop" = yes && NCURSES_INTEROP_FUNCS=1 # This is still experimental (20080329), but should ultimately be moved to # the script-block --with-normal, etc. -echo "$as_me:11662: checking if you want to link with the pthread library" >&5 +echo "$as_me:11692: checking if you want to link with the pthread library" >&5 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 # Check whether --with-pthread or --without-pthread was given. @@ -11669,27 +11699,27 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:11672: result: $with_pthread" >&5 +echo "$as_me:11702: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:11676: checking for pthread.h" >&5 + echo "$as_me:11706: checking for pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 if test "${ac_cv_header_pthread_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11682 "configure" +#line 11712 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:11686: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:11716: \"$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:11692: \$? = $ac_status" >&5 + echo "$as_me:11722: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11708,7 +11738,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:11711: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:11741: result: $ac_cv_header_pthread_h" >&5 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 if test $ac_cv_header_pthread_h = yes; then @@ -11718,12 +11748,12 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:11721: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:11751: checking if we can link with the $cf_lib_pthread library" >&5 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 cf_save_LIBS="$LIBS" LIBS="-l$cf_lib_pthread $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11726 "configure" +#line 11756 "configure" #include "confdefs.h" #include @@ -11740,16 +11770,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11743: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11773: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11746: \$? = $ac_status" >&5 + echo "$as_me:11776: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11749: \"$ac_try\"") >&5 + { (eval echo "$as_me:11779: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11752: \$? = $ac_status" >&5 + echo "$as_me:11782: \$? = $ac_status" >&5 (exit $ac_status); }; }; then with_pthread=yes else @@ -11759,7 +11789,7 @@ with_pthread=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:11762: result: $with_pthread" >&5 + echo "$as_me:11792: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done @@ -11771,7 +11801,7 @@ echo "${ECHO_T}$with_pthread" >&6 EOF else - { { echo "$as_me:11774: error: Cannot link with pthread library" >&5 + { { echo "$as_me:11804: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -11781,13 +11811,13 @@ fi fi if test "x$with_pthread" != xno; then - echo "$as_me:11784: checking for pthread_kill" >&5 + echo "$as_me:11814: checking for pthread_kill" >&5 echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6 if test "${ac_cv_func_pthread_kill+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11790 "configure" +#line 11820 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pthread_kill (); below. */ @@ -11818,16 +11848,16 @@ f = pthread_kill; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11821: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11851: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11824: \$? = $ac_status" >&5 + echo "$as_me:11854: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11827: \"$ac_try\"") >&5 + { (eval echo "$as_me:11857: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11830: \$? = $ac_status" >&5 + echo "$as_me:11860: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_pthread_kill=yes else @@ -11837,11 +11867,11 @@ ac_cv_func_pthread_kill=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11840: result: $ac_cv_func_pthread_kill" >&5 +echo "$as_me:11870: result: $ac_cv_func_pthread_kill" >&5 echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6 if test $ac_cv_func_pthread_kill = yes; then - echo "$as_me:11844: checking if you want to allow EINTR in wgetch with pthreads" >&5 + echo "$as_me:11874: checking if you want to allow EINTR in wgetch with pthreads" >&5 echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6 # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given. @@ -11851,7 +11881,7 @@ if test "${enable_pthreads_eintr+set}" = set; then else use_pthreads_eintr=no fi; - echo "$as_me:11854: result: $use_pthreads_eintr" >&5 + echo "$as_me:11884: result: $use_pthreads_eintr" >&5 echo "${ECHO_T}$use_pthreads_eintr" >&6 if test $use_pthreads_eintr = yes ; then cat >>confdefs.h <<\EOF @@ -11861,7 +11891,7 @@ EOF fi fi - echo "$as_me:11864: checking if you want to use weak-symbols for pthreads" >&5 + echo "$as_me:11894: checking if you want to use weak-symbols for pthreads" >&5 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. @@ -11871,18 +11901,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; - echo "$as_me:11874: result: $use_weak_symbols" >&5 + echo "$as_me:11904: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "$use_weak_symbols" = yes ; then -echo "$as_me:11878: checking if $CC supports weak symbols" >&5 +echo "$as_me:11908: checking if $CC supports weak symbols" >&5 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 if test "${cf_cv_weak_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11885 "configure" +#line 11915 "configure" #include "confdefs.h" #include @@ -11908,16 +11938,16 @@ weak_symbol(fopen); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11911: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11941: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11914: \$? = $ac_status" >&5 + echo "$as_me:11944: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11917: \"$ac_try\"") >&5 + { (eval echo "$as_me:11947: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11920: \$? = $ac_status" >&5 + echo "$as_me:11950: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_weak_symbols=yes else @@ -11928,7 +11958,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11931: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:11961: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -11959,7 +11989,7 @@ fi # opaque outside of that, so there is no --enable-opaque option. We can use # this option without --with-pthreads, but this will be always set for # pthreads. -echo "$as_me:11962: checking if you want experimental reentrant code" >&5 +echo "$as_me:11992: checking if you want experimental reentrant code" >&5 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 # Check whether --enable-reentrant or --disable-reentrant was given. @@ -11969,7 +11999,7 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=no fi; -echo "$as_me:11972: result: $with_reentrant" >&5 +echo "$as_me:12002: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "$with_reentrant" = yes ; then cf_cv_enable_reentrant=1 @@ -11995,7 +12025,7 @@ if test "${with_abi_version+set}" != set; then 5.*) cf_cv_rel_version=6.0 cf_cv_abi_version=6 - { echo "$as_me:11998: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 + { echo "$as_me:12028: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} ;; esac @@ -12010,7 +12040,7 @@ fi ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:12013: checking for prefix used to wrap public variables" >&5 + echo "$as_me:12043: checking for prefix used to wrap public variables" >&5 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 # Check whether --with-wrap-prefix or --without-wrap-prefix was given. @@ -12020,7 +12050,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:12023: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:12053: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -12030,7 +12060,7 @@ cat >>confdefs.h <&5 +echo "$as_me:12063: checking if you want experimental safe-sprintf code" >&5 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. @@ -12040,7 +12070,7 @@ if test "${enable_safe_sprintf+set}" = set; then else with_safe_sprintf=no fi; -echo "$as_me:12043: result: $with_safe_sprintf" >&5 +echo "$as_me:12073: result: $with_safe_sprintf" >&5 echo "${ECHO_T}$with_safe_sprintf" >&6 test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF #define USE_SAFE_SPRINTF 1 @@ -12049,7 +12079,7 @@ EOF ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic # when hashmap is used scroll hints are useless if test "$with_hashmap" = no ; then -echo "$as_me:12052: checking if you want to experiment without scrolling-hints code" >&5 +echo "$as_me:12082: checking if you want to experiment without scrolling-hints code" >&5 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 # Check whether --enable-scroll-hints or --disable-scroll-hints was given. @@ -12059,7 +12089,7 @@ if test "${enable_scroll_hints+set}" = set; then else with_scroll_hints=yes fi; -echo "$as_me:12062: result: $with_scroll_hints" >&5 +echo "$as_me:12092: result: $with_scroll_hints" >&5 echo "${ECHO_T}$with_scroll_hints" >&6 test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF #define USE_SCROLL_HINTS 1 @@ -12067,7 +12097,7 @@ EOF fi -echo "$as_me:12070: checking if you want experimental wgetch-events code" >&5 +echo "$as_me:12100: checking if you want experimental wgetch-events code" >&5 echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6 # Check whether --enable-wgetch-events or --disable-wgetch-events was given. @@ -12077,7 +12107,7 @@ if test "${enable_wgetch_events+set}" = set; then else with_wgetch_events=no fi; -echo "$as_me:12080: result: $with_wgetch_events" >&5 +echo "$as_me:12110: result: $with_wgetch_events" >&5 echo "${ECHO_T}$with_wgetch_events" >&6 test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF #define NCURSES_WGETCH_EVENTS 1 @@ -12086,7 +12116,7 @@ EOF ############################################################################### ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:12089: checking if you want to display full commands during build" >&5 +echo "$as_me:12119: checking if you want to display full commands during build" >&5 echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -12103,11 +12133,11 @@ else test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent" test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent" fi -echo "$as_me:12106: result: $with_echo" >&5 +echo "$as_me:12136: result: $with_echo" >&5 echo "${ECHO_T}$with_echo" >&6 ### use option --enable-warnings to turn on all gcc warnings -echo "$as_me:12110: checking if you want to see compiler warnings" >&5 +echo "$as_me:12140: checking if you want to see compiler warnings" >&5 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -12115,7 +12145,7 @@ if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" with_warnings=$enableval fi; -echo "$as_me:12118: result: $with_warnings" >&5 +echo "$as_me:12148: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "x$with_warnings" = "xyes"; then @@ -12127,12 +12157,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in linux*|gnu*) - echo "$as_me:12130: checking if this is really Intel C compiler" >&5 + echo "$as_me:12160: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >conftest.$ac_ext <<_ACEOF -#line 12135 "configure" +#line 12165 "configure" #include "confdefs.h" int @@ -12149,16 +12179,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12152: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12182: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12155: \$? = $ac_status" >&5 + echo "$as_me:12185: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12158: \"$ac_try\"") >&5 + { (eval echo "$as_me:12188: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12161: \$? = $ac_status" >&5 + echo "$as_me:12191: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -12169,14 +12199,14 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:12172: result: $INTEL_COMPILER" >&5 + echo "$as_me:12202: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac fi cat > conftest.$ac_ext <&5 + { echo "$as_me:12226: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -12209,12 +12239,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:12212: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:12242: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12215: \$? = $ac_status" >&5 + echo "$as_me:12245: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:12217: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:12247: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -12223,7 +12253,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:12226: checking for $CC warning options..." >&5 + { echo "$as_me:12256: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= @@ -12243,12 +12273,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:12246: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:12276: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12249: \$? = $ac_status" >&5 + echo "$as_me:12279: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:12251: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:12281: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -12259,7 +12289,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}:12262: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:12292: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -12279,12 +12309,12 @@ INTEL_CPLUSPLUS=no if test "$GCC" = yes ; then case $host_os in linux*|gnu*) - echo "$as_me:12282: checking if this is really Intel C++ compiler" >&5 + echo "$as_me:12312: checking if this is really Intel C++ compiler" >&5 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -no-gcc" cat >conftest.$ac_ext <<_ACEOF -#line 12287 "configure" +#line 12317 "configure" #include "confdefs.h" int @@ -12301,16 +12331,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12304: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12334: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12307: \$? = $ac_status" >&5 + echo "$as_me:12337: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12310: \"$ac_try\"") >&5 + { (eval echo "$as_me:12340: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12313: \$? = $ac_status" >&5 + echo "$as_me:12343: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_CPLUSPLUS=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -12321,7 +12351,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:12324: result: $INTEL_CPLUSPLUS" >&5 + echo "$as_me:12354: result: $INTEL_CPLUSPLUS" >&5 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 ;; esac @@ -12335,7 +12365,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat > conftest.$ac_ext <&5 + { echo "$as_me:12386: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-Wall" @@ -12370,12 +12400,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" - if { (eval echo "$as_me:12373: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:12403: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12376: \$? = $ac_status" >&5 + echo "$as_me:12406: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:12378: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:12408: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" fi @@ -12384,7 +12414,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GXX" = yes then - { echo "$as_me:12387: checking for $CXX warning options..." >&5 + { echo "$as_me:12417: checking for $CXX warning options..." >&5 echo "$as_me: checking for $CXX warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-W -Wall" @@ -12413,16 +12443,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;} Wundef $cf_gxx_extra_warnings Wno-unused do CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" - if { (eval echo "$as_me:12416: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:12446: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12419: \$? = $ac_status" >&5 + echo "$as_me:12449: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:12421: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:12451: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" else - test -n "$verbose" && echo "$as_me:12425: result: ... no -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:12455: result: ... no -$cf_opt" >&5 echo "${ECHO_T}... no -$cf_opt" >&6 fi done @@ -12458,10 +12488,10 @@ cat > conftest.i <&5 + { echo "$as_me:12491: 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:12543: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12516: \$? = $ac_status" >&5 + echo "$as_me:12546: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:12518: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:12548: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in #(vi @@ -12550,8 +12580,100 @@ fi rm -rf conftest* fi +echo "$as_me:12583: checking if you want to work around bogus compiler/loader warnings" >&5 +echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 + +# Check whether --enable-string-hacks or --disable-string-hacks was given. +if test "${enable_string_hacks+set}" = set; then + enableval="$enable_string_hacks" + with_string_hacks=$enableval +else + with_string_hacks=no +fi; +echo "$as_me:12593: result: $with_string_hacks" >&5 +echo "${ECHO_T}$with_string_hacks" >&6 + +if test "x$with_string_hacks" = "xyes"; then + cat >>confdefs.h <<\EOF +#define USE_STRING_HACKS 1 +EOF + + { echo "$as_me:12601: 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;} + +for ac_func in strlcat strlcpy snprintf +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:12607: 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 12613 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +#include +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); + +int +main () +{ +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +f = $ac_func; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:12644: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12647: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:12650: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12653: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:12663: 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:12676: checking if you want to enable runtime assertions" >&5 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 # Check whether --enable-assertions or --disable-assertions was given. @@ -12561,7 +12683,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:12564: result: $with_assertions" >&5 +echo "$as_me:12686: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -12581,7 +12703,7 @@ fi ### use option --disable-leaks to suppress "permanent" leaks, for testing -echo "$as_me:12584: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:12706: 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. @@ -12597,7 +12719,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:12600: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:12722: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in #(vi @@ -12691,23 +12813,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:12694: checking for dmalloc.h" >&5 + echo "$as_me:12816: 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 12700 "configure" +#line 12822 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:12704: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12826: \"$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:12710: \$? = $ac_status" >&5 + echo "$as_me:12832: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12726,11 +12848,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:12729: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:12851: 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:12733: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:12855: 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 @@ -12738,7 +12860,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12741 "configure" +#line 12863 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12757,16 +12879,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12760: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12882: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12763: \$? = $ac_status" >&5 + echo "$as_me:12885: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12766: \"$ac_try\"") >&5 + { (eval echo "$as_me:12888: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12769: \$? = $ac_status" >&5 + echo "$as_me:12891: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -12777,7 +12899,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12780: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:12902: 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:12917: 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. @@ -12808,7 +12930,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:12811: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:12933: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in #(vi @@ -12902,23 +13024,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:12905: checking for dbmalloc.h" >&5 + echo "$as_me:13027: 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 12911 "configure" +#line 13033 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:12915: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13037: \"$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:12921: \$? = $ac_status" >&5 + echo "$as_me:13043: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12937,11 +13059,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:12940: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:13062: 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:12944: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:13066: 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 @@ -12949,7 +13071,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12952 "configure" +#line 13074 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12968,16 +13090,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12971: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13093: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12974: \$? = $ac_status" >&5 + echo "$as_me:13096: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12977: \"$ac_try\"") >&5 + { (eval echo "$as_me:13099: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12980: \$? = $ac_status" >&5 + echo "$as_me:13102: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -12988,7 +13110,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12991: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:13113: 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:13128: 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. @@ -13019,7 +13141,7 @@ EOF else with_valgrind= fi; -echo "$as_me:13022: result: ${with_valgrind:-no}" >&5 +echo "$as_me:13144: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in #(vi @@ -13112,7 +13234,7 @@ fi ;; esac -echo "$as_me:13115: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:13237: 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. @@ -13122,7 +13244,7 @@ if test "${enable_leaks+set}" = set; then else : ${with_no_leaks:=no} fi; -echo "$as_me:13125: result: $with_no_leaks" >&5 +echo "$as_me:13247: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then @@ -13171,7 +13293,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:13174: checking whether to add trace feature to all models" >&5 +echo "$as_me:13296: checking whether to add trace feature to all models" >&5 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 # Check whether --with-trace or --without-trace was given. @@ -13181,7 +13303,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:13184: result: $cf_with_trace" >&5 +echo "$as_me:13306: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "$cf_with_trace" = yes ; then @@ -13276,13 +13398,13 @@ case $cf_cv_system_name in #(vi *mingw32*) #(vi ;; *) -echo "$as_me:13279: checking for gettimeofday" >&5 +echo "$as_me:13401: checking for gettimeofday" >&5 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 if test "${ac_cv_func_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13285 "configure" +#line 13407 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gettimeofday (); below. */ @@ -13313,16 +13435,16 @@ f = gettimeofday; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13316: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13438: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13319: \$? = $ac_status" >&5 + echo "$as_me:13441: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13322: \"$ac_try\"") >&5 + { (eval echo "$as_me:13444: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13325: \$? = $ac_status" >&5 + echo "$as_me:13447: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gettimeofday=yes else @@ -13332,7 +13454,7 @@ ac_cv_func_gettimeofday=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13335: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:13457: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test $ac_cv_func_gettimeofday = yes; then cat >>confdefs.h <<\EOF @@ -13341,7 +13463,7 @@ EOF else -echo "$as_me:13344: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:13466: checking for gettimeofday in -lbsd" >&5 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13349,7 +13471,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13352 "configure" +#line 13474 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13368,16 +13490,16 @@ gettimeofday (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13371: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13493: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13374: \$? = $ac_status" >&5 + echo "$as_me:13496: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13377: \"$ac_try\"") >&5 + { (eval echo "$as_me:13499: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13380: \$? = $ac_status" >&5 + echo "$as_me:13502: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -13388,7 +13510,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13391: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:13513: result: $ac_cv_lib_bsd_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 if test $ac_cv_lib_bsd_gettimeofday = yes; then cat >>confdefs.h <<\EOF @@ -13402,14 +13524,14 @@ fi ;; esac -echo "$as_me:13405: checking if -lm needed for math functions" >&5 +echo "$as_me:13527: checking if -lm needed for math functions" >&5 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 if test "${cf_cv_need_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13412 "configure" +#line 13534 "configure" #include "confdefs.h" #include @@ -13424,16 +13546,16 @@ double x = rand(); printf("result = %g\n", sin(x)) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13427: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13549: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13430: \$? = $ac_status" >&5 + echo "$as_me:13552: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13433: \"$ac_try\"") >&5 + { (eval echo "$as_me:13555: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13436: \$? = $ac_status" >&5 + echo "$as_me:13558: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_libm=no else @@ -13443,7 +13565,7 @@ cf_cv_need_libm=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13446: result: $cf_cv_need_libm" >&5 +echo "$as_me:13568: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes then @@ -13451,13 +13573,13 @@ MATH_LIB=-lm fi ### Checks for header files. -echo "$as_me:13454: checking for ANSI C header files" >&5 +echo "$as_me:13576: 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 13460 "configure" +#line 13582 "configure" #include "confdefs.h" #include #include @@ -13465,13 +13587,13 @@ else #include _ACEOF -if { (eval echo "$as_me:13468: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13590: \"$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:13474: \$? = $ac_status" >&5 + echo "$as_me:13596: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13493,7 +13615,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 13496 "configure" +#line 13618 "configure" #include "confdefs.h" #include @@ -13511,7 +13633,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 13514 "configure" +#line 13636 "configure" #include "confdefs.h" #include @@ -13532,7 +13654,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 13535 "configure" +#line 13657 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -13558,15 +13680,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:13561: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13683: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13564: \$? = $ac_status" >&5 + echo "$as_me:13686: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13566: \"$ac_try\"") >&5 + { (eval echo "$as_me:13688: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13569: \$? = $ac_status" >&5 + echo "$as_me:13691: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -13579,7 +13701,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:13582: result: $ac_cv_header_stdc" >&5 +echo "$as_me:13704: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -13592,13 +13714,13 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:13595: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:13717: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13601 "configure" +#line 13723 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -13613,16 +13735,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13616: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13738: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13619: \$? = $ac_status" >&5 + echo "$as_me:13741: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13622: \"$ac_try\"") >&5 + { (eval echo "$as_me:13744: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13625: \$? = $ac_status" >&5 + echo "$as_me:13747: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -13632,7 +13754,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13635: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13757: 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:13770: checking for opendir in -ldir" >&5 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 if test "${ac_cv_lib_dir_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13653,7 +13775,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13656 "configure" +#line 13778 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13672,16 +13794,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13675: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13797: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13678: \$? = $ac_status" >&5 + echo "$as_me:13800: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13681: \"$ac_try\"") >&5 + { (eval echo "$as_me:13803: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13684: \$? = $ac_status" >&5 + echo "$as_me:13806: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -13692,14 +13814,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13695: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:13817: result: $ac_cv_lib_dir_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 if test $ac_cv_lib_dir_opendir = yes; then LIBS="$LIBS -ldir" fi else - echo "$as_me:13702: checking for opendir in -lx" >&5 + echo "$as_me:13824: checking for opendir in -lx" >&5 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 if test "${ac_cv_lib_x_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13707,7 +13829,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13710 "configure" +#line 13832 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13726,16 +13848,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13729: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13851: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13732: \$? = $ac_status" >&5 + echo "$as_me:13854: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13735: \"$ac_try\"") >&5 + { (eval echo "$as_me:13857: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13738: \$? = $ac_status" >&5 + echo "$as_me:13860: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -13746,7 +13868,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13749: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:13871: result: $ac_cv_lib_x_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 if test $ac_cv_lib_x_opendir = yes; then LIBS="$LIBS -lx" @@ -13754,13 +13876,13 @@ fi fi -echo "$as_me:13757: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:13879: 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 13763 "configure" +#line 13885 "configure" #include "confdefs.h" #include #include @@ -13776,16 +13898,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13779: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13901: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13782: \$? = $ac_status" >&5 + echo "$as_me:13904: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13785: \"$ac_try\"") >&5 + { (eval echo "$as_me:13907: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13788: \$? = $ac_status" >&5 + echo "$as_me:13910: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -13795,7 +13917,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13798: result: $ac_cv_header_time" >&5 +echo "$as_me:13920: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -13814,13 +13936,13 @@ mingw*) ;; esac -echo "$as_me:13817: checking for regcomp" >&5 +echo "$as_me:13939: checking for regcomp" >&5 echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 if test "${ac_cv_func_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13823 "configure" +#line 13945 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char regcomp (); below. */ @@ -13851,16 +13973,16 @@ f = regcomp; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13854: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13976: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13857: \$? = $ac_status" >&5 + echo "$as_me:13979: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13860: \"$ac_try\"") >&5 + { (eval echo "$as_me:13982: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13863: \$? = $ac_status" >&5 + echo "$as_me:13985: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_regcomp=yes else @@ -13870,7 +13992,7 @@ ac_cv_func_regcomp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13873: result: $ac_cv_func_regcomp" >&5 +echo "$as_me:13995: result: $ac_cv_func_regcomp" >&5 echo "${ECHO_T}$ac_cv_func_regcomp" >&6 if test $ac_cv_func_regcomp = yes; then cf_regex_func=regcomp @@ -13879,7 +14001,7 @@ else for cf_regex_lib in $cf_regex_libs do as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh` -echo "$as_me:13882: checking for regcomp in -l$cf_regex_lib" >&5 +echo "$as_me:14004: checking for regcomp in -l$cf_regex_lib" >&5 echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13887,7 +14009,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_regex_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13890 "configure" +#line 14012 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13906,16 +14028,16 @@ regcomp (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13909: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14031: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13912: \$? = $ac_status" >&5 + echo "$as_me:14034: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13915: \"$ac_try\"") >&5 + { (eval echo "$as_me:14037: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13918: \$? = $ac_status" >&5 + echo "$as_me:14040: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -13926,7 +14048,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13929: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:14051: 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 @@ -13940,13 +14062,13 @@ fi fi if test "$cf_regex_func" = no ; then - echo "$as_me:13943: checking for compile" >&5 + echo "$as_me:14065: checking for compile" >&5 echo $ECHO_N "checking for compile... $ECHO_C" >&6 if test "${ac_cv_func_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13949 "configure" +#line 14071 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char compile (); below. */ @@ -13977,16 +14099,16 @@ f = compile; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13980: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14102: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13983: \$? = $ac_status" >&5 + echo "$as_me:14105: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13986: \"$ac_try\"") >&5 + { (eval echo "$as_me:14108: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13989: \$? = $ac_status" >&5 + echo "$as_me:14111: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_compile=yes else @@ -13996,13 +14118,13 @@ ac_cv_func_compile=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13999: result: $ac_cv_func_compile" >&5 +echo "$as_me:14121: result: $ac_cv_func_compile" >&5 echo "${ECHO_T}$ac_cv_func_compile" >&6 if test $ac_cv_func_compile = yes; then cf_regex_func=compile else - echo "$as_me:14005: checking for compile in -lgen" >&5 + echo "$as_me:14127: checking for compile in -lgen" >&5 echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6 if test "${ac_cv_lib_gen_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14010,7 +14132,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14013 "configure" +#line 14135 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14029,16 +14151,16 @@ compile (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14032: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14154: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14035: \$? = $ac_status" >&5 + echo "$as_me:14157: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14038: \"$ac_try\"") >&5 + { (eval echo "$as_me:14160: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14041: \$? = $ac_status" >&5 + echo "$as_me:14163: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gen_compile=yes else @@ -14049,7 +14171,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14052: result: $ac_cv_lib_gen_compile" >&5 +echo "$as_me:14174: result: $ac_cv_lib_gen_compile" >&5 echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 if test $ac_cv_lib_gen_compile = yes; then @@ -14062,11 +14184,11 @@ fi fi if test "$cf_regex_func" = no ; then - { echo "$as_me:14065: WARNING: cannot find regular expression library" >&5 + { echo "$as_me:14187: WARNING: cannot find regular expression library" >&5 echo "$as_me: WARNING: cannot find regular expression library" >&2;} fi -echo "$as_me:14069: checking for regular-expression headers" >&5 +echo "$as_me:14191: checking for regular-expression headers" >&5 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 if test "${cf_cv_regex_hdrs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14078,7 +14200,7 @@ compile) #(vi for cf_regex_hdr in regexp.h regexpr.h do cat >conftest.$ac_ext <<_ACEOF -#line 14081 "configure" +#line 14203 "configure" #include "confdefs.h" #include <$cf_regex_hdr> int @@ -14093,16 +14215,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14096: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14218: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14099: \$? = $ac_status" >&5 + echo "$as_me:14221: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14102: \"$ac_try\"") >&5 + { (eval echo "$as_me:14224: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14105: \$? = $ac_status" >&5 + echo "$as_me:14227: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -14119,7 +14241,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext for cf_regex_hdr in regex.h do cat >conftest.$ac_ext <<_ACEOF -#line 14122 "configure" +#line 14244 "configure" #include "confdefs.h" #include #include <$cf_regex_hdr> @@ -14137,16 +14259,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14140: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14262: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14143: \$? = $ac_status" >&5 + echo "$as_me:14265: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14146: \"$ac_try\"") >&5 + { (eval echo "$as_me:14268: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14149: \$? = $ac_status" >&5 + echo "$as_me:14271: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -14162,11 +14284,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext esac fi -echo "$as_me:14165: result: $cf_cv_regex_hdrs" >&5 +echo "$as_me:14287: result: $cf_cv_regex_hdrs" >&5 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 case $cf_cv_regex_hdrs in #(vi - no) { echo "$as_me:14169: WARNING: no regular expression header found" >&5 + no) { echo "$as_me:14291: WARNING: no regular expression header found" >&5 echo "$as_me: WARNING: no regular expression header found" >&2;} ;; #(vi regex.h) cat >>confdefs.h <<\EOF #define HAVE_REGEX_H_FUNCS 1 @@ -14202,23 +14324,23 @@ wctype.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:14205: checking for $ac_header" >&5 +echo "$as_me:14327: 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 14211 "configure" +#line 14333 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14215: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14337: \"$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:14221: \$? = $ac_status" >&5 + echo "$as_me:14343: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14237,7 +14359,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14240: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:14362: 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:14375: 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 14259 "configure" +#line 14381 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14263: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14385: \"$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:14269: \$? = $ac_status" >&5 + echo "$as_me:14391: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14285,7 +14407,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14288: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:14410: 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:14420: 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 @@ -14305,7 +14427,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 14308 "configure" +#line 14430 "configure" #include "confdefs.h" #include <$cf_header> @@ -14318,16 +14440,16 @@ int x = optind; char *y = optarg } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14321: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14443: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14324: \$? = $ac_status" >&5 + echo "$as_me:14446: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14327: \"$ac_try\"") >&5 + { (eval echo "$as_me:14449: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14330: \$? = $ac_status" >&5 + echo "$as_me:14452: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_getopt_header=$cf_header break @@ -14339,7 +14461,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:14342: result: $cf_cv_getopt_header" >&5 +echo "$as_me:14464: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test $cf_cv_getopt_header != none ; then cat >>confdefs.h <<\EOF @@ -14352,7 +14474,7 @@ fi # Note: even non-Posix ISC needs to declare fd_set if test "$ISC" = yes ; then -echo "$as_me:14355: checking for main in -lcposix" >&5 +echo "$as_me:14477: checking for main in -lcposix" >&5 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6 if test "${ac_cv_lib_cposix_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14360,7 +14482,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14363 "configure" +#line 14485 "configure" #include "confdefs.h" int @@ -14372,16 +14494,16 @@ main (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14375: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14497: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14378: \$? = $ac_status" >&5 + echo "$as_me:14500: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14381: \"$ac_try\"") >&5 + { (eval echo "$as_me:14503: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14384: \$? = $ac_status" >&5 + echo "$as_me:14506: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cposix_main=yes else @@ -14392,7 +14514,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14395: result: $ac_cv_lib_cposix_main" >&5 +echo "$as_me:14517: result: $ac_cv_lib_cposix_main" >&5 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6 if test $ac_cv_lib_cposix_main = yes; then cat >>confdefs.h <&5 + echo "$as_me:14528: checking for bzero in -linet" >&5 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6 if test "${ac_cv_lib_inet_bzero+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14411,7 +14533,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-linet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14414 "configure" +#line 14536 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14430,16 +14552,16 @@ bzero (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14433: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14555: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14436: \$? = $ac_status" >&5 + echo "$as_me:14558: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14439: \"$ac_try\"") >&5 + { (eval echo "$as_me:14561: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14442: \$? = $ac_status" >&5 + echo "$as_me:14564: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_inet_bzero=yes else @@ -14450,21 +14572,21 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14453: result: $ac_cv_lib_inet_bzero" >&5 +echo "$as_me:14575: result: $ac_cv_lib_inet_bzero" >&5 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 if test $ac_cv_lib_inet_bzero = yes; then LIBS="-linet $LIBS" fi fi -echo "$as_me:14460: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:14582: 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 14467 "configure" +#line 14589 "configure" #include "confdefs.h" #include @@ -14484,16 +14606,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14487: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14609: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14490: \$? = $ac_status" >&5 + echo "$as_me:14612: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14493: \"$ac_try\"") >&5 + { (eval echo "$as_me:14615: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14496: \$? = $ac_status" >&5 + echo "$as_me:14618: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sys_time_select=yes else @@ -14505,7 +14627,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14508: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:14630: 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 #define HAVE_SYS_TIME_SELECT 1 @@ -14519,7 +14641,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -echo "$as_me:14522: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:14644: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14527,7 +14649,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 14530 "configure" +#line 14652 "configure" #include "confdefs.h" #include #include @@ -14576,16 +14698,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:14579: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14701: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14582: \$? = $ac_status" >&5 + echo "$as_me:14704: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14585: \"$ac_try\"") >&5 + { (eval echo "$as_me:14707: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14588: \$? = $ac_status" >&5 + echo "$as_me:14710: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -14602,21 +14724,21 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:14605: result: none needed" >&5 + echo "$as_me:14727: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:14608: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:14730: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac -echo "$as_me:14613: checking for an ANSI C-conforming const" >&5 +echo "$as_me:14735: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14619 "configure" +#line 14741 "configure" #include "confdefs.h" int @@ -14674,16 +14796,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14677: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14799: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14680: \$? = $ac_status" >&5 + echo "$as_me:14802: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14683: \"$ac_try\"") >&5 + { (eval echo "$as_me:14805: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14686: \$? = $ac_status" >&5 + echo "$as_me:14808: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -14693,7 +14815,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14696: result: $ac_cv_c_const" >&5 +echo "$as_me:14818: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -14703,7 +14825,7 @@ EOF fi -echo "$as_me:14706: checking for inline" >&5 +echo "$as_me:14828: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14711,7 +14833,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 14714 "configure" +#line 14836 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -14720,16 +14842,16 @@ $ac_kw int foo () {return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14723: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14845: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14726: \$? = $ac_status" >&5 + echo "$as_me:14848: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14729: \"$ac_try\"") >&5 + { (eval echo "$as_me:14851: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14732: \$? = $ac_status" >&5 + echo "$as_me:14854: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -14740,7 +14862,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:14743: result: $ac_cv_c_inline" >&5 +echo "$as_me:14865: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -14763,7 +14885,7 @@ if test "$ac_cv_c_inline" != no ; then : elif test "$GCC" = yes then - echo "$as_me:14766: checking if $CC supports options to tune inlining" >&5 + echo "$as_me:14888: checking if $CC supports options to tune inlining" >&5 echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6 if test "${cf_cv_gcc_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14772,7 +14894,7 @@ else cf_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS --param max-inline-insns-single=1200" cat >conftest.$ac_ext <<_ACEOF -#line 14775 "configure" +#line 14897 "configure" #include "confdefs.h" inline int foo(void) { return 1; } int @@ -14784,16 +14906,16 @@ ${cf_cv_main_return:-return} foo() } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14787: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14909: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14790: \$? = $ac_status" >&5 + echo "$as_me:14912: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14793: \"$ac_try\"") >&5 + { (eval echo "$as_me:14915: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14796: \$? = $ac_status" >&5 + echo "$as_me:14918: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gcc_inline=yes else @@ -14805,7 +14927,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS=$cf_save_CFLAGS fi -echo "$as_me:14808: result: $cf_cv_gcc_inline" >&5 +echo "$as_me:14930: result: $cf_cv_gcc_inline" >&5 echo "${ECHO_T}$cf_cv_gcc_inline" >&6 if test "$cf_cv_gcc_inline" = yes ; then @@ -14891,7 +15013,7 @@ fi fi fi -echo "$as_me:14894: checking for signal global datatype" >&5 +echo "$as_me:15016: 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 @@ -14903,7 +15025,7 @@ else "int" do cat >conftest.$ac_ext <<_ACEOF -#line 14906 "configure" +#line 15028 "configure" #include "confdefs.h" #include @@ -14926,16 +15048,16 @@ signal(SIGINT, handler); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14929: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15051: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14932: \$? = $ac_status" >&5 + echo "$as_me:15054: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14935: \"$ac_try\"") >&5 + { (eval echo "$as_me:15057: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14938: \$? = $ac_status" >&5 + echo "$as_me:15060: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -14949,7 +15071,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14952: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:15074: 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:15082: checking for type of chtype" >&5 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 if test "${cf_cv_typeof_chtype+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14967,7 +15089,7 @@ else cf_cv_typeof_chtype=long else cat >conftest.$ac_ext <<_ACEOF -#line 14970 "configure" +#line 15092 "configure" #include "confdefs.h" #define WANT_BITS 31 @@ -15002,15 +15124,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15005: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15127: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15008: \$? = $ac_status" >&5 + echo "$as_me:15130: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15010: \"$ac_try\"") >&5 + { (eval echo "$as_me:15132: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15013: \$? = $ac_status" >&5 + echo "$as_me:15135: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_typeof_chtype=`cat cf_test.out` else @@ -15025,7 +15147,7 @@ fi fi -echo "$as_me:15028: result: $cf_cv_typeof_chtype" >&5 +echo "$as_me:15150: result: $cf_cv_typeof_chtype" >&5 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 cat >>confdefs.h <&5 +echo "$as_me:15162: checking if unsigned literals are legal" >&5 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 if test "${cf_cv_unsigned_literals+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15047 "configure" +#line 15169 "configure" #include "confdefs.h" int @@ -15056,16 +15178,16 @@ long x = 1L + 1UL + 1U + 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15059: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15181: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15062: \$? = $ac_status" >&5 + echo "$as_me:15184: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15065: \"$ac_try\"") >&5 + { (eval echo "$as_me:15187: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15068: \$? = $ac_status" >&5 + echo "$as_me:15190: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_unsigned_literals=yes else @@ -15077,7 +15199,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15080: result: $cf_cv_unsigned_literals" >&5 +echo "$as_me:15202: result: $cf_cv_unsigned_literals" >&5 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 cf_cv_1UL="1" @@ -15093,14 +15215,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t="" ### Checks for external-data -echo "$as_me:15096: checking if external errno is declared" >&5 +echo "$as_me:15218: checking if external errno is declared" >&5 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15103 "configure" +#line 15225 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -15118,16 +15240,16 @@ int x = (int) errno } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15121: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15243: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15124: \$? = $ac_status" >&5 + echo "$as_me:15246: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15127: \"$ac_try\"") >&5 + { (eval echo "$as_me:15249: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15130: \$? = $ac_status" >&5 + echo "$as_me:15252: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_errno=yes else @@ -15138,7 +15260,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15141: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:15263: result: $cf_cv_dcl_errno" >&5 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then @@ -15153,14 +15275,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:15156: checking if external errno exists" >&5 +echo "$as_me:15278: checking if external errno exists" >&5 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 if test "${cf_cv_have_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15163 "configure" +#line 15285 "configure" #include "confdefs.h" #undef errno @@ -15175,16 +15297,16 @@ errno = 2 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15178: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15300: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15181: \$? = $ac_status" >&5 + echo "$as_me:15303: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15184: \"$ac_try\"") >&5 + { (eval echo "$as_me:15306: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15187: \$? = $ac_status" >&5 + echo "$as_me:15309: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_errno=yes else @@ -15195,7 +15317,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15198: result: $cf_cv_have_errno" >&5 +echo "$as_me:15320: result: $cf_cv_have_errno" >&5 echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then @@ -15208,7 +15330,7 @@ EOF fi -echo "$as_me:15211: checking if data-only library module links" >&5 +echo "$as_me:15333: checking if data-only library module links" >&5 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 if test "${cf_cv_link_dataonly+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15216,20 +15338,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:15344: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15225: \$? = $ac_status" >&5 + echo "$as_me:15347: \$? = $ac_status" >&5 (exit $ac_status); } ; then mv conftest.o data.o && \ ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null fi rm -f conftest.$ac_ext data.o cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:15367: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15248: \$? = $ac_status" >&5 + echo "$as_me:15370: \$? = $ac_status" >&5 (exit $ac_status); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -15258,7 +15380,7 @@ EOF cf_cv_link_dataonly=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 15261 "configure" +#line 15383 "configure" #include "confdefs.h" int main() @@ -15269,15 +15391,15 @@ else _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15272: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15394: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15275: \$? = $ac_status" >&5 + echo "$as_me:15397: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15277: \"$ac_try\"") >&5 + { (eval echo "$as_me:15399: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15280: \$? = $ac_status" >&5 + echo "$as_me:15402: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_dataonly=yes else @@ -15292,7 +15414,7 @@ fi fi -echo "$as_me:15295: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:15417: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -15327,13 +15449,13 @@ vsnprintf \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:15330: checking for $ac_func" >&5 +echo "$as_me:15452: 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 15336 "configure" +#line 15458 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -15364,16 +15486,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15367: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15489: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15370: \$? = $ac_status" >&5 + echo "$as_me:15492: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15373: \"$ac_try\"") >&5 + { (eval echo "$as_me:15495: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15376: \$? = $ac_status" >&5 + echo "$as_me:15498: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -15383,7 +15505,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15386: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:15508: 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:15520: checking for terminal-capability database functions" >&5 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 if test "${cf_cv_cgetent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15405 "configure" +#line 15527 "configure" #include "confdefs.h" #include @@ -15422,16 +15544,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15425: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15547: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15428: \$? = $ac_status" >&5 + echo "$as_me:15550: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15431: \"$ac_try\"") >&5 + { (eval echo "$as_me:15553: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15434: \$? = $ac_status" >&5 + echo "$as_me:15556: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent=yes else @@ -15442,7 +15564,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15445: result: $cf_cv_cgetent" >&5 +echo "$as_me:15567: result: $cf_cv_cgetent" >&5 echo "${ECHO_T}$cf_cv_cgetent" >&6 if test "$cf_cv_cgetent" = yes @@ -15451,14 +15573,14 @@ then #define HAVE_BSD_CGETENT 1 EOF -echo "$as_me:15454: checking if cgetent uses const parameter" >&5 +echo "$as_me:15576: checking if cgetent uses const parameter" >&5 echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6 if test "${cf_cv_cgetent_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15461 "configure" +#line 15583 "configure" #include "confdefs.h" #include @@ -15480,16 +15602,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15483: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15605: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15486: \$? = $ac_status" >&5 + echo "$as_me:15608: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15489: \"$ac_try\"") >&5 + { (eval echo "$as_me:15611: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15492: \$? = $ac_status" >&5 + echo "$as_me:15614: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cgetent_const=yes else @@ -15500,7 +15622,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15503: result: $cf_cv_cgetent_const" >&5 +echo "$as_me:15625: result: $cf_cv_cgetent_const" >&5 echo "${ECHO_T}$cf_cv_cgetent_const" >&6 if test "$cf_cv_cgetent_const" = yes then @@ -15513,14 +15635,14 @@ fi fi -echo "$as_me:15516: checking for isascii" >&5 +echo "$as_me:15638: checking for isascii" >&5 echo $ECHO_N "checking for isascii... $ECHO_C" >&6 if test "${cf_cv_have_isascii+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15523 "configure" +#line 15645 "configure" #include "confdefs.h" #include int @@ -15532,16 +15654,16 @@ int x = isascii(' ') } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15535: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15657: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15538: \$? = $ac_status" >&5 + echo "$as_me:15660: \$? = $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:15663: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15544: \$? = $ac_status" >&5 + echo "$as_me:15666: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_isascii=yes else @@ -15552,17 +15674,17 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15555: result: $cf_cv_have_isascii" >&5 +echo "$as_me:15677: result: $cf_cv_have_isascii" >&5 echo "${ECHO_T}$cf_cv_have_isascii" >&6 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF #define HAVE_ISASCII 1 EOF if test "$ac_cv_func_sigaction" = yes; then -echo "$as_me:15562: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "$as_me:15684: checking whether sigaction needs _POSIX_SOURCE" >&5 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 15565 "configure" +#line 15687 "configure" #include "confdefs.h" #include @@ -15576,16 +15698,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15579: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15701: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15582: \$? = $ac_status" >&5 + echo "$as_me:15704: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15585: \"$ac_try\"") >&5 + { (eval echo "$as_me:15707: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15588: \$? = $ac_status" >&5 + echo "$as_me:15710: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=no else @@ -15593,7 +15715,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 15596 "configure" +#line 15718 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -15608,16 +15730,16 @@ struct sigaction act } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15611: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15733: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15614: \$? = $ac_status" >&5 + echo "$as_me:15736: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15617: \"$ac_try\"") >&5 + { (eval echo "$as_me:15739: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15620: \$? = $ac_status" >&5 + echo "$as_me:15742: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sigact_bad=yes cat >>confdefs.h <<\EOF @@ -15632,11 +15754,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:15635: result: $sigact_bad" >&5 +echo "$as_me:15757: result: $sigact_bad" >&5 echo "${ECHO_T}$sigact_bad" >&6 fi -echo "$as_me:15639: checking if nanosleep really works" >&5 +echo "$as_me:15761: checking if nanosleep really works" >&5 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 if test "${cf_cv_func_nanosleep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15646,7 +15768,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_nanosleep=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 15649 "configure" +#line 15771 "configure" #include "confdefs.h" #include @@ -15671,15 +15793,15 @@ int main() { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15674: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15796: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15677: \$? = $ac_status" >&5 + echo "$as_me:15799: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15679: \"$ac_try\"") >&5 + { (eval echo "$as_me:15801: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15682: \$? = $ac_status" >&5 + echo "$as_me:15804: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_nanosleep=yes else @@ -15691,7 +15813,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:15694: result: $cf_cv_func_nanosleep" >&5 +echo "$as_me:15816: result: $cf_cv_func_nanosleep" >&5 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF @@ -15705,23 +15827,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:15708: checking for $ac_header" >&5 +echo "$as_me:15830: 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 15714 "configure" +#line 15836 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:15718: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15840: \"$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:15724: \$? = $ac_status" >&5 + echo "$as_me:15846: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15740,7 +15862,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:15743: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:15865: 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:15880: 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 15764 "configure" +#line 15886 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:15768: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15890: \"$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:15774: \$? = $ac_status" >&5 + echo "$as_me:15896: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15790,7 +15912,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:15793: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:15915: 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:15933: checking whether termios.h needs _POSIX_SOURCE" >&5 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 15814 "configure" +#line 15936 "configure" #include "confdefs.h" #include int @@ -15823,16 +15945,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15826: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15948: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15829: \$? = $ac_status" >&5 + echo "$as_me:15951: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15832: \"$ac_try\"") >&5 + { (eval echo "$as_me:15954: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15835: \$? = $ac_status" >&5 + echo "$as_me:15957: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=no else @@ -15840,7 +15962,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 15843 "configure" +#line 15965 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -15854,16 +15976,16 @@ struct termios foo; int x = foo.c_iflag } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15857: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15979: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15860: \$? = $ac_status" >&5 + echo "$as_me:15982: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15863: \"$ac_try\"") >&5 + { (eval echo "$as_me:15985: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15866: \$? = $ac_status" >&5 + echo "$as_me:15988: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=unknown else @@ -15878,19 +16000,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:15881: result: $termios_bad" >&5 + echo "$as_me:16003: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:15886: checking for tcgetattr" >&5 +echo "$as_me:16008: checking for tcgetattr" >&5 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 if test "${cf_cv_have_tcgetattr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15893 "configure" +#line 16015 "configure" #include "confdefs.h" #include @@ -15918,16 +16040,16 @@ tcgetattr(1, &foo); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15921: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16043: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15924: \$? = $ac_status" >&5 + echo "$as_me:16046: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15927: \"$ac_try\"") >&5 + { (eval echo "$as_me:16049: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15930: \$? = $ac_status" >&5 + echo "$as_me:16052: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_tcgetattr=yes else @@ -15937,20 +16059,20 @@ cf_cv_have_tcgetattr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15940: result: $cf_cv_have_tcgetattr" >&5 +echo "$as_me:16062: result: $cf_cv_have_tcgetattr" >&5 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF #define HAVE_TCGETATTR 1 EOF -echo "$as_me:15946: checking for vsscanf function or workaround" >&5 +echo "$as_me:16068: checking for vsscanf function or workaround" >&5 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 if test "${cf_cv_func_vsscanf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15953 "configure" +#line 16075 "configure" #include "confdefs.h" #include @@ -15966,16 +16088,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15969: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16091: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15972: \$? = $ac_status" >&5 + echo "$as_me:16094: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15975: \"$ac_try\"") >&5 + { (eval echo "$as_me:16097: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15978: \$? = $ac_status" >&5 + echo "$as_me:16100: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vsscanf else @@ -15983,7 +16105,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 15986 "configure" +#line 16108 "configure" #include "confdefs.h" #include @@ -16005,16 +16127,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16008: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16130: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16011: \$? = $ac_status" >&5 + echo "$as_me:16133: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16014: \"$ac_try\"") >&5 + { (eval echo "$as_me:16136: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16017: \$? = $ac_status" >&5 + echo "$as_me:16139: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=vfscanf else @@ -16022,7 +16144,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 16025 "configure" +#line 16147 "configure" #include "confdefs.h" #include @@ -16044,16 +16166,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16047: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16169: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16050: \$? = $ac_status" >&5 + echo "$as_me:16172: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16053: \"$ac_try\"") >&5 + { (eval echo "$as_me:16175: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16056: \$? = $ac_status" >&5 + echo "$as_me:16178: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_vsscanf=_doscan else @@ -16068,7 +16190,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16071: result: $cf_cv_func_vsscanf" >&5 +echo "$as_me:16193: result: $cf_cv_func_vsscanf" >&5 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 case $cf_cv_func_vsscanf in #(vi @@ -16086,7 +16208,7 @@ EOF ;; esac -echo "$as_me:16089: checking for working mkstemp" >&5 +echo "$as_me:16211: checking for working mkstemp" >&5 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 if test "${cf_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16097,7 +16219,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 16100 "configure" +#line 16222 "configure" #include "confdefs.h" #include @@ -16135,15 +16257,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16138: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16260: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16141: \$? = $ac_status" >&5 + echo "$as_me:16263: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16143: \"$ac_try\"") >&5 + { (eval echo "$as_me:16265: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16146: \$? = $ac_status" >&5 + echo "$as_me:16268: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -16158,16 +16280,16 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:16161: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:16283: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "x$cf_cv_func_mkstemp" = xmaybe ; then - echo "$as_me:16164: checking for mkstemp" >&5 + echo "$as_me:16286: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 if test "${ac_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16170 "configure" +#line 16292 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mkstemp (); below. */ @@ -16198,16 +16320,16 @@ f = mkstemp; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16201: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16323: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16204: \$? = $ac_status" >&5 + echo "$as_me:16326: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16207: \"$ac_try\"") >&5 + { (eval echo "$as_me:16329: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16210: \$? = $ac_status" >&5 + echo "$as_me:16332: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -16217,7 +16339,7 @@ ac_cv_func_mkstemp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16220: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:16342: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -16237,21 +16359,21 @@ else fi if test "$cross_compiling" = yes ; then - { echo "$as_me:16240: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + { echo "$as_me:16362: WARNING: cross compiling: assume setvbuf params not reversed" >&5 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} else - echo "$as_me:16243: checking whether setvbuf arguments are reversed" >&5 + echo "$as_me:16365: checking whether setvbuf arguments are reversed" >&5 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { { echo "$as_me:16249: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:16371: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line 16254 "configure" +#line 16376 "configure" #include "confdefs.h" #include /* If setvbuf has the reversed format, exit 0. */ @@ -16268,15 +16390,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16271: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16393: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16274: \$? = $ac_status" >&5 + echo "$as_me:16396: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16276: \"$ac_try\"") >&5 + { (eval echo "$as_me:16398: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16279: \$? = $ac_status" >&5 + echo "$as_me:16401: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_setvbuf_reversed=yes else @@ -16289,7 +16411,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f core core.* *.core fi -echo "$as_me:16292: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "$as_me:16414: result: $ac_cv_func_setvbuf_reversed" >&5 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 if test $ac_cv_func_setvbuf_reversed = yes; then @@ -16300,13 +16422,13 @@ EOF fi fi -echo "$as_me:16303: checking return type of signal handlers" >&5 +echo "$as_me:16425: checking return type of signal handlers" >&5 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 if test "${ac_cv_type_signal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16309 "configure" +#line 16431 "configure" #include "confdefs.h" #include #include @@ -16328,16 +16450,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16331: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16453: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16334: \$? = $ac_status" >&5 + echo "$as_me:16456: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16337: \"$ac_try\"") >&5 + { (eval echo "$as_me:16459: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16340: \$? = $ac_status" >&5 + echo "$as_me:16462: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signal=void else @@ -16347,20 +16469,20 @@ ac_cv_type_signal=int fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16350: result: $ac_cv_type_signal" >&5 +echo "$as_me:16472: result: $ac_cv_type_signal" >&5 echo "${ECHO_T}$ac_cv_type_signal" >&6 cat >>confdefs.h <&5 +echo "$as_me:16479: checking for intptr_t" >&5 echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6 if test "${ac_cv_type_intptr_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16363 "configure" +#line 16485 "configure" #include "confdefs.h" $ac_includes_default int @@ -16375,16 +16497,16 @@ if (sizeof (intptr_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16378: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16500: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16381: \$? = $ac_status" >&5 + echo "$as_me:16503: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16384: \"$ac_try\"") >&5 + { (eval echo "$as_me:16506: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16387: \$? = $ac_status" >&5 + echo "$as_me:16509: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_intptr_t=yes else @@ -16394,7 +16516,7 @@ ac_cv_type_intptr_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16397: result: $ac_cv_type_intptr_t" >&5 +echo "$as_me:16519: result: $ac_cv_type_intptr_t" >&5 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6 if test $ac_cv_type_intptr_t = yes; then : @@ -16406,14 +16528,14 @@ EOF fi -echo "$as_me:16409: checking for type sigaction_t" >&5 +echo "$as_me:16531: checking for type sigaction_t" >&5 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 if test "${cf_cv_type_sigaction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16416 "configure" +#line 16538 "configure" #include "confdefs.h" #include @@ -16426,16 +16548,16 @@ sigaction_t x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16429: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16551: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16432: \$? = $ac_status" >&5 + echo "$as_me:16554: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16435: \"$ac_try\"") >&5 + { (eval echo "$as_me:16557: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16438: \$? = $ac_status" >&5 + echo "$as_me:16560: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_sigaction=yes else @@ -16446,13 +16568,13 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16449: result: $cf_cv_type_sigaction" >&5 +echo "$as_me:16571: result: $cf_cv_type_sigaction" >&5 echo "${ECHO_T}$cf_cv_type_sigaction" >&6 test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF #define HAVE_TYPE_SIGACTION 1 EOF -echo "$as_me:16455: checking declaration of size-change" >&5 +echo "$as_me:16577: checking declaration of size-change" >&5 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 if test "${cf_cv_sizechange+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16467,7 +16589,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat >conftest.$ac_ext <<_ACEOF -#line 16470 "configure" +#line 16592 "configure" #include "confdefs.h" #include #ifdef HAVE_TERMIOS_H @@ -16511,16 +16633,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16514: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16636: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16517: \$? = $ac_status" >&5 + echo "$as_me:16639: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16520: \"$ac_try\"") >&5 + { (eval echo "$as_me:16642: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16523: \$? = $ac_status" >&5 + echo "$as_me:16645: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sizechange=yes else @@ -16539,7 +16661,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:16542: result: $cf_cv_sizechange" >&5 +echo "$as_me:16664: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then cat >>confdefs.h <<\EOF @@ -16556,13 +16678,13 @@ EOF esac fi -echo "$as_me:16559: checking for memmove" >&5 +echo "$as_me:16681: checking for memmove" >&5 echo $ECHO_N "checking for memmove... $ECHO_C" >&6 if test "${ac_cv_func_memmove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16565 "configure" +#line 16687 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char memmove (); below. */ @@ -16593,16 +16715,16 @@ f = memmove; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16596: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16718: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16599: \$? = $ac_status" >&5 + echo "$as_me:16721: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16602: \"$ac_try\"") >&5 + { (eval echo "$as_me:16724: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16605: \$? = $ac_status" >&5 + echo "$as_me:16727: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_memmove=yes else @@ -16612,19 +16734,19 @@ ac_cv_func_memmove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16615: result: $ac_cv_func_memmove" >&5 +echo "$as_me:16737: result: $ac_cv_func_memmove" >&5 echo "${ECHO_T}$ac_cv_func_memmove" >&6 if test $ac_cv_func_memmove = yes; then : else -echo "$as_me:16621: checking for bcopy" >&5 +echo "$as_me:16743: checking for bcopy" >&5 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 if test "${ac_cv_func_bcopy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16627 "configure" +#line 16749 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char bcopy (); below. */ @@ -16655,16 +16777,16 @@ f = bcopy; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16658: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16780: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16661: \$? = $ac_status" >&5 + echo "$as_me:16783: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16664: \"$ac_try\"") >&5 + { (eval echo "$as_me:16786: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16667: \$? = $ac_status" >&5 + echo "$as_me:16789: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_bcopy=yes else @@ -16674,11 +16796,11 @@ ac_cv_func_bcopy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16677: result: $ac_cv_func_bcopy" >&5 +echo "$as_me:16799: result: $ac_cv_func_bcopy" >&5 echo "${ECHO_T}$ac_cv_func_bcopy" >&6 if test $ac_cv_func_bcopy = yes; then - echo "$as_me:16681: checking if bcopy does overlapping moves" >&5 + echo "$as_me:16803: checking if bcopy does overlapping moves" >&5 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 if test "${cf_cv_good_bcopy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16688,7 +16810,7 @@ else cf_cv_good_bcopy=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 16691 "configure" +#line 16813 "configure" #include "confdefs.h" int main() { @@ -16702,15 +16824,15 @@ int main() { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16705: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16827: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16708: \$? = $ac_status" >&5 + echo "$as_me:16830: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16710: \"$ac_try\"") >&5 + { (eval echo "$as_me:16832: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16713: \$? = $ac_status" >&5 + echo "$as_me:16835: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_good_bcopy=yes else @@ -16723,7 +16845,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:16726: result: $cf_cv_good_bcopy" >&5 +echo "$as_me:16848: result: $cf_cv_good_bcopy" >&5 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 else @@ -16744,7 +16866,7 @@ EOF fi -echo "$as_me:16747: checking if poll really works" >&5 +echo "$as_me:16869: checking if poll really works" >&5 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 if test "${cf_cv_working_poll+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16754,7 +16876,7 @@ if test "$cross_compiling" = yes; then cf_cv_working_poll=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 16757 "configure" +#line 16879 "configure" #include "confdefs.h" #include @@ -16794,15 +16916,15 @@ int main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:16797: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16919: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16800: \$? = $ac_status" >&5 + echo "$as_me:16922: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16802: \"$ac_try\"") >&5 + { (eval echo "$as_me:16924: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16805: \$? = $ac_status" >&5 + echo "$as_me:16927: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_working_poll=yes else @@ -16814,20 +16936,20 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:16817: result: $cf_cv_working_poll" >&5 +echo "$as_me:16939: result: $cf_cv_working_poll" >&5 echo "${ECHO_T}$cf_cv_working_poll" >&6 test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF #define HAVE_WORKING_POLL 1 EOF -echo "$as_me:16823: checking for va_copy" >&5 +echo "$as_me:16945: checking for va_copy" >&5 echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 if test "${cf_cv_have_va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16830 "configure" +#line 16952 "configure" #include "confdefs.h" #include @@ -16844,16 +16966,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16847: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16969: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16850: \$? = $ac_status" >&5 + echo "$as_me:16972: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16853: \"$ac_try\"") >&5 + { (eval echo "$as_me:16975: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16856: \$? = $ac_status" >&5 + echo "$as_me:16978: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_va_copy=yes else @@ -16863,21 +16985,21 @@ cf_cv_have_va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16866: result: $cf_cv_have_va_copy" >&5 +echo "$as_me:16988: result: $cf_cv_have_va_copy" >&5 echo "${ECHO_T}$cf_cv_have_va_copy" >&6 test "$cf_cv_have_va_copy" = yes && cat >>confdefs.h <<\EOF #define HAVE_VA_COPY 1 EOF -echo "$as_me:16873: checking for __va_copy" >&5 +echo "$as_me:16995: checking for __va_copy" >&5 echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 if test "${cf_cv_have___va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16880 "configure" +#line 17002 "configure" #include "confdefs.h" #include @@ -16894,16 +17016,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16897: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17019: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16900: \$? = $ac_status" >&5 + echo "$as_me:17022: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16903: \"$ac_try\"") >&5 + { (eval echo "$as_me:17025: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16906: \$? = $ac_status" >&5 + echo "$as_me:17028: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have___va_copy=yes else @@ -16913,20 +17035,20 @@ cf_cv_have___va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16916: result: $cf_cv_have___va_copy" >&5 +echo "$as_me:17038: result: $cf_cv_have___va_copy" >&5 echo "${ECHO_T}$cf_cv_have___va_copy" >&6 test "$cf_cv_have___va_copy" = yes && cat >>confdefs.h <<\EOF #define HAVE___VA_COPY 1 EOF -echo "$as_me:16923: checking for pid_t" >&5 +echo "$as_me:17045: checking for pid_t" >&5 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16929 "configure" +#line 17051 "configure" #include "confdefs.h" $ac_includes_default int @@ -16941,16 +17063,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16944: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17066: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16947: \$? = $ac_status" >&5 + echo "$as_me:17069: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16950: \"$ac_try\"") >&5 + { (eval echo "$as_me:17072: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16953: \$? = $ac_status" >&5 + echo "$as_me:17075: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -16960,7 +17082,7 @@ ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16963: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:17085: result: $ac_cv_type_pid_t" >&5 echo "${ECHO_T}$ac_cv_type_pid_t" >&6 if test $ac_cv_type_pid_t = yes; then : @@ -16975,23 +17097,23 @@ fi for ac_header in unistd.h vfork.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:16978: checking for $ac_header" >&5 +echo "$as_me:17100: 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 16984 "configure" +#line 17106 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:16988: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:17110: \"$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:16994: \$? = $ac_status" >&5 + echo "$as_me:17116: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17010,7 +17132,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17013: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:17135: 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:17148: 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 17032 "configure" +#line 17154 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -17060,16 +17182,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17063: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17185: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17066: \$? = $ac_status" >&5 + echo "$as_me:17188: \$? = $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:17191: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17072: \$? = $ac_status" >&5 + echo "$as_me:17194: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -17079,7 +17201,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17082: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:17204: 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:17216: checking for working fork" >&5 echo $ECHO_N "checking for working fork... $ECHO_C" >&6 if test "${ac_cv_func_fork_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17114,15 +17236,15 @@ else } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17117: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17239: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17120: \$? = $ac_status" >&5 + echo "$as_me:17242: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17122: \"$ac_try\"") >&5 + { (eval echo "$as_me:17244: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17125: \$? = $ac_status" >&5 + echo "$as_me:17247: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fork_works=yes else @@ -17134,7 +17256,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:17137: result: $ac_cv_func_fork_works" >&5 +echo "$as_me:17259: result: $ac_cv_func_fork_works" >&5 echo "${ECHO_T}$ac_cv_func_fork_works" >&6 fi @@ -17148,12 +17270,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:17151: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + { echo "$as_me:17273: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;} fi ac_cv_func_vfork_works=$ac_cv_func_vfork if test "x$ac_cv_func_vfork" = xyes; then - echo "$as_me:17156: checking for working vfork" >&5 + echo "$as_me:17278: checking for working vfork" >&5 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6 if test "${ac_cv_func_vfork_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17162,7 +17284,7 @@ else ac_cv_func_vfork_works=cross else cat >conftest.$ac_ext <<_ACEOF -#line 17165 "configure" +#line 17287 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include @@ -17259,15 +17381,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:17262: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17384: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17265: \$? = $ac_status" >&5 + echo "$as_me:17387: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17267: \"$ac_try\"") >&5 + { (eval echo "$as_me:17389: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17270: \$? = $ac_status" >&5 + echo "$as_me:17392: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_vfork_works=yes else @@ -17279,13 +17401,13 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:17282: result: $ac_cv_func_vfork_works" >&5 +echo "$as_me:17404: result: $ac_cv_func_vfork_works" >&5 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6 fi; if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_vfork_works=ac_cv_func_vfork - { echo "$as_me:17288: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + { echo "$as_me:17410: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;} fi @@ -17312,7 +17434,7 @@ fi # special check for test/ditto.c -echo "$as_me:17315: checking for openpty in -lutil" >&5 +echo "$as_me:17437: 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 @@ -17320,7 +17442,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 17323 "configure" +#line 17445 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17339,16 +17461,16 @@ openpty (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17342: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17464: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17345: \$? = $ac_status" >&5 + echo "$as_me:17467: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17348: \"$ac_try\"") >&5 + { (eval echo "$as_me:17470: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17351: \$? = $ac_status" >&5 + echo "$as_me:17473: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -17359,7 +17481,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17362: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:17484: 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 @@ -17367,7 +17489,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:17370: checking for openpty header" >&5 +echo "$as_me:17492: 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 @@ -17378,7 +17500,7 @@ else for cf_header in pty.h libutil.h util.h do cat >conftest.$ac_ext <<_ACEOF -#line 17381 "configure" +#line 17503 "configure" #include "confdefs.h" #include <$cf_header> @@ -17395,16 +17517,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17398: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17520: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17401: \$? = $ac_status" >&5 + echo "$as_me:17523: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17404: \"$ac_try\"") >&5 + { (eval echo "$as_me:17526: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17407: \$? = $ac_status" >&5 + echo "$as_me:17529: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_openpty=$cf_header @@ -17422,7 +17544,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi -echo "$as_me:17425: result: $cf_cv_func_openpty" >&5 +echo "$as_me:17547: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -17474,7 +17596,7 @@ if test -n "$with_hashed_db/include" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 17477 "configure" +#line 17599 "configure" #include "confdefs.h" #include int @@ -17486,16 +17608,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17489: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17611: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17492: \$? = $ac_status" >&5 + echo "$as_me:17614: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17495: \"$ac_try\"") >&5 + { (eval echo "$as_me:17617: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17498: \$? = $ac_status" >&5 + echo "$as_me:17620: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -17512,7 +17634,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}:17515: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:17637: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -17546,7 +17668,7 @@ if test -n "$with_hashed_db/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}:17549: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:17671: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -17557,23 +17679,23 @@ fi fi esac -echo "$as_me:17560: checking for db.h" >&5 +echo "$as_me:17682: checking for db.h" >&5 echo $ECHO_N "checking for db.h... $ECHO_C" >&6 if test "${ac_cv_header_db_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 17566 "configure" +#line 17688 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:17570: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:17692: \"$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:17576: \$? = $ac_status" >&5 + echo "$as_me:17698: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17592,11 +17714,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17595: result: $ac_cv_header_db_h" >&5 +echo "$as_me:17717: result: $ac_cv_header_db_h" >&5 echo "${ECHO_T}$ac_cv_header_db_h" >&6 if test $ac_cv_header_db_h = yes; then -echo "$as_me:17599: checking for version of db" >&5 +echo "$as_me:17721: checking for version of db" >&5 echo $ECHO_N "checking for version of db... $ECHO_C" >&6 if test "${cf_cv_hashed_db_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17607,10 +17729,10 @@ cf_cv_hashed_db_version=unknown for cf_db_version in 1 2 3 4 5 do -echo "${as_me:-configure}:17610: testing checking for db version $cf_db_version ..." 1>&5 +echo "${as_me:-configure}:17732: testing checking for db version $cf_db_version ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 17613 "configure" +#line 17735 "configure" #include "confdefs.h" $ac_includes_default @@ -17640,16 +17762,16 @@ DBT *foo = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17643: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17765: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17646: \$? = $ac_status" >&5 + echo "$as_me:17768: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17649: \"$ac_try\"") >&5 + { (eval echo "$as_me:17771: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17652: \$? = $ac_status" >&5 + echo "$as_me:17774: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_hashed_db_version=$cf_db_version @@ -17663,16 +17785,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:17666: result: $cf_cv_hashed_db_version" >&5 +echo "$as_me:17788: result: $cf_cv_hashed_db_version" >&5 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 if test "$cf_cv_hashed_db_version" = unknown ; then - { { echo "$as_me:17670: error: Cannot determine version of db" >&5 + { { echo "$as_me:17792: error: Cannot determine version of db" >&5 echo "$as_me: error: Cannot determine version of db" >&2;} { (exit 1); exit 1; }; } else -echo "$as_me:17675: checking for db libraries" >&5 +echo "$as_me:17797: checking for db libraries" >&5 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 if test "${cf_cv_hashed_db_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17686,10 +17808,10 @@ do LIBS="-l$cf_db_libs $LIBS" fi -echo "${as_me:-configure}:17689: testing checking for library "$cf_db_libs" ..." 1>&5 +echo "${as_me:-configure}:17811: testing checking for library "$cf_db_libs" ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 17692 "configure" +#line 17814 "configure" #include "confdefs.h" $ac_includes_default @@ -17744,16 +17866,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17747: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17869: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17750: \$? = $ac_status" >&5 + echo "$as_me:17872: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17753: \"$ac_try\"") >&5 + { (eval echo "$as_me:17875: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17756: \$? = $ac_status" >&5 + echo "$as_me:17878: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test -n "$cf_db_libs" ; then @@ -17773,11 +17895,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:17776: result: $cf_cv_hashed_db_libs" >&5 +echo "$as_me:17898: result: $cf_cv_hashed_db_libs" >&5 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 if test "$cf_cv_hashed_db_libs" = unknown ; then - { { echo "$as_me:17780: error: Cannot determine library for db" >&5 + { { echo "$as_me:17902: error: Cannot determine library for db" >&5 echo "$as_me: error: Cannot determine library for db" >&2;} { (exit 1); exit 1; }; } elif test "$cf_cv_hashed_db_libs" != default ; then @@ -17787,7 +17909,7 @@ fi else - { { echo "$as_me:17790: error: Cannot find db.h" >&5 + { { echo "$as_me:17912: error: Cannot find db.h" >&5 echo "$as_me: error: Cannot find db.h" >&2;} { (exit 1); exit 1; }; } @@ -17802,7 +17924,7 @@ fi # Just in case, check if the C compiler has a bool type. -echo "$as_me:17805: checking if we should include stdbool.h" >&5 +echo "$as_me:17927: checking if we should include stdbool.h" >&5 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 if test "${cf_cv_header_stdbool_h+set}" = set; then @@ -17810,7 +17932,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 17813 "configure" +#line 17935 "configure" #include "confdefs.h" int @@ -17822,23 +17944,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17825: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17947: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17828: \$? = $ac_status" >&5 + echo "$as_me:17950: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17831: \"$ac_try\"") >&5 + { (eval echo "$as_me:17953: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17834: \$? = $ac_status" >&5 + echo "$as_me:17956: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=0 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 17841 "configure" +#line 17963 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -17854,16 +17976,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17857: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17979: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17860: \$? = $ac_status" >&5 + echo "$as_me:17982: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17863: \"$ac_try\"") >&5 + { (eval echo "$as_me:17985: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17866: \$? = $ac_status" >&5 + echo "$as_me:17988: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -17877,13 +17999,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:17880: result: yes" >&5 +then echo "$as_me:18002: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:17882: result: no" >&5 +else echo "$as_me:18004: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:17886: checking for builtin bool type" >&5 +echo "$as_me:18008: checking for builtin bool type" >&5 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 if test "${cf_cv_cc_bool_type+set}" = set; then @@ -17891,7 +18013,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 17894 "configure" +#line 18016 "configure" #include "confdefs.h" #include @@ -17906,16 +18028,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17909: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18031: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17912: \$? = $ac_status" >&5 + echo "$as_me:18034: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17915: \"$ac_try\"") >&5 + { (eval echo "$as_me:18037: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17918: \$? = $ac_status" >&5 + echo "$as_me:18040: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cc_bool_type=1 else @@ -17928,9 +18050,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_cc_bool_type" = 1 -then echo "$as_me:17931: result: yes" >&5 +then echo "$as_me:18053: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:17933: result: no" >&5 +else echo "$as_me:18055: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -17952,7 +18074,7 @@ os2*) #(vi cf_stdcpp_libname=stdc++ ;; esac -echo "$as_me:17955: checking for library $cf_stdcpp_libname" >&5 +echo "$as_me:18077: checking for library $cf_stdcpp_libname" >&5 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 if test "${cf_cv_libstdcpp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17961,7 +18083,7 @@ else cf_save="$LIBS" LIBS="-l$cf_stdcpp_libname $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 17964 "configure" +#line 18086 "configure" #include "confdefs.h" #include @@ -17977,16 +18099,16 @@ strstreambuf foo(buf, sizeof(buf)) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17980: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18102: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17983: \$? = $ac_status" >&5 + echo "$as_me:18105: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17986: \"$ac_try\"") >&5 + { (eval echo "$as_me:18108: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17989: \$? = $ac_status" >&5 + echo "$as_me:18111: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_libstdcpp=yes else @@ -17998,12 +18120,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save" fi -echo "$as_me:18001: result: $cf_cv_libstdcpp" >&5 +echo "$as_me:18123: result: $cf_cv_libstdcpp" >&5 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 test "$cf_cv_libstdcpp" = yes && CXXLIBS="-l$cf_stdcpp_libname $CXXLIBS" fi - echo "$as_me:18006: checking whether $CXX understands -c and -o together" >&5 + echo "$as_me:18128: checking whether $CXX understands -c and -o together" >&5 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 if test "${cf_cv_prog_CXX_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18019,15 +18141,15 @@ CF_EOF # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:18022: \"$ac_try\"") >&5 +if { (eval echo "$as_me:18144: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18025: \$? = $ac_status" >&5 + echo "$as_me:18147: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:18027: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:18149: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18030: \$? = $ac_status" >&5 + echo "$as_me:18152: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CXX_c_o=yes @@ -18038,10 +18160,10 @@ rm -rf conftest* fi if test $cf_cv_prog_CXX_c_o = yes; then - echo "$as_me:18041: result: yes" >&5 + echo "$as_me:18163: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:18044: result: no" >&5 + echo "$as_me:18166: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -18061,12 +18183,12 @@ os2*) #(vi ;; esac if test "$GXX" = yes; then - echo "$as_me:18064: checking for lib$cf_gpp_libname" >&5 + echo "$as_me:18186: checking for lib$cf_gpp_libname" >&5 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 cf_save="$LIBS" LIBS="-l$cf_gpp_libname $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18069 "configure" +#line 18191 "configure" #include "confdefs.h" #include <$cf_gpp_libname/builtin.h> @@ -18080,16 +18202,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18083: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18205: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18086: \$? = $ac_status" >&5 + echo "$as_me:18208: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18089: \"$ac_try\"") >&5 + { (eval echo "$as_me:18211: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18092: \$? = $ac_status" >&5 + echo "$as_me:18214: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes CXXLIBS="-l$cf_gpp_libname $CXXLIBS" @@ -18108,7 +18230,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 18111 "configure" +#line 18233 "configure" #include "confdefs.h" #include @@ -18122,16 +18244,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18125: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18247: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18128: \$? = $ac_status" >&5 + echo "$as_me:18250: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18131: \"$ac_try\"") >&5 + { (eval echo "$as_me:18253: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18134: \$? = $ac_status" >&5 + echo "$as_me:18256: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes CXXLIBS="-l$cf_gpp_libname $CXXLIBS" @@ -18148,7 +18270,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save" - echo "$as_me:18151: result: $cf_cxx_library" >&5 + echo "$as_me:18273: result: $cf_cxx_library" >&5 echo "${ECHO_T}$cf_cxx_library" >&6 fi @@ -18164,7 +18286,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return -echo "$as_me:18167: checking how to run the C++ preprocessor" >&5 +echo "$as_me:18289: checking how to run the C++ preprocessor" >&5 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then @@ -18181,18 +18303,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 18184 "configure" +#line 18306 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:18189: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18311: \"$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:18195: \$? = $ac_status" >&5 + echo "$as_me:18317: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18215,17 +18337,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 18218 "configure" +#line 18340 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18222: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18344: \"$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:18228: \$? = $ac_status" >&5 + echo "$as_me:18350: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18262,7 +18384,7 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:18265: result: $CXXCPP" >&5 +echo "$as_me:18387: result: $CXXCPP" >&5 echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -18272,18 +18394,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 18275 "configure" +#line 18397 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:18280: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18402: \"$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:18286: \$? = $ac_status" >&5 + echo "$as_me:18408: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18306,17 +18428,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 18309 "configure" +#line 18431 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18313: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18435: \"$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:18319: \$? = $ac_status" >&5 + echo "$as_me:18441: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18344,7 +18466,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:18347: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + { { echo "$as_me:18469: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -18359,23 +18481,23 @@ ac_main_return=return for ac_header in typeinfo do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18362: checking for $ac_header" >&5 +echo "$as_me:18484: 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 18368 "configure" +#line 18490 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18372: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18494: \"$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:18378: \$? = $ac_status" >&5 + echo "$as_me:18500: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18394,7 +18516,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18397: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:18519: 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:18532: 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 18416 "configure" +#line 18538 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18420: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18542: \"$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:18426: \$? = $ac_status" >&5 + echo "$as_me:18548: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18442,7 +18564,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18445: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:18567: 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:18578: checking if iostream uses std-namespace" >&5 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 18459 "configure" +#line 18581 "configure" #include "confdefs.h" #include @@ -18473,16 +18595,16 @@ cerr << "testing" << endl; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18476: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18598: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18479: \$? = $ac_status" >&5 + echo "$as_me:18601: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18482: \"$ac_try\"") >&5 + { (eval echo "$as_me:18604: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18485: \$? = $ac_status" >&5 + echo "$as_me:18607: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_iostream_namespace=yes else @@ -18491,7 +18613,7 @@ cat conftest.$ac_ext >&5 cf_iostream_namespace=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:18494: result: $cf_iostream_namespace" >&5 + echo "$as_me:18616: result: $cf_iostream_namespace" >&5 echo "${ECHO_T}$cf_iostream_namespace" >&6 if test "$cf_iostream_namespace" = yes ; then cat >>confdefs.h <<\EOF @@ -18501,7 +18623,7 @@ EOF fi fi -echo "$as_me:18504: checking if we should include stdbool.h" >&5 +echo "$as_me:18626: checking if we should include stdbool.h" >&5 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 if test "${cf_cv_header_stdbool_h+set}" = set; then @@ -18509,7 +18631,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 18512 "configure" +#line 18634 "configure" #include "confdefs.h" int @@ -18521,23 +18643,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18524: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18646: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18527: \$? = $ac_status" >&5 + echo "$as_me:18649: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18530: \"$ac_try\"") >&5 + { (eval echo "$as_me:18652: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18533: \$? = $ac_status" >&5 + echo "$as_me:18655: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=0 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 18540 "configure" +#line 18662 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -18553,16 +18675,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18556: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18678: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18559: \$? = $ac_status" >&5 + echo "$as_me:18681: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18562: \"$ac_try\"") >&5 + { (eval echo "$as_me:18684: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18565: \$? = $ac_status" >&5 + echo "$as_me:18687: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -18576,13 +18698,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:18579: result: yes" >&5 +then echo "$as_me:18701: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:18581: result: no" >&5 +else echo "$as_me:18703: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:18585: checking for builtin bool type" >&5 +echo "$as_me:18707: checking for builtin bool type" >&5 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 if test "${cf_cv_builtin_bool+set}" = set; then @@ -18590,7 +18712,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 18593 "configure" +#line 18715 "configure" #include "confdefs.h" #include @@ -18605,16 +18727,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18608: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18730: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18611: \$? = $ac_status" >&5 + echo "$as_me:18733: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18614: \"$ac_try\"") >&5 + { (eval echo "$as_me:18736: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18617: \$? = $ac_status" >&5 + echo "$as_me:18739: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_builtin_bool=1 else @@ -18627,13 +18749,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_builtin_bool" = 1 -then echo "$as_me:18630: result: yes" >&5 +then echo "$as_me:18752: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:18632: result: no" >&5 +else echo "$as_me:18754: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:18636: checking for size of bool" >&5 +echo "$as_me:18758: checking for size of bool" >&5 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 if test "${cf_cv_type_of_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18644,7 +18766,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 18647 "configure" +#line 18769 "configure" #include "confdefs.h" #include @@ -18686,15 +18808,15 @@ main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18689: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18811: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18692: \$? = $ac_status" >&5 + echo "$as_me:18814: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18694: \"$ac_try\"") >&5 + { (eval echo "$as_me:18816: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18697: \$? = $ac_status" >&5 + echo "$as_me:18819: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_of_bool=`cat cf_test.out` if test -z "$cf_cv_type_of_bool"; then @@ -18712,18 +18834,18 @@ fi fi rm -f cf_test.out -echo "$as_me:18715: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:18837: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 if test "$cf_cv_type_of_bool" = unknown ; then case .$NCURSES_BOOL in #(vi .auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:18721: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:18843: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} cf_cv_type_of_bool=$NCURSES_BOOL fi -echo "$as_me:18726: checking for special defines needed for etip.h" >&5 +echo "$as_me:18848: checking for special defines needed for etip.h" >&5 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 cf_save_CXXFLAGS="$CXXFLAGS" cf_result="none" @@ -18741,7 +18863,7 @@ do test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" cat >conftest.$ac_ext <<_ACEOF -#line 18744 "configure" +#line 18866 "configure" #include "confdefs.h" #include @@ -18755,16 +18877,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18758: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18880: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18761: \$? = $ac_status" >&5 + echo "$as_me:18883: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18764: \"$ac_try\"") >&5 + { (eval echo "$as_me:18886: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18767: \$? = $ac_status" >&5 + echo "$as_me:18889: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$cf_math" && cat >>confdefs.h <&5 +echo "$as_me:18910: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 CXXFLAGS="$cf_save_CXXFLAGS" if test -n "$CXX"; then -echo "$as_me:18793: checking if $CXX accepts parameter initialization" >&5 +echo "$as_me:18915: checking if $CXX accepts parameter initialization" >&5 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 if test "${cf_cv_cpp_param_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18807,7 +18929,7 @@ ac_main_return=return cf_cv_cpp_param_init=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 18810 "configure" +#line 18932 "configure" #include "confdefs.h" class TEST { @@ -18826,15 +18948,15 @@ int main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18829: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18951: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18832: \$? = $ac_status" >&5 + echo "$as_me:18954: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18834: \"$ac_try\"") >&5 + { (eval echo "$as_me:18956: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18837: \$? = $ac_status" >&5 + echo "$as_me:18959: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_param_init=yes else @@ -18853,7 +18975,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:18856: result: $cf_cv_cpp_param_init" >&5 +echo "$as_me:18978: result: $cf_cv_cpp_param_init" >&5 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 fi test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF @@ -18862,7 +18984,7 @@ EOF if test -n "$CXX"; then -echo "$as_me:18865: checking if $CXX accepts static_cast" >&5 +echo "$as_me:18987: checking if $CXX accepts static_cast" >&5 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 if test "${cf_cv_cpp_static_cast+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18876,7 +18998,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat >conftest.$ac_ext <<_ACEOF -#line 18879 "configure" +#line 19001 "configure" #include "confdefs.h" class NCursesPanel @@ -18920,16 +19042,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18923: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19045: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18926: \$? = $ac_status" >&5 + echo "$as_me:19048: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18929: \"$ac_try\"") >&5 + { (eval echo "$as_me:19051: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18932: \$? = $ac_status" >&5 + echo "$as_me:19054: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_static_cast=yes else @@ -18947,7 +19069,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:18950: result: $cf_cv_cpp_static_cast" >&5 +echo "$as_me:19072: result: $cf_cv_cpp_static_cast" >&5 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 fi @@ -18995,7 +19117,7 @@ else else if test "$cf_cv_header_stdbool_h" = 1 ; then -echo "$as_me:18998: checking for size of bool" >&5 +echo "$as_me:19120: checking for size of bool" >&5 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 if test "${cf_cv_type_of_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19006,7 +19128,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 19009 "configure" +#line 19131 "configure" #include "confdefs.h" #include @@ -19048,15 +19170,15 @@ main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:19051: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19173: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19054: \$? = $ac_status" >&5 + echo "$as_me:19176: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19056: \"$ac_try\"") >&5 + { (eval echo "$as_me:19178: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19059: \$? = $ac_status" >&5 + echo "$as_me:19181: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_of_bool=`cat cf_test.out` if test -z "$cf_cv_type_of_bool"; then @@ -19074,25 +19196,25 @@ fi fi rm -f cf_test.out -echo "$as_me:19077: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:19199: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 if test "$cf_cv_type_of_bool" = unknown ; then case .$NCURSES_BOOL in #(vi .auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:19083: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:19205: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} cf_cv_type_of_bool=$NCURSES_BOOL fi else - echo "$as_me:19089: checking for fallback type of bool" >&5 + echo "$as_me:19211: checking for fallback type of bool" >&5 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 case "$host_cpu" in #(vi i?86) cf_cv_type_of_bool=char ;; #(vi *) cf_cv_type_of_bool=int ;; esac - echo "$as_me:19095: result: $cf_cv_type_of_bool" >&5 + echo "$as_me:19217: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 fi fi @@ -19121,7 +19243,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then if test "$cf_with_ada" != "no" ; then if test "$with_libtool" != "no"; then - { echo "$as_me:19124: WARNING: libtool does not support Ada - disabling feature" >&5 + { echo "$as_me:19246: WARNING: libtool does not support Ada - disabling feature" >&5 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} cf_with_ada=no fi @@ -19132,7 +19254,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} cf_ada_make=gnatmake # Extract the first word of "$cf_ada_make", so it can be a program name with args. set dummy $cf_ada_make; ac_word=$2 -echo "$as_me:19135: checking for $ac_word" >&5 +echo "$as_me:19257: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_gnat_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19147,7 +19269,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_gnat_exists="yes" -echo "$as_me:19150: found $ac_dir/$ac_word" >&5 +echo "$as_me:19272: found $ac_dir/$ac_word" >&5 break done @@ -19156,10 +19278,10 @@ fi fi gnat_exists=$ac_cv_prog_gnat_exists if test -n "$gnat_exists"; then - echo "$as_me:19159: result: $gnat_exists" >&5 + echo "$as_me:19281: result: $gnat_exists" >&5 echo "${ECHO_T}$gnat_exists" >&6 else - echo "$as_me:19162: result: no" >&5 + echo "$as_me:19284: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -19168,12 +19290,12 @@ if test "$ac_cv_prog_gnat_exists" = no; then cf_cv_prog_gnat_correct=no else -echo "$as_me:19171: checking for gnat version" >&5 +echo "$as_me:19293: checking for gnat version" >&5 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ grep '[0-9].[0-9][0-9]*' |\ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` -echo "$as_me:19176: result: $cf_gnat_version" >&5 +echo "$as_me:19298: result: $cf_gnat_version" >&5 echo "${ECHO_T}$cf_gnat_version" >&6 case $cf_gnat_version in #(vi @@ -19181,7 +19303,7 @@ case $cf_gnat_version in #(vi cf_cv_prog_gnat_correct=yes ;; *) - { echo "$as_me:19184: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:19306: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} cf_cv_prog_gnat_correct=no ;; @@ -19189,7 +19311,7 @@ esac # Extract the first word of "m4", so it can be a program name with args. set dummy m4; ac_word=$2 -echo "$as_me:19192: checking for $ac_word" >&5 +echo "$as_me:19314: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_M4_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19204,7 +19326,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_M4_exists="yes" -echo "$as_me:19207: found $ac_dir/$ac_word" >&5 +echo "$as_me:19329: found $ac_dir/$ac_word" >&5 break done @@ -19213,10 +19335,10 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:19216: result: $M4_exists" >&5 + echo "$as_me:19338: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:19219: result: no" >&5 + echo "$as_me:19341: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -19225,7 +19347,7 @@ fi echo Ada95 binding required program m4 not found. Ada95 binding disabled. fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:19228: checking if GNAT works" >&5 + echo "$as_me:19350: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf conftest* *~conftest* @@ -19253,7 +19375,7 @@ else fi rm -rf conftest* *~conftest* - echo "$as_me:19256: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:19378: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi fi @@ -19278,7 +19400,7 @@ fi ;; esac -echo "$as_me:19281: checking if GNAT supports generics" >&5 +echo "$as_me:19403: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case $cf_gnat_version in #(vi 3.[1-9]*|[4-9].*) #(vi @@ -19288,7 +19410,7 @@ case $cf_gnat_version in #(vi cf_gnat_generics=no ;; esac -echo "$as_me:19291: result: $cf_gnat_generics" >&5 +echo "$as_me:19413: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -19300,7 +19422,7 @@ else cf_generic_objects= fi -echo "$as_me:19303: checking if GNAT supports SIGINT" >&5 +echo "$as_me:19425: checking if GNAT supports SIGINT" >&5 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 if test "${cf_cv_gnat_sigint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19348,7 +19470,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:19351: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:19473: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test $cf_cv_gnat_sigint = yes ; then @@ -19357,7 +19479,7 @@ else USE_GNAT_SIGINT="#" fi -echo "$as_me:19360: checking if GNAT pragma Unreferenced works" >&5 +echo "$as_me:19482: checking if GNAT pragma Unreferenced works" >&5 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 if test "${cf_cv_pragma_unreferenced+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19388,7 +19510,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:19391: result: $cf_cv_pragma_unreferenced" >&5 +echo "$as_me:19513: result: $cf_cv_pragma_unreferenced" >&5 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6 # if the pragma is supported, use it (needed in the Trace code). @@ -19401,7 +19523,7 @@ fi cf_gnat_libraries=no cf_gnat_projects=no -echo "$as_me:19404: checking if GNAT supports project files" >&5 +echo "$as_me:19526: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case $cf_gnat_version in #(vi 3.[0-9]*) #(vi @@ -19469,14 +19591,14 @@ CF_EOF esac ;; esac -echo "$as_me:19472: result: $cf_gnat_projects" >&5 +echo "$as_me:19594: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 if test $cf_gnat_projects = yes then - echo "$as_me:19477: checking if GNAT supports libraries" >&5 + echo "$as_me:19599: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:19479: result: $cf_gnat_libraries" >&5 + echo "$as_me:19601: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -19496,7 +19618,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:19499: checking for ada-compiler" >&5 +echo "$as_me:19621: checking for ada-compiler" >&5 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 # Check whether --with-ada-compiler or --without-ada-compiler was given. @@ -19507,12 +19629,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:19510: result: $cf_ada_compiler" >&5 +echo "$as_me:19632: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:19515: checking for ada-include" >&5 +echo "$as_me:19637: checking for ada-include" >&5 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 # Check whether --with-ada-include or --without-ada-include was given. @@ -19548,7 +19670,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:19551: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:19673: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -19557,10 +19679,10 @@ esac fi ADA_INCLUDE="$withval" -echo "$as_me:19560: result: $ADA_INCLUDE" >&5 +echo "$as_me:19682: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:19563: checking for ada-objects" >&5 +echo "$as_me:19685: checking for ada-objects" >&5 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 # Check whether --with-ada-objects or --without-ada-objects was given. @@ -19596,7 +19718,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:19599: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:19721: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -19605,10 +19727,10 @@ esac fi ADA_OBJECTS="$withval" -echo "$as_me:19608: result: $ADA_OBJECTS" >&5 +echo "$as_me:19730: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:19611: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:19733: checking if an Ada95 shared-library should be built" >&5 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. @@ -19618,7 +19740,7 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:19621: result: $with_ada_sharedlib" >&5 +echo "$as_me:19743: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 ADA_SHAREDLIB='lib$(LIB_NAME).so.1' @@ -19649,7 +19771,7 @@ fi ### chooses to split module lists into libraries. ### ### (see CF_LIB_RULES). -echo "$as_me:19652: checking for library subsets" >&5 +echo "$as_me:19774: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -19690,7 +19812,7 @@ fi test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" -echo "$as_me:19693: result: $LIB_SUBSETS" >&5 +echo "$as_me:19815: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -19728,7 +19850,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:19731: checking default library suffix" >&5 +echo "$as_me:19853: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -19739,10 +19861,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 shared) DFT_ARG_SUFFIX='' ;; esac test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" -echo "$as_me:19742: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:19864: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:19745: checking default library-dependency suffix" >&5 +echo "$as_me:19867: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in #(vi @@ -19768,7 +19890,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_LIB_SUFFIX='.a' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; - cygwin*) #(vi + cygwin*|mingw*) #(vi DFT_LIB_SUFFIX='.dll' DFT_DEP_SUFFIX='.dll.a' ;; @@ -19795,10 +19917,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 esac test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" -echo "$as_me:19798: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:19920: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:19801: checking default object directory" >&5 +echo "$as_me:19923: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -19814,12 +19936,12 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:19817: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:19939: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 # libtool thinks it can make c++ shared libraries (perhaps only g++) if test "$cf_with_cxx" = yes ; then -echo "$as_me:19822: checking c++ library-dependency suffix" >&5 +echo "$as_me:19944: checking c++ library-dependency suffix" >&5 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 if test "$with_libtool" != "no"; then CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX @@ -19848,7 +19970,7 @@ else CXX_LIB_SUFFIX='.a' CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; - cygwin*) #(vi + cygwin*|mingw*) #(vi CXX_LIB_SUFFIX='.dll' CXX_DEP_SUFFIX='.dll.a' ;; @@ -19876,7 +19998,7 @@ else test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}" test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}" fi -echo "$as_me:19879: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:20001: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -20041,19 +20163,19 @@ fi if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" then - echo "$as_me:20044: checking if linker supports switching between static/dynamic" >&5 + echo "$as_me:20166: checking if linker supports switching between static/dynamic" >&5 echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 rm -f libconftest.a cat >conftest.$ac_ext < int cf_ldflags_static(FILE *fp) { return fflush(fp); } EOF - if { (eval echo "$as_me:20053: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:20175: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20056: \$? = $ac_status" >&5 + echo "$as_me:20178: \$? = $ac_status" >&5 (exit $ac_status); } ; then ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null @@ -20064,10 +20186,10 @@ EOF LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 20067 "configure" +#line 20189 "configure" #include "confdefs.h" -#line 20070 "configure" +#line 20192 "configure" #include int cf_ldflags_static(FILE *fp); @@ -20082,16 +20204,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20085: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20207: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20088: \$? = $ac_status" >&5 + echo "$as_me:20210: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20091: \"$ac_try\"") >&5 + { (eval echo "$as_me:20213: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20094: \$? = $ac_status" >&5 + echo "$as_me:20216: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # some linkers simply ignore the -dynamic @@ -20114,7 +20236,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f libconftest.* LIBS="$cf_save_LIBS" - echo "$as_me:20117: result: $cf_ldflags_static" >&5 + echo "$as_me:20239: result: $cf_ldflags_static" >&5 echo "${ECHO_T}$cf_ldflags_static" >&6 if test $cf_ldflags_static != yes @@ -20130,12 +20252,12 @@ fi ;; esac -echo "$as_me:20133: checking where we will install curses.h" >&5 +echo "$as_me:20255: checking where we will install curses.h" >&5 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 test "$with_overwrite" = no && \ test "x$includedir" = 'x${prefix}/include' && \ includedir='${prefix}/include/ncurses'${LIB_SUFFIX} -echo "$as_me:20138: result: $includedir" >&5 +echo "$as_me:20260: result: $includedir" >&5 echo "${ECHO_T}$includedir" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -20143,7 +20265,7 @@ echo "${ECHO_T}$includedir" >&6 if test "$with_overwrite" != no ; then if test "$NCURSES_LIBUTF8" = 1 ; then NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' - { echo "$as_me:20146: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:20268: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} fi fi @@ -20160,7 +20282,7 @@ EOF ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:20163: checking for src modules" >&5 +echo "$as_me:20285: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -20225,7 +20347,7 @@ EOF fi fi done -echo "$as_me:20228: result: $cf_cv_src_modules" >&5 +echo "$as_me:20350: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -20437,7 +20559,7 @@ fi # Extract the first word of "tic", so it can be a program name with args. set dummy tic; ac_word=$2 -echo "$as_me:20440: checking for $ac_word" >&5 +echo "$as_me:20562: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TIC_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20454,7 +20576,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TIC_PATH="$ac_dir/$ac_word" - echo "$as_me:20457: found $ac_dir/$ac_word" >&5 + echo "$as_me:20579: found $ac_dir/$ac_word" >&5 break fi done @@ -20466,10 +20588,10 @@ fi TIC_PATH=$ac_cv_path_TIC_PATH if test -n "$TIC_PATH"; then - echo "$as_me:20469: result: $TIC_PATH" >&5 + echo "$as_me:20591: result: $TIC_PATH" >&5 echo "${ECHO_T}$TIC_PATH" >&6 else - echo "$as_me:20472: result: no" >&5 + echo "$as_me:20594: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20477,7 +20599,7 @@ if test -n "$FALLBACK_LIST" then if test "$TIC_PATH" = unknown then - { echo "$as_me:20480: WARNING: no tic program found for fallbacks" >&5 + { echo "$as_me:20602: WARNING: no tic program found for fallbacks" >&5 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} fi fi @@ -20573,7 +20695,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:20576: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:20698: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -20749,7 +20871,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:20752: error: ambiguous option: $1 + { { echo "$as_me:20874: 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;} @@ -20768,7 +20890,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:20771: error: unrecognized option: $1 + -*) { { echo "$as_me:20893: 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;} @@ -20877,7 +20999,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; - *) { { echo "$as_me:20880: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:21002: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -21293,7 +21415,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:21296: creating $ac_file" >&5 + { echo "$as_me:21418: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -21311,7 +21433,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:21314: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:21436: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -21324,7 +21446,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:21327: error: cannot find input file: $f" >&5 + { { echo "$as_me:21449: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -21390,7 +21512,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:21393: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:21515: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -21401,7 +21523,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:21404: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:21526: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -21414,7 +21536,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:21417: error: cannot find input file: $f" >&5 + { { echo "$as_me:21539: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -21472,7 +21594,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:21475: $ac_file is unchanged" >&5 + { echo "$as_me:21597: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -21538,10 +21660,12 @@ fi cf_prefix=$LIB_PREFIX -if test $cf_cv_shlib_version = cygdll ; then +case $cf_cv_shlib_version in #(vi +cygdll|mingw) TINFO_NAME=$TINFO_ARG_SUFFIX TINFO_SUFFIX=.dll -fi + ;; +esac if test -n "$TINFO_SUFFIX" ; then case $TINFO_SUFFIX in @@ -21594,7 +21718,7 @@ do cf_suffix='.a' cf_depsuf=$cf_suffix ;; - cygwin*) #(vi + cygwin*|mingw*) #(vi cf_suffix='.dll' cf_depsuf='.dll.a' ;; @@ -21678,11 +21802,18 @@ do # cygwin needs import library, and has unique naming convention # use autodetected ${cf_prefix} for import lib and static lib, but # use 'cyg' prefix for shared lib. - if test $cf_cv_shlib_version = cygdll ; then + case $cf_cv_shlib_version in #(vi + cygdll) #(vi cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}${cf_cygsuf}" continue - fi + ;; + mingw) + cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` + LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/lib${cf_dir}${cf_cygsuf}" + continue + ;; + esac fi LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/${cf_prefix}${cf_dir}${cf_suffix}" done @@ -21761,7 +21892,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ cf_suffix='.a' cf_depsuf=$cf_suffix ;; - cygwin*) #(vi + cygwin*|mingw*) #(vi cf_suffix='.dll' cf_depsuf='.dll.a' ;; diff --git a/configure.in b/configure.in index 53515f95..7e167fa5 100644 --- a/configure.in +++ b/configure.in @@ -28,14 +28,14 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.543 2012/02/18 21:31:19 tom Exp $ +dnl $Id: configure.in,v 1.545 2012/02/25 11:32:40 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl See http://invisible-island.net/autoconf/ for additional information. dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.13.20020210) -AC_REVISION($Revision: 1.543 $) +AC_REVISION($Revision: 1.545 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -1245,6 +1245,7 @@ if test "x$with_warnings" = "xyes"; then fi fi CF_GCC_ATTRIBUTES +CF_ENABLE_STRING_HACKS ### use option --enable-assertions to turn on generation of assertion code AC_MSG_CHECKING(if you want to enable runtime assertions) diff --git a/dist.mk b/dist.mk index b66ac60f..ff381e1c 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.858 2012/02/18 15:30:39 tom Exp $ +# $Id: dist.mk,v 1.860 2012/02/25 11:31:29 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 5 NCURSES_MINOR = 9 -NCURSES_PATCH = 20120218 +NCURSES_PATCH = 20120225 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/form/fty_int.c b/form/fty_int.c index e643ad97..1e43874e 100644 --- a/form/fty_int.c +++ b/form/fty_int.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * + * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -34,7 +34,7 @@ #include "form.priv.h" -MODULE_ID("$Id: fty_int.c,v 1.25 2010/01/23 21:14:36 tom Exp $") +MODULE_ID("$Id: fty_int.c,v 1.26 2012/02/23 10:02:15 tom Exp $") #if USE_WIDEC_SUPPORT #define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c))) @@ -233,7 +233,8 @@ Check_This_Field(FIELD *field, const void *argp) } if (result) { - sprintf(buf, "%.*ld", (prec > 0 ? prec : 0), val); + _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) + "%.*ld", (prec > 0 ? prec : 0), val); set_field_buffer(field, 0, buf); } } diff --git a/form/fty_num.c b/form/fty_num.c index 4bd71321..8cce43f8 100644 --- a/form/fty_num.c +++ b/form/fty_num.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * + * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -34,7 +34,7 @@ #include "form.priv.h" -MODULE_ID("$Id: fty_num.c,v 1.28 2010/01/23 21:14:36 tom Exp $") +MODULE_ID("$Id: fty_num.c,v 1.29 2012/02/23 10:02:15 tom Exp $") #if HAVE_LOCALE_H #include @@ -271,7 +271,8 @@ Check_This_Field(FIELD *field, const void *argp) } if (result) { - sprintf(buf, "%.*f", (prec > 0 ? prec : 0), val); + _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) + "%.*f", (prec > 0 ? prec : 0), val); set_field_buffer(field, 0, buf); } } diff --git a/include/nc_string.h b/include/nc_string.h new file mode 100644 index 00000000..c087a82f --- /dev/null +++ b/include/nc_string.h @@ -0,0 +1,77 @@ +/**************************************************************************** + * Copyright (c) 2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * + * "Software"), to deal in the Software without restriction, including * + * without limitation the rights to use, copy, modify, merge, publish, * + * distribute, distribute with modifications, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included * + * in all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * * + * Except as contained in this notice, the name(s) of the above copyright * + * holders shall not be used in advertising or otherwise to promote the * + * sale, use or other dealings in this Software without prior written * + * authorization. * + ****************************************************************************/ + +/**************************************************************************** + * Author: Thomas E. Dickey 2012 * + ****************************************************************************/ + +#ifndef STRING_HACKS_H +#define STRING_HACKS_H 1 + +#include + +/* + * $Id: nc_string.h,v 1.3 2012/02/23 10:21:17 tom Exp $ + * + * String-hacks. Use these macros to stifle warnings on (presumably) correct + * uses of strcat, strcpy and sprintf. + * + * By the way - + * A fundamental limitation of the interfaces (and frequent issue in bug + * reports using these functions) is that sizes are passed as unsigned values + * (with associated sign-extension problems), limiting their effectiveness + * when checking for buffer overflow. + */ + +#ifdef __cplusplus +#define NCURSES_VOID /* nothing */ +#else +#define NCURSES_VOID (void) +#endif + +#if USE_STRING_HACKS && HAVE_STRLCAT +#define _nc_STRCAT(d,s,n) NCURSES_VOID strlcat((d),(s),(n)) +#else +#define _nc_STRCAT(d,s,n) NCURSES_VOID strcat((d),(s)) +#endif + +#if USE_STRING_HACKS && HAVE_STRLCPY +#define _nc_STRCPY(d,s,n) NCURSES_VOID strlcpy((d),(s),(n)) +#else +#define _nc_STRCPY(d,s,n) NCURSES_VOID strcpy((d),(s)) +#endif + +#if USE_STRING_HACKS && HAVE_SNPRINTF +#define _nc_SPRINTF NCURSES_VOID snprintf +#define _nc_SLIMIT(n) (n), +#else +#define _nc_SPRINTF NCURSES_VOID sprintf +#define _nc_SLIMIT(n) /* nothing */ +#endif + +#endif /* STRING_HACKS_H */ diff --git a/include/ncurses_defs b/include/ncurses_defs index 957ee3e9..79ae4b06 100644 --- a/include/ncurses_defs +++ b/include/ncurses_defs @@ -1,6 +1,6 @@ -# $Id: ncurses_defs,v 1.52 2011/12/17 18:14:30 tom Exp $ +# $Id: ncurses_defs,v 1.53 2012/02/19 21:02:32 tom Exp $ ############################################################################## -# Copyright (c) 2000-2010,2011 Free Software Foundation, Inc. # +# Copyright (c) 2000-2011,2012 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -125,8 +125,11 @@ HAVE_SIGVEC HAVE_SIZECHANGE HAVE_SLK_COLOR HAVE_SLK_INIT 1 +HAVE_SNPRINTF HAVE_STDINT_H HAVE_STRDUP +HAVE_STRLCAT +HAVE_STRLCPY HAVE_STRSTR HAVE_SYMLINK HAVE_SYS_BSDTYPES_H @@ -212,6 +215,7 @@ USE_REENTRANT USE_SAFE_SPRINTF USE_SCROLL_HINTS USE_SIGWINCH +USE_STRING_HACKS USE_SYMLINKS USE_SYSMOUSE USE_TERMCAP diff --git a/menu/m_item_new.c b/menu/m_item_new.c index 1debc2b3..f218d3ef 100644 --- a/menu/m_item_new.c +++ b/menu/m_item_new.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * + * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -44,7 +44,7 @@ #endif #endif -MODULE_ID("$Id: m_item_new.c,v 1.30 2010/01/23 21:20:11 tom Exp $") +MODULE_ID("$Id: m_item_new.c,v 1.31 2012/02/23 10:02:15 tom Exp $") /*--------------------------------------------------------------------------- | Facility : libnmenu @@ -222,7 +222,6 @@ set_menu_mark(MENU * menu, const char *mark) menu->mark = strdup(mark); if (menu->mark) { - strcpy(menu->mark, mark); if (menu != &_nc_Default_Menu) menu->status |= _MARK_ALLOCATED; } diff --git a/mk-1st.awk b/mk-1st.awk index e48584c8..b2203c39 100644 --- a/mk-1st.awk +++ b/mk-1st.awk @@ -1,6 +1,6 @@ -# $Id: mk-1st.awk,v 1.87 2011/12/17 20:27:27 tom Exp $ +# $Id: mk-1st.awk,v 1.88 2012/02/25 20:22:09 tom Exp $ ############################################################################## -# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. # +# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -70,7 +70,7 @@ function lib_name_of(a_name) { } # see imp_name function imp_name_of(a_name) { - if (ShlibVerInfix == "cygdll") { + if (ShlibVerInfix == "cygdll" || ShlibVerInfix == "mingw") { result = sprintf("%s%s%s.a", prefix, a_name, suffix); } else { result = ""; @@ -81,6 +81,8 @@ function imp_name_of(a_name) { function abi_name_of(a_name) { if (ShlibVerInfix == "cygdll") { result = sprintf("%s%s$(ABI_VERSION)%s", "cyg", a_name, suffix); + } else if (ShlibVerInfix == "mingw") { + result = sprintf("%s%s$(ABI_VERSION)%s", prefix, a_name, suffix); } else if (ShlibVerInfix == "yes") { result = sprintf("%s%s.$(ABI_VERSION)%s", prefix, a_name, suffix); } else { @@ -92,6 +94,8 @@ function abi_name_of(a_name) { function rel_name_of(a_name) { if (ShlibVerInfix == "cygdll") { result = sprintf("%s%s$(REL_VERSION)%s", "cyg", a_name, suffix); + } else if (ShlibVerInfix == "mingw") { + result = sprintf("%s%s$(REL_VERSION)%s", prefix, a_name, suffix); } else if (ShlibVerInfix == "yes") { result = sprintf("%s%s.$(REL_VERSION)%s", prefix, a_name, suffix); } else { @@ -108,7 +112,7 @@ function end_name_of(a_name) { } else { if ( ShlibVer == "rel" ) { result = rel_name_of(a_name); - } else if ( ShlibVer == "abi" || ShlibVer == "cygdll" ) { + } else if ( ShlibVer == "abi" || ShlibVer == "cygdll" || ShlibVer == "mingw" ) { result = abi_name_of(a_name); } else { result = lib_name_of(a_name); @@ -149,7 +153,7 @@ function make_shlib(objs, shlib_list) { printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(%s) $(LDFLAGS)\n", objs, shlib_list } function sharedlinks(directory) { - if ( ShlibVer != "auto" && ShlibVer != "cygdll" ) { + if ( ShlibVer != "auto" && ShlibVer != "cygdll" && ShlibVer != "mingw" ) { printf "\tcd %s && (", directory if ( DoLinks == "reverse" ) { if ( ShlibVer == "rel" ) { @@ -323,7 +327,7 @@ END { print "install \\" print "install.libs \\" - if ( ShlibVer == "cygdll" ) { + if ( ShlibVer == "cygdll" || ShlibVer == "mingw") { dst_dirs = "$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)"; printf "install.%s :: %s $(LIBRARIES)\n", name, dst_dirs @@ -344,7 +348,7 @@ END { if ( overwrite == "yes" && name == "ncurses" ) { - if ( ShlibVer == "cygdll" ) { + if ( ShlibVer == "cygdll" || ShlibVer == "mingw") { ovr_name = sprintf("libcurses%s.a", suffix) printf "\t@echo linking %s to %s\n", imp_name, ovr_name printf "\tcd $(DESTDIR)$(libdir) && (" @@ -365,7 +369,7 @@ END { print "uninstall \\" print "uninstall.libs \\" printf "uninstall.%s ::\n", name - if ( ShlibVer == "cygdll" ) { + if ( ShlibVer == "cygdll" || ShlibVer == "mingw") { printf "\t@echo uninstalling $(DESTDIR)$(bindir)/%s\n", end_name printf "\t-@rm -f $(DESTDIR)$(bindir)/%s\n", end_name @@ -378,11 +382,7 @@ END { removelinks("$(DESTDIR)$(libdir)") if ( overwrite == "yes" && name == "ncurses" ) { - if ( ShlibVer == "cygdll" ) { - ovr_name = sprintf("libcurses%s.a", suffix) - } else { - ovr_name = sprintf("libcurses%s", suffix) - } + ovr_name = sprintf("libcurses%s", suffix) printf "\t-@rm -f $(DESTDIR)$(libdir)/%s\n", ovr_name } } diff --git a/ncurses/base/MKkeyname.awk b/ncurses/base/MKkeyname.awk index bb2599ac..40eee275 100644 --- a/ncurses/base/MKkeyname.awk +++ b/ncurses/base/MKkeyname.awk @@ -1,6 +1,6 @@ -# $Id: MKkeyname.awk,v 1.45 2010/12/19 01:36:14 tom Exp $ +# $Id: MKkeyname.awk,v 1.47 2012/02/22 22:35:41 tom Exp $ ############################################################################## -# Copyright (c) 1999-2009,2010 Free Software Foundation, Inc. # +# Copyright (c) 1999-2010,2012 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -100,17 +100,18 @@ END { print " if (MyTable[c] == 0) {" print " int cc = c;" print " p = name;" + print "#define P_LIMIT (sizeof(name) - (size_t) (p - name))" print " if (cc >= 128 && (sp == 0 || sp->_use_meta)) {" - print " strcpy(p, \"M-\");" + print " _nc_STRCPY(p, \"M-\", P_LIMIT);" print " p += 2;" print " cc -= 128;" print " }" print " if (cc < 32)" - print " sprintf(p, \"^%c\", cc + '@');" + print " _nc_SPRINTF(p, _nc_SLIMIT(P_LIMIT) \"^%c\", cc + '@');" print " else if (cc == 127)" - print " strcpy(p, \"^?\");" + print " _nc_STRCPY(p, \"^?\", P_LIMIT);" print " else" - print " sprintf(p, \"%c\", cc);" + print " _nc_SPRINTF(p, _nc_SLIMIT(P_LIMIT) \"%c\", cc);" print " MyTable[c] = strdup(name);" print " }" print " result = MyTable[c];" diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c index 0b5dd9e7..840d341b 100644 --- a/ncurses/base/lib_mouse.c +++ b/ncurses/base/lib_mouse.c @@ -84,7 +84,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_mouse.c,v 1.134 2012/01/21 19:21:29 KO.Myung-Hun Exp $") +MODULE_ID("$Id: lib_mouse.c,v 1.136 2012/02/22 22:40:24 tom Exp $") #include @@ -263,7 +263,8 @@ mouse_server(unsigned long param) /* sit and wait on the event queue */ rc = MouReadEventQue(&mouev, &fWait, hmou); if (rc) { - sprintf(err, "Error reading mouse queue, rc=%lu.\r\n", rc); + _nc_SPRINTF(err, _nc_SLIMIT(sizeof(err)) + "Error reading mouse queue, rc=%lu.\r\n", rc); break; } if (!sp->_emxmouse_activated) @@ -289,9 +290,11 @@ mouse_server(unsigned long param) finish: oldstate = mouev.fs; } - } else - sprintf(err, "Error setting event mask, buttons=%d, rc=%lu.\r\n", - nbuttons, rc); + } else { + _nc_SPRINTF(err, _nc_SLIMIT(sizeof(err)) + "Error setting event mask, buttons=%d, rc=%lu.\r\n", + nbuttons, rc); + } DosWrite(2, err, strlen(err), &rc); MouClose(hmou); diff --git a/ncurses/base/safe_sprintf.c b/ncurses/base/safe_sprintf.c index e73307ba..9cea066c 100644 --- a/ncurses/base/safe_sprintf.c +++ b/ncurses/base/safe_sprintf.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * + * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -33,7 +33,7 @@ #include #include -MODULE_ID("$Id: safe_sprintf.c,v 1.24 2010/06/05 22:22:27 tom Exp $") +MODULE_ID("$Id: safe_sprintf.c,v 1.26 2012/02/22 22:40:24 tom Exp $") #if USE_SAFE_SPRINTF @@ -109,12 +109,15 @@ _nc_printf_length(const char *fmt, va_list ap) } else if (state == Prec) { prec = ival; } - sprintf(fmt_arg, "%d", ival); + _nc_SPRINTF(fmt_arg, + _nc_SLIMIT(sizeof(fmt_arg)) + "%d", ival); fmt_len += strlen(fmt_arg); if ((format = _nc_doalloc(format, fmt_len)) == 0) { return -1; } - strcpy(&format[--f], fmt_arg); + --f; + _nc_STRCPY(&format[f], fmt_arg, fmt_len - f); f = strlen(format); } else if (isalpha(UChar(*fmt))) { done = TRUE; @@ -185,13 +188,13 @@ _nc_printf_length(const char *fmt, va_list ap) format[f] = '\0'; switch (used) { case 'i': - sprintf(buffer, format, ival); + _nc_SPRINTF(buffer, _nc_SLIMIT(length) format, ival); break; case 'f': - sprintf(buffer, format, fval); + _nc_SPRINTF(buffer, _nc_SLIMIT(length) format, fval); break; default: - sprintf(buffer, format, pval); + _nc_SPRINTF(buffer, _nc_SLIMIT(length) format, pval); break; } len += (int) strlen(buffer); diff --git a/ncurses/base/vsscanf.c b/ncurses/base/vsscanf.c index e6253c3a..38c7926e 100644 --- a/ncurses/base/vsscanf.c +++ b/ncurses/base/vsscanf.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. * + * Copyright (c) 1998-2004,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -38,7 +38,7 @@ #if !HAVE_VSSCANF -MODULE_ID("$Id: vsscanf.c,v 1.18 2004/04/03 20:27:02 tom Exp $") +MODULE_ID("$Id: vsscanf.c,v 1.20 2012/02/22 22:26:58 tom Exp $") #if !(HAVE_VFSCANF || HAVE__DOSCAN) @@ -293,12 +293,12 @@ vsscanf(const char *str, const char *format, va_list ap) /* add %n, if the format was not that */ if (chunk != cAssigned) { - strcat(my_fmt, "%n"); + _nc_STRCAT(my_fmt, "%n", len_fmt); } switch (chunk) { case cAssigned: - strcat(my_fmt, "%n"); + _nc_STRCAT(my_fmt, "%n", len_fmt); pointer = &eaten; break; case cInt: diff --git a/ncurses/build.priv.h b/ncurses/build.priv.h index be00d73e..096a4431 100644 --- a/ncurses/build.priv.h +++ b/ncurses/build.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2010 Free Software Foundation, Inc. * + * Copyright (c) 2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -30,9 +30,8 @@ * Author: Thomas E. Dickey 2010 * ****************************************************************************/ - /* - * $Id: build.priv.h,v 1.6 2010/05/22 20:30:35 tom Exp $ + * $Id: build.priv.h,v 1.9 2012/02/22 22:17:02 tom Exp $ * * build.priv.h * @@ -83,6 +82,7 @@ extern "C" { #define SIZEOF(v) (sizeof(v) / sizeof(v[0])) #include +#include /* declare these, to avoid needing term.h */ #if BROKEN_LINKER || USE_REENTRANT diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h index 19e7818a..67dcdcf8 100644 --- a/ncurses/curses.priv.h +++ b/ncurses/curses.priv.h @@ -34,7 +34,7 @@ ****************************************************************************/ /* - * $Id: curses.priv.h,v 1.492 2012/01/21 19:21:29 KO.Myung-Hun Exp $ + * $Id: curses.priv.h,v 1.496 2012/02/22 22:10:37 tom Exp $ * * curses.priv.h * @@ -112,6 +112,14 @@ extern int errno; #define USE_FUNC_POLL 0 #endif +#if HAVE_INTTYPES_H +# include +#else +# if HAVE_STDINT_H +# include +# endif +#endif + /* include signal.h before curses.h to work-around defect in glibc 2.1.3 */ #include @@ -230,6 +238,8 @@ extern NCURSES_EXPORT(void *) _nc_memmove (void *, const void *, size_t); #define if_USE_SCROLL_HINTS(stmt) /*nothing*/ #endif +#include + /* * Options for terminal drivers, etc... */ @@ -1965,6 +1975,7 @@ extern NCURSES_EXPORT(void) _nc_alloc_entry_leaks(void); extern NCURSES_EXPORT(void) _nc_captoinfo_leaks(void); extern NCURSES_EXPORT(void) _nc_codes_leaks(void); extern NCURSES_EXPORT(void) _nc_comp_captab_leaks(void); +extern NCURSES_EXPORT(void) _nc_comp_error_leaks(void); extern NCURSES_EXPORT(void) _nc_comp_scan_leaks(void); extern NCURSES_EXPORT(void) _nc_db_iterator_leaks(void); extern NCURSES_EXPORT(void) _nc_keyname_leaks(void); diff --git a/ncurses/tinfo/access.c b/ncurses/tinfo/access.c index 6c4df591..4822b2d8 100644 --- a/ncurses/tinfo/access.c +++ b/ncurses/tinfo/access.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -36,7 +36,7 @@ #include -MODULE_ID("$Id: access.c,v 1.20 2011/06/05 00:48:00 tom Exp $") +MODULE_ID("$Id: access.c,v 1.22 2012/02/22 22:34:31 tom Exp $") #ifdef __TANDEM #define ROOT_UID 65535 @@ -124,13 +124,15 @@ _nc_access(const char *path, int mode) && errno == ENOENT && strlen(path) < PATH_MAX) { char head[PATH_MAX]; - char *leaf = _nc_basename(strcpy(head, path)); + char *leaf; + _nc_STRCPY(head, path, sizeof(head)); + leaf = _nc_basename(head); if (leaf == 0) leaf = head; *leaf = '\0'; if (head == leaf) - (void) strcpy(head, "."); + _nc_STRCPY(head, ".", sizeof(head)); result = access(head, R_OK | W_OK | X_OK); } else { diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c index 9d70634e..9993cdf1 100644 --- a/ncurses/tinfo/alloc_entry.c +++ b/ncurses/tinfo/alloc_entry.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -47,7 +47,7 @@ #include -MODULE_ID("$Id: alloc_entry.c,v 1.52 2011/10/22 16:34:50 tom Exp $") +MODULE_ID("$Id: alloc_entry.c,v 1.56 2012/02/22 22:34:31 tom Exp $") #define ABSENT_OFFSET -1 #define CANCELLED_OFFSET -2 @@ -131,7 +131,7 @@ _nc_save_str(const char *const string) result = (stringbuf + next_free - 1); } } else if (next_free + len < MAX_STRTAB) { - strcpy(&stringbuf[next_free], string); + _nc_STRCPY(&stringbuf[next_free], string, MAX_STRTAB); DEBUG(7, ("Saved string %s", _nc_visbuf(string))); DEBUG(7, ("at location %d", (int) next_free)); next_free += len; @@ -216,16 +216,19 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings) if ((n = (unsigned) NUM_EXT_NAMES(tp)) != 0) { if (n < SIZEOF(offsets)) { size_t length = 0; + size_t offset; for (i = 0; i < n; i++) { length += strlen(tp->ext_Names[i]) + 1; offsets[i] = (int) (tp->ext_Names[i] - stringbuf); } if ((tp->ext_str_table = typeMalloc(char, length)) == 0) _nc_err_abort(MSG_NO_MEMORY); - for (i = 0, length = 0; i < n; i++) { - tp->ext_Names[i] = tp->ext_str_table + length; - strcpy(tp->ext_Names[i], stringbuf + offsets[i]); - length += strlen(tp->ext_Names[i]) + 1; + for (i = 0, offset = 0; i < n; i++) { + tp->ext_Names[i] = tp->ext_str_table + offset; + _nc_STRCPY(tp->ext_Names[i], + stringbuf + offsets[i], + length - offset); + offset += strlen(tp->ext_Names[i]) + 1; } } } diff --git a/ncurses/tinfo/captoinfo.c b/ncurses/tinfo/captoinfo.c index cc57db31..80ee6a33 100644 --- a/ncurses/tinfo/captoinfo.c +++ b/ncurses/tinfo/captoinfo.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -93,7 +93,7 @@ #include #include -MODULE_ID("$Id: captoinfo.c,v 1.70 2011/10/22 14:59:34 tom Exp $") +MODULE_ID("$Id: captoinfo.c,v 1.72 2012/02/22 22:40:24 tom Exp $") #define MAX_PUSHED 16 /* max # args we can push onto the stack */ @@ -133,7 +133,7 @@ save_string(char *d, const char *const s) _nc_err_abort(MSG_NO_MEMORY); d = my_string + have; } - (void) strcpy(d, s); + _nc_STRCPY(d, s, my_length - have); return d + strlen(d); } @@ -515,7 +515,7 @@ bcd_expression(const char *str) { char buffer[80]; int tst; - sprintf(buffer, fmt, ch1, ch2); + _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) fmt, ch1, ch2); tst = strlen(buffer) - 1; assert(len == tst); } @@ -535,9 +535,9 @@ save_tc_char(char *bufptr, int c1) bufptr = save_char(bufptr, c1); } else { if (c1 == (c1 & 0x1f)) /* iscntrl() returns T on 255 */ - (void) strcpy(temp, unctrl((chtype) c1)); + _nc_STRCPY(temp, unctrl((chtype) c1), sizeof(temp)); else - (void) sprintf(temp, "\\%03o", c1); + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "\\%03o", c1); bufptr = save_string(bufptr, temp); } return bufptr; @@ -680,7 +680,8 @@ _nc_infotocap(const char *cap GCC_UNUSED, const char *str, int const parameteriz break; default: /* should not happen, but handle this anyway */ - sprintf(octal, "%03o", UChar(xx1)); + _nc_SPRINTF(octal, _nc_SLIMIT(sizeof(octal)) + "%03o", UChar(xx1)); bufptr = save_char(bufptr, octal[0]); bufptr = save_char(bufptr, octal[1]); xx1 = octal[2]; diff --git a/ncurses/tinfo/comp_error.c b/ncurses/tinfo/comp_error.c index b6a2c4e5..ff0acc79 100644 --- a/ncurses/tinfo/comp_error.c +++ b/ncurses/tinfo/comp_error.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -41,7 +41,7 @@ #include -MODULE_ID("$Id: comp_error.c,v 1.33 2011/10/22 16:34:50 tom Exp $") +MODULE_ID("$Id: comp_error.c,v 1.36 2012/02/22 22:34:31 tom Exp $") NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE; NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */ @@ -85,7 +85,7 @@ _nc_get_type(char *name) } #endif if (name != 0) - strcpy(name, TermType != 0 ? TermType : ""); + _nc_STRCPY(name, TermType != 0 ? TermType : "", MAX_NAME_SIZE); } static NCURSES_INLINE void @@ -152,3 +152,12 @@ _nc_syserr_abort(const char *const fmt,...) exit(EXIT_FAILURE); #endif } + +#if NO_LEAKS +NCURSES_EXPORT(void) +_nc_comp_error_leaks(void) +{ + FreeAndNull(SourceName); + FreeAndNull(TermType); +} +#endif diff --git a/ncurses/tinfo/comp_expand.c b/ncurses/tinfo/comp_expand.c index 84024008..5841baa6 100644 --- a/ncurses/tinfo/comp_expand.c +++ b/ncurses/tinfo/comp_expand.c @@ -35,7 +35,7 @@ #include #include -MODULE_ID("$Id: comp_expand.c,v 1.22 2011/05/21 18:55:07 tom Exp $") +MODULE_ID("$Id: comp_expand.c,v 1.24 2012/02/22 22:40:24 tom Exp $") static int trailing_spaces(const char *src) @@ -49,6 +49,8 @@ trailing_spaces(const char *src) #define REALCTL(s) (UChar(*(s)) < 127 && iscntrl(UChar(*(s)))) #define REALPRINT(s) (UChar(*(s)) < 127 && isprint(UChar(*(s)))) +#define P_LIMIT(p) (length - (size_t)(p)) + NCURSES_EXPORT(char *) _nc_tic_expand(const char *srcp, bool tic_format, int numbers) { @@ -90,7 +92,8 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers) && str[1] != '\\' && REALPRINT(str + 1) && str[2] == S_QUOTE) { - sprintf(buffer + bufp, "{%d}", str[1]); + _nc_SPRINTF(buffer + bufp, _nc_SLIMIT(P_LIMIT(bufp)) + "{%d}", str[1]); bufp += (int) strlen(buffer + bufp); str += 2; } else { @@ -177,10 +180,12 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers) #define UnCtl(c) ((c) + '@') else if (REALCTL(str) && ch != '\\' && (!islong || isdigit(UChar(str[1])))) { - (void) sprintf(&buffer[bufp], "^%c", UnCtl(ch)); + _nc_SPRINTF(&buffer[bufp], _nc_SLIMIT(P_LIMIT(bufp)) + "^%c", UnCtl(ch)); bufp += 2; } else { - (void) sprintf(&buffer[bufp], "\\%03o", ch); + _nc_SPRINTF(&buffer[bufp], _nc_SLIMIT(P_LIMIT(bufp)) + "\\%03o", ch); bufp += 4; } diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c index 48bd97a8..3ad2e1a9 100644 --- a/ncurses/tinfo/comp_parse.c +++ b/ncurses/tinfo/comp_parse.c @@ -47,7 +47,7 @@ #include -MODULE_ID("$Id: comp_parse.c,v 1.79 2012/01/28 21:49:23 tom Exp $") +MODULE_ID("$Id: comp_parse.c,v 1.81 2012/02/22 22:34:31 tom Exp $") static void sanity_check2(TERMTYPE *, bool); NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanity_check2; @@ -83,7 +83,7 @@ force_bar(char *dst, char *src) if (len > MAX_NAME_SIZE) len = MAX_NAME_SIZE; (void) strncpy(dst, src, len); - (void) strcpy(dst + len, "|"); + _nc_STRCPY(dst + len, "|", MAX_NAME_SIZE); src = dst; } return src; diff --git a/ncurses/tinfo/comp_scan.c b/ncurses/tinfo/comp_scan.c index 17c42df5..459113bf 100644 --- a/ncurses/tinfo/comp_scan.c +++ b/ncurses/tinfo/comp_scan.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -50,7 +50,7 @@ #include #include -MODULE_ID("$Id: comp_scan.c,v 1.94 2011/10/22 15:46:43 tom Exp $") +MODULE_ID("$Id: comp_scan.c,v 1.96 2012/02/22 22:26:58 tom Exp $") /* * Maximum length of string capability we'll accept before raising an error. @@ -213,7 +213,7 @@ next_char(void) } } else { if (used != 0) - strcat(result, "\n"); + _nc_STRCAT(result, "\n", allocated); } if ((bufptr = bufstart) != 0) { used = strlen(bufptr); diff --git a/ncurses/tinfo/db_iterator.c b/ncurses/tinfo/db_iterator.c index ce84fad3..8af267bc 100644 --- a/ncurses/tinfo/db_iterator.c +++ b/ncurses/tinfo/db_iterator.c @@ -43,7 +43,7 @@ #include #endif -MODULE_ID("$Id: db_iterator.c,v 1.28 2012/01/21 23:56:17 tom Exp $") +MODULE_ID("$Id: db_iterator.c,v 1.31 2012/02/22 22:40:24 tom Exp $") #define HaveTicDirectory _nc_globals.have_tic_directory #define KeepTicDirectory _nc_globals.keep_tic_directory @@ -55,13 +55,15 @@ MODULE_ID("$Id: db_iterator.c,v 1.28 2012/01/21 23:56:17 tom Exp $") #define my_vars _nc_globals.dbd_vars static void -add_to_blob(const char *text) +add_to_blob(const char *text, size_t limit) { + (void) limit; + if (*text != '\0') { char *last = my_blob + strlen(my_blob); if (last != my_blob) *last++ = NCURSES_PATHSEP; - strcpy(last, text); + _nc_STRCPY(last, text, limit); } } @@ -77,7 +79,7 @@ check_existence(const char *name, struct stat *sb) #if USE_HASHED_DB else if (strlen(name) < PATH_MAX - sizeof(DBM_SUFFIX)) { char temp[PATH_MAX]; - sprintf(temp, "%s%s", name, DBM_SUFFIX); + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%s%s", name, DBM_SUFFIX); if (stat(temp, sb) == 0 && S_ISREG(sb->st_mode)) { result = TRUE; } @@ -303,7 +305,7 @@ _nc_first_db(DBDIRS * state, int *offset) if (my_blob != 0) { *my_blob = '\0'; for (j = 0; j < dbdLAST; ++j) { - add_to_blob(values[j]); + add_to_blob(values[j], blobsize); } /* Now, build an array which will be pointers to the distinct diff --git a/ncurses/tinfo/doalloc.c b/ncurses/tinfo/doalloc.c index fe2a009d..a2aea950 100644 --- a/ncurses/tinfo/doalloc.c +++ b/ncurses/tinfo/doalloc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * + * Copyright (c) 1998-2000,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -39,7 +39,7 @@ #include -MODULE_ID("$Id: doalloc.c,v 1.8 2002/08/31 21:48:11 Philippe.Blain Exp $") +MODULE_ID("$Id: doalloc.c,v 1.10 2012/02/22 22:34:31 tom Exp $") NCURSES_EXPORT(void *) _nc_doalloc(void *oldp, size_t amount) @@ -63,9 +63,10 @@ _nc_strdup(const char *src) { char *dst; if (src != 0) { - dst = typeMalloc(char, strlen(src) + 1); + size_t need = strlen(src) + 1; + dst = typeMalloc(char, need); if (dst != 0) { - (void) strcpy(dst, src); + _nc_STRCPY(dst, src, need); } } else { dst = 0; diff --git a/ncurses/tinfo/entries.c b/ncurses/tinfo/entries.c index 30981e5c..f7db6619 100644 --- a/ncurses/tinfo/entries.c +++ b/ncurses/tinfo/entries.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2006-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 2006-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -37,7 +37,7 @@ #include -MODULE_ID("$Id: entries.c,v 1.19 2011/10/22 16:34:50 tom Exp $") +MODULE_ID("$Id: entries.c,v 1.20 2012/02/22 09:37:02 tom Exp $") /**************************************************************************** * @@ -135,6 +135,7 @@ _nc_leaks_tinfo(void) _nc_codes_leaks(); FreeIfNeeded(_nc_prescreen.real_acs_map); #endif + _nc_comp_error_leaks(); if ((s = _nc_home_terminfo()) != 0) free(s); diff --git a/ncurses/tinfo/home_terminfo.c b/ncurses/tinfo/home_terminfo.c index 69d69f95..3d12ebf6 100644 --- a/ncurses/tinfo/home_terminfo.c +++ b/ncurses/tinfo/home_terminfo.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * + * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -37,7 +37,7 @@ #include #include -MODULE_ID("$Id: home_terminfo.c,v 1.12 2010/12/25 23:43:58 tom Exp $") +MODULE_ID("$Id: home_terminfo.c,v 1.14 2012/02/22 22:40:24 tom Exp $") /* ncurses extension...fall back on user's private directory */ @@ -57,7 +57,7 @@ _nc_home_terminfo(void) MyBuffer = typeMalloc(char, want); if (MyBuffer == 0) _nc_err_abort(MSG_NO_MEMORY); - (void) sprintf(MyBuffer, PRIVATE_INFO, home); + _nc_SPRINTF(MyBuffer, _nc_SLIMIT(want) PRIVATE_INFO, home); } } result = MyBuffer; diff --git a/ncurses/tinfo/lib_print.c b/ncurses/tinfo/lib_print.c index e30ceae8..0dab4d45 100644 --- a/ncurses/tinfo/lib_print.c +++ b/ncurses/tinfo/lib_print.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -39,7 +39,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_print.c,v 1.21 2011/10/22 16:34:50 tom Exp $") +MODULE_ID("$Id: lib_print.c,v 1.23 2012/02/22 22:34:31 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len) @@ -76,10 +76,10 @@ NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len) return (ERR); } - (void) strcpy(mybuf, switchon); + _nc_STRCPY(mybuf, switchon, need); memcpy(mybuf + onsize, data, (size_t) len); if (offsize) - (void) strcpy(mybuf + onsize + len, prtr_off); + _nc_STRCPY(mybuf + onsize + len, prtr_off, need); /* * We're relying on the atomicity of UNIX writes here. The diff --git a/ncurses/tinfo/lib_termcap.c b/ncurses/tinfo/lib_termcap.c index 4d423075..5e743073 100644 --- a/ncurses/tinfo/lib_termcap.c +++ b/ncurses/tinfo/lib_termcap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -48,7 +48,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_termcap.c,v 1.76 2011/10/22 17:12:41 tom Exp $") +MODULE_ID("$Id: lib_termcap.c,v 1.78 2012/02/22 22:34:31 tom Exp $") NCURSES_EXPORT_VAR(char *) UP = 0; NCURSES_EXPORT_VAR(char *) BC = 0; @@ -362,7 +362,7 @@ NCURSES_SP_NAME(tgetstr) (NCURSES_SP_DCLx NCURSES_CONST char *id, char **area) } if (area != 0 && *area != 0) { - (void) strcpy(*area, result); + _nc_STRCPY(*area, result, 1024); result = *area; *area += strlen(*area) + 1; } diff --git a/ncurses/tinfo/lib_tgoto.c b/ncurses/tinfo/lib_tgoto.c index e07f4643..31daf443 100644 --- a/ncurses/tinfo/lib_tgoto.c +++ b/ncurses/tinfo/lib_tgoto.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2000-2006,2008 Free Software Foundation, Inc. * + * Copyright (c) 2000-2008,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -35,7 +35,7 @@ #include #include -MODULE_ID("$Id: lib_tgoto.c,v 1.13 2008/08/16 19:29:32 tom Exp $") +MODULE_ID("$Id: lib_tgoto.c,v 1.16 2012/02/24 02:08:08 tom Exp $") #if !PURE_TERMINFO static bool @@ -159,7 +159,8 @@ tgoto_internal(const char *string, int x, int y) break; } if (fmt != 0) { - sprintf(result + used, fmt, *value++); + _nc_SPRINTF(result + used, _nc_SLIMIT(length - used) + fmt, *value++); used += strlen(result + used); fmt = 0; } @@ -174,7 +175,7 @@ tgoto_internal(const char *string, int x, int y) } if (result != 0) { if (need_BC) { - strcpy(result + used, BC); + _nc_STRCPY(result + used, BC, length - used); used += strlen(BC); } result[used] = '\0'; diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c index 53205d17..6290ac40 100644 --- a/ncurses/tinfo/lib_tparm.c +++ b/ncurses/tinfo/lib_tparm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -42,7 +42,7 @@ #include #include -MODULE_ID("$Id: lib_tparm.c,v 1.84 2011/10/22 15:48:47 tom Exp $") +MODULE_ID("$Id: lib_tparm.c,v 1.86 2012/02/22 22:40:24 tom Exp $") /* * char * @@ -143,7 +143,9 @@ save_text(const char *fmt, const char *s, int len) get_space(s_len + 1); - (void) sprintf(TPS(out_buff) + TPS(out_used), fmt, s); + _nc_SPRINTF(TPS(out_buff) + TPS(out_used), + _nc_SLIMIT(TPS(out_size) - TPS(out_used)) + fmt, s); TPS(out_used) += strlen(TPS(out_buff) + TPS(out_used)); } @@ -155,7 +157,9 @@ save_number(const char *fmt, int number, int len) get_space((size_t) len + 1); - (void) sprintf(TPS(out_buff) + TPS(out_used), fmt, number); + _nc_SPRINTF(TPS(out_buff) + TPS(out_used), + _nc_SLIMIT(TPS(out_size) - TPS(out_used)) + fmt, number); TPS(out_used) += strlen(TPS(out_buff) + TPS(out_used)); } diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c index e37e7a13..a61597bc 100644 --- a/ncurses/tinfo/lib_tputs.c +++ b/ncurses/tinfo/lib_tputs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -51,7 +51,7 @@ #include /* ospeed */ #include -MODULE_ID("$Id: lib_tputs.c,v 1.82 2011/10/22 16:34:50 tom Exp $") +MODULE_ID("$Id: lib_tputs.c,v 1.84 2012/02/22 22:40:24 tom Exp $") NCURSES_EXPORT_VAR(char) PC = 0; /* used by termcap library */ NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0; /* used by termcap library */ @@ -216,9 +216,9 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx if (USE_TRACEF(TRACE_TPUTS)) { if (outc == NCURSES_SP_NAME(_nc_outch)) - (void) strcpy(addrbuf, "_nc_outch"); + _nc_STRCPY(addrbuf, "_nc_outch", sizeof(addrbuf)); else - (void) sprintf(addrbuf, "%p", outc); + _nc_SPRINTF(addrbuf, _nc_SLIMIT(sizeof(addrbuf)) "%p", outc); if (_nc_tputs_trace) { _tracef("tputs(%s = %s, %d, %s) called", _nc_tputs_trace, _nc_visbuf(string), affcnt, addrbuf); diff --git a/ncurses/tinfo/make_hash.c b/ncurses/tinfo/make_hash.c index 439f8003..8fb2538c 100644 --- a/ncurses/tinfo/make_hash.c +++ b/ncurses/tinfo/make_hash.c @@ -44,7 +44,7 @@ #include -MODULE_ID("$Id: make_hash.c,v 1.6 2012/02/18 20:04:39 tom Exp $") +MODULE_ID("$Id: make_hash.c,v 1.8 2012/02/22 22:40:24 tom Exp $") /* * _nc_make_hash_table() @@ -261,8 +261,8 @@ main(int argc, char **argv) root_name); printf("{\n"); for (n = 0; n < CAPTABSIZE; n++) { - sprintf(buffer, "\"%s\"", - name_table[n].nte_name); + _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) "\"%s\"", + name_table[n].nte_name); printf("\t{ %15s,\t%10s,\t%3d, %3d }%c\n", buffer, typenames[name_table[n].nte_type], diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c index 0e3a8bfa..31fcf043 100644 --- a/ncurses/tinfo/parse_entry.c +++ b/ncurses/tinfo/parse_entry.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -47,7 +47,7 @@ #include #include -MODULE_ID("$Id: parse_entry.c,v 1.76 2011/07/27 01:14:47 tom Exp $") +MODULE_ID("$Id: parse_entry.c,v 1.78 2012/02/22 22:40:24 tom Exp $") #ifdef LINT static short const parametrized[] = @@ -660,14 +660,16 @@ postprocess_termcap(TERMTYPE *tp, bool has_base) if (WANTED(carriage_return)) { if (carriage_return_delay > 0) { - sprintf(buf, "%s$<%d>", C_CR, carriage_return_delay); + _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) + "%s$<%d>", C_CR, carriage_return_delay); carriage_return = _nc_save_str(buf); } else carriage_return = _nc_save_str(C_CR); } if (WANTED(cursor_left)) { if (backspace_delay > 0) { - sprintf(buf, "%s$<%d>", C_BS, backspace_delay); + _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) + "%s$<%d>", C_BS, backspace_delay); cursor_left = _nc_save_str(buf); } else if (backspaces_with_bs == 1) cursor_left = _nc_save_str(C_BS); @@ -680,7 +682,8 @@ postprocess_termcap(TERMTYPE *tp, bool has_base) cursor_down = linefeed_if_not_lf; else if (linefeed_is_newline != 1) { if (new_line_delay > 0) { - sprintf(buf, "%s$<%d>", C_LF, new_line_delay); + _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) + "%s$<%d>", C_LF, new_line_delay); cursor_down = _nc_save_str(buf); } else cursor_down = _nc_save_str(C_LF); @@ -691,7 +694,8 @@ postprocess_termcap(TERMTYPE *tp, bool has_base) cursor_down = linefeed_if_not_lf; else if (linefeed_is_newline != 1) { if (new_line_delay > 0) { - sprintf(buf, "%s$<%d>", C_LF, new_line_delay); + _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) + "%s$<%d>", C_LF, new_line_delay); scroll_forward = _nc_save_str(buf); } else scroll_forward = _nc_save_str(C_LF); @@ -700,7 +704,8 @@ postprocess_termcap(TERMTYPE *tp, bool has_base) if (WANTED(newline)) { if (linefeed_is_newline == 1) { if (new_line_delay > 0) { - sprintf(buf, "%s$<%d>", C_LF, new_line_delay); + _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) + "%s$<%d>", C_LF, new_line_delay); newline = _nc_save_str(buf); } else newline = _nc_save_str(C_LF); @@ -742,7 +747,8 @@ postprocess_termcap(TERMTYPE *tp, bool has_base) */ if (WANTED(tab)) { if (horizontal_tab_delay > 0) { - sprintf(buf, "%s$<%d>", C_HT, horizontal_tab_delay); + _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) + "%s$<%d>", C_HT, horizontal_tab_delay); tab = _nc_save_str(buf); } else tab = _nc_save_str(C_HT); diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c index 44a42d6f..c8aae600 100644 --- a/ncurses/tinfo/read_entry.c +++ b/ncurses/tinfo/read_entry.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -41,7 +41,7 @@ #include -MODULE_ID("$Id: read_entry.c,v 1.117 2011/10/22 15:30:24 tom Exp $") +MODULE_ID("$Id: read_entry.c,v 1.119 2012/02/22 22:40:24 tom Exp $") #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts)) @@ -410,9 +410,9 @@ make_db_filename(char *filename, unsigned limit, const char *const path) if (test < limit) { if (size >= lens && !strcmp(path + size - lens, suffix)) - (void) strcpy(filename, path); + _nc_STRCPY(filename, path, limit); else - (void) sprintf(filename, "%s%s", path, suffix); + _nc_SPRINTF(filename, _nc_SLIMIT(limit) "%s%s", path, suffix); result = TRUE; } return result; @@ -437,7 +437,8 @@ make_dir_filename(char *filename, unsigned need = (unsigned) (LEAF_LEN + 3 + strlen(path) + strlen(name)); if (need <= limit) { - (void) sprintf(filename, "%s/" LEAF_FMT "/%s", path, *name, name); + _nc_SPRINTF(filename, _nc_SLIMIT(limit) + "%s/" LEAF_FMT "/%s", path, *name, name); result = TRUE; } } @@ -524,7 +525,8 @@ _nc_read_tic_entry(char *filename, #if USE_TERMCAP else if (code != TGETENT_YES) { code = _nc_read_termcap_entry(name, tp); - sprintf(filename, "%.*s", PATH_MAX - 1, _nc_get_source()); + _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX) + "%.*s", PATH_MAX - 1, _nc_get_source()); } #endif return code; @@ -545,7 +547,9 @@ _nc_read_entry(const char *const name, char *const filename, TERMTYPE *const tp) { int code = TGETENT_NO; - sprintf(filename, "%.*s", PATH_MAX - 1, name); + _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX) + "%.*s", PATH_MAX - 1, name); + if (strlen(name) == 0 || strcmp(name, ".") == 0 || strcmp(name, "..") == 0 @@ -570,7 +574,8 @@ _nc_read_entry(const char *const name, char *const filename, TERMTYPE *const tp) #elif USE_TERMCAP if (code != TGETENT_YES) { code = _nc_read_termcap_entry(name, tp); - sprintf(filename, "%.*s", PATH_MAX - 1, _nc_get_source()); + _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX) + "%.*s", PATH_MAX - 1, _nc_get_source()); } #endif } diff --git a/ncurses/tinfo/read_termcap.c b/ncurses/tinfo/read_termcap.c index 29a9800b..ba6e87dd 100644 --- a/ncurses/tinfo/read_termcap.c +++ b/ncurses/tinfo/read_termcap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -56,7 +56,7 @@ #include #include -MODULE_ID("$Id: read_termcap.c,v 1.84 2011/09/26 22:52:50 tom Exp $") +MODULE_ID("$Id: read_termcap.c,v 1.86 2012/02/22 22:40:24 tom Exp $") #if !PURE_TERMINFO @@ -161,7 +161,7 @@ _nc_cgetset(const char *ent) return (-1); } gottoprec = 0; - (void) strcpy(toprec, ent); + _nc_STRCPY(toprec, ent, topreclen); return (0); } @@ -294,7 +294,7 @@ _nc_getent( errno = ENOMEM; return (TC_SYS_ERR); } - (void) strcpy(record, toprec); + _nc_STRCPY(record, toprec, topreclen + BFRAG); rp = record + topreclen + 1; r_end = rp + BFRAG; current = in_array; @@ -822,10 +822,11 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name) if ((home = getenv("HOME")) != 0 && *home != '\0' && strchr(home, ' ') == 0 && strlen(home) < sizeof(temp) - 10) { /* setup path */ - sprintf(temp, "%s/", home); /* $HOME first */ + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) + "%s/", home); /* $HOME first */ } /* if no $HOME look in current directory */ - strcat(temp, ".termcap"); + _nc_STRCAT(temp, ".termcap", sizeof(temp)); _nc_safe_strcat(&desc, temp); _nc_safe_strcat(&desc, " "); _nc_safe_strcat(&desc, get_termpath()); @@ -1041,7 +1042,9 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE *const tp) normal = FALSE; } else if (_nc_name_match(tc, tn, "|:")) { /* treat as a capability file */ use_buffer = TRUE; - (void) sprintf(tc_buf, "%.*s\n", (int) sizeof(tc_buf) - 2, tc); + _nc_SPRINTF(tc_buf, + _nc_SLIMIT(sizeof(tc_buf)) + "%.*s\n", (int) sizeof(tc_buf) - 2, tc); normal = FALSE; } } @@ -1063,8 +1066,9 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE *const tp) if (use_terminfo_vars() && (h = getenv("HOME")) != NULL && *h != '\0' && (strlen(h) + sizeof(PRIVATE_CAP)) < PATH_MAX) { /* user's .termcap, if any, should override it */ - (void) strcpy(envhome, h); - (void) sprintf(pathbuf, PRIVATE_CAP, envhome); + _nc_STRCPY(envhome, h, sizeof(envhome)); + _nc_SPRINTF(pathbuf, _nc_SLIMIT(sizeof(pathbuf)) + PRIVATE_CAP, envhome); ADD_TC(pathbuf, filecount); } } diff --git a/ncurses/tinfo/strings.c b/ncurses/tinfo/strings.c index 78cd2ef4..393d8e7c 100644 --- a/ncurses/tinfo/strings.c +++ b/ncurses/tinfo/strings.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2000-2003,2007 Free Software Foundation, Inc. * + * Copyright (c) 2000-2007,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -36,7 +36,7 @@ #include -MODULE_ID("$Id: strings.c,v 1.6 2007/08/11 17:12:17 tom Exp $") +MODULE_ID("$Id: strings.c,v 1.8 2012/02/22 22:34:31 tom Exp $") /**************************************************************************** * Useful string functions (especially for mvcur) @@ -110,7 +110,7 @@ _nc_safe_strcat(string_desc * dst, const char *src) if (len < dst->s_size) { if (dst->s_tail != 0) { - strcpy(dst->s_tail, src); + _nc_STRCPY(dst->s_tail, src, dst->s_size); dst->s_tail += len; } dst->s_size -= len; @@ -131,7 +131,7 @@ _nc_safe_strcpy(string_desc * dst, const char *src) if (len < dst->s_size) { if (dst->s_head != 0) { - strcpy(dst->s_head, src); + _nc_STRCPY(dst->s_head, src, dst->s_size); dst->s_tail = dst->s_head + len; } dst->s_size = dst->s_init - len; diff --git a/ncurses/tinfo/trim_sgr0.c b/ncurses/tinfo/trim_sgr0.c index 1f992086..ee18c731 100644 --- a/ncurses/tinfo/trim_sgr0.c +++ b/ncurses/tinfo/trim_sgr0.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2005-2007,2010 Free Software Foundation, Inc. * + * Copyright (c) 2005-2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -36,7 +36,7 @@ #include -MODULE_ID("$Id: trim_sgr0.c,v 1.12 2010/12/25 23:03:57 tom Exp $") +MODULE_ID("$Id: trim_sgr0.c,v 1.14 2012/02/22 22:34:31 tom Exp $") #undef CUR #define CUR tp-> @@ -108,7 +108,7 @@ rewrite_sgr(char *s, char *attr) for (n = 0; n < len_s - len_a; ++n) { s[n] = s[n + len_a]; } - strcpy(s + n, attr); + _nc_STRCPY(s + n, attr, strlen(s) + 1); TR(TRACE_DATABASE, ("to:\n\t%s", s)); } } diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c index b1daf164..0c992b66 100644 --- a/ncurses/tinfo/write_entry.c +++ b/ncurses/tinfo/write_entry.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -47,7 +47,7 @@ #define TRACE_OUT(p) /*nothing */ #endif -MODULE_ID("$Id: write_entry.c,v 1.82 2011/10/30 14:33:13 tom Exp $") +MODULE_ID("$Id: write_entry.c,v 1.84 2012/02/22 22:40:24 tom Exp $") static int total_written; @@ -99,7 +99,7 @@ check_writeable(int code) if (verified[s - dirnames]) return; - sprintf(dir, LEAF_FMT, code); + _nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, code); if (make_db_root(dir) < 0) { _nc_err_abort("%s/%s: permission denied", _nc_tic_dir(0), dir); } @@ -116,12 +116,12 @@ make_db_path(char *dst, const char *src, size_t limit) if (src == top || _nc_is_abs_path(src)) { if (strlen(src) + 1 <= limit) { - (void) strcpy(dst, src); + _nc_STRCPY(dst, src, limit); rc = 0; } } else { if (strlen(top) + strlen(src) + 2 <= limit) { - (void) sprintf(dst, "%s/%s", top, src); + _nc_SPRINTF(dst, _nc_SLIMIT(limit) "%s/%s", top, src); rc = 0; } } @@ -132,7 +132,7 @@ make_db_path(char *dst, const char *src, size_t limit) size_t need = strlen(suffix); if (have > need && strcmp(dst + (int) (have - need), suffix)) { if (have + need <= limit) { - strcat(dst, suffix); + _nc_STRCAT(dst, suffix, limit); } else { rc = -1; } @@ -277,7 +277,7 @@ _nc_write_entry(TERMTYPE *const tp) assert(strlen(tp->term_names) != 0); assert(strlen(tp->term_names) < sizeof(name_list)); - (void) strcpy(name_list, tp->term_names); + _nc_STRCPY(name_list, tp->term_names, sizeof(name_list)); DEBUG(7, ("Name list = '%s'", name_list)); first_name = name_list; @@ -330,7 +330,9 @@ _nc_write_entry(TERMTYPE *const tp) key.data = name_list; key.size = strlen(name_list); - strcpy(buffer + 1, tp->term_names); + _nc_STRCPY(buffer + 1, + tp->term_names, + sizeof(buffer) - 1); data.size = strlen(tp->term_names) + 1; _nc_db_put(capdb, &key, &data); @@ -359,7 +361,8 @@ _nc_write_entry(TERMTYPE *const tp) if (strlen(first_name) >= sizeof(filename) - (2 + LEAF_LEN)) _nc_warning("terminal name too long."); - sprintf(filename, LEAF_FMT "/%s", first_name[0], first_name); + _nc_SPRINTF(filename, _nc_SLIMIT(sizeof(filename)) + LEAF_FMT "/%s", first_name[0], first_name); /* * Has this primary name been written since the first call to @@ -400,7 +403,8 @@ _nc_write_entry(TERMTYPE *const tp) } check_writeable(ptr[0]); - sprintf(linkname, LEAF_FMT "/%s", ptr[0], ptr); + _nc_SPRINTF(linkname, _nc_SLIMIT(sizeof(linkname)) + LEAF_FMT "/%s", ptr[0], ptr); if (strcmp(filename, linkname) == 0) { _nc_warning("self-synonym ignored"); @@ -415,7 +419,7 @@ _nc_write_entry(TERMTYPE *const tp) if (first_name[0] == linkname[0]) strncpy(symlinkname, first_name, sizeof(symlinkname) - 1); else { - strcpy(symlinkname, "../"); + _nc_STRCPY(symlinkname, "../", sizeof(suymlinkname)); strncat(symlinkname, filename, sizeof(symlinkname) - 4); } symlinkname[sizeof(symlinkname) - 1] = '\0'; diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c index 7aefe9dc..f4b7ab92 100644 --- a/ncurses/trace/lib_trace.c +++ b/ncurses/trace/lib_trace.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -47,7 +47,7 @@ #include -MODULE_ID("$Id: lib_trace.c,v 1.78 2011/12/17 18:41:48 tom Exp $") +MODULE_ID("$Id: lib_trace.c,v 1.80 2012/02/22 22:26:58 tom Exp $") NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */ @@ -103,9 +103,9 @@ trace(const unsigned int tracelevel) } TracePath[size] = '\0'; assert(strlen(TracePath) <= size); - strcat(TracePath, "/trace"); + _nc_STRCAT(TracePath, "/trace", sizeof(TracePath)); if (_nc_is_dir_path(TracePath)) { - strcat(TracePath, ".log"); + _nc_STRCAT(TracePath, ".log", sizeof(TracePath)); } } diff --git a/ncurses/trace/lib_traceatr.c b/ncurses/trace/lib_traceatr.c index 8abc1c6a..07424222 100644 --- a/ncurses/trace/lib_traceatr.c +++ b/ncurses/trace/lib_traceatr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -43,10 +43,13 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_traceatr.c,v 1.76 2011/10/22 15:39:21 tom Exp $") +MODULE_ID("$Id: lib_traceatr.c,v 1.79 2012/02/22 22:40:24 tom Exp $") #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name)) +#define TRACE_BUF_SIZE(num) (_nc_globals.tracebuf_ptr[num].size) +#define COLOR_BUF_SIZE(num) (sizeof(my_buffer[num])) + #ifdef TRACE static const char l_brace[] = StringOf(L_BRACE); @@ -65,9 +68,12 @@ color_of(int c) my_cached = c; my_select = !my_select; if (c == COLOR_DEFAULT) - strcpy(my_buffer[my_select], "default"); + _nc_STRCPY(my_buffer[my_select], "default", + COLOR_BUF_SIZE(my_select)); else - sprintf(my_buffer[my_select], "color%d", c); + _nc_SPRINTF(my_buffer[my_select], + _nc_SLIMIT(COLOR_BUF_SIZE(my_select)) + "color%d", c); } return my_buffer[my_select]; } @@ -127,7 +133,7 @@ _traceattr2(int bufnum, chtype newmode) _nc_tracing = 0; - strcpy(result, l_brace); + _nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum)); for (n = 0; n < SIZEOF(names); n++) { if ((newmode & names[n].val) != 0) { @@ -139,18 +145,20 @@ _traceattr2(int bufnum, chtype newmode) short pairnum = (short) PairNumber(newmode); #ifdef USE_TERMLIB /* pair_content lives in libncurses */ - (void) sprintf(temp, "{%d}", pairnum); + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) + "{%d}", pairnum); #else short fg, bg; if (pair_content(pairnum, &fg, &bg) == OK) { - (void) sprintf(temp, - "{%d = {%s, %s}}", - pairnum, - COLOR_OF(fg), - COLOR_OF(bg)); + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) + "{%d = {%s, %s}}", + pairnum, + COLOR_OF(fg), + COLOR_OF(bg)); } else { - (void) sprintf(temp, "{%d}", pairnum); + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) + "{%d}", pairnum); } #endif result = _nc_trace_bufcat(bufnum, temp); @@ -274,7 +282,7 @@ _tracechtype2(int bufnum, chtype ch) char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ); if (result != 0) { - strcpy(result, l_brace); + _nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum)); if ((found = _nc_altcharset_name(ChAttrOf(ch), ch)) != 0) { (void) _nc_trace_bufcat(bufnum, found); } else @@ -316,7 +324,7 @@ _tracecchar_t2(int bufnum, const cchar_t *ch) const char *found; if (result != 0) { - strcpy(result, l_brace); + _nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum)); if (ch != 0) { attr = AttrOfD(ch); if ((found = _nc_altcharset_name(attr, (chtype) CharOfD(ch))) != 0) { diff --git a/ncurses/trace/lib_tracebits.c b/ncurses/trace/lib_tracebits.c index 2b2b2e5c..ce483c69 100644 --- a/ncurses/trace/lib_tracebits.c +++ b/ncurses/trace/lib_tracebits.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2008,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -34,7 +34,7 @@ #include -MODULE_ID("$Id: lib_tracebits.c,v 1.20 2011/04/16 15:32:45 tom Exp $") +MODULE_ID("$Id: lib_tracebits.c,v 1.22 2012/02/22 22:26:58 tom Exp $") #if HAVE_SYS_TERMIO_H #include /* needed for ISC */ @@ -76,22 +76,24 @@ typedef struct { const char *name; } BITNAMES; +#define TRACE_BUF_SIZE(num) (_nc_globals.tracebuf_ptr[num].size) + static void lookup_bits(char *buf, const BITNAMES * table, const char *label, unsigned int val) { const BITNAMES *sp; - (void) strcat(buf, label); - (void) strcat(buf, ": {"); + _nc_STRCAT(buf, label, TRACE_BUF_SIZE(0)); + _nc_STRCAT(buf, ": {", TRACE_BUF_SIZE(0)); for (sp = table; sp->name; sp++) if (sp->val != 0 && (val & sp->val) == sp->val) { - (void) strcat(buf, sp->name); - (void) strcat(buf, ", "); + _nc_STRCAT(buf, sp->name, TRACE_BUF_SIZE(0)); + _nc_STRCAT(buf, ", ", TRACE_BUF_SIZE(0)); } if (buf[strlen(buf) - 2] == ',') buf[strlen(buf) - 2] = '\0'; - (void) strcat(buf, "} "); + _nc_STRCAT(buf, "} ", TRACE_BUF_SIZE(0)); } NCURSES_EXPORT(char *) @@ -199,7 +201,7 @@ _nc_trace_ttymode(TTY * tty) } } } - strcat(buf, result); + _nc_STRCAT(buf, result, TRACE_BUF_SIZE(0)); } #endif diff --git a/ncurses/trace/lib_tracechr.c b/ncurses/trace/lib_tracechr.c index a1f9f5aa..8977f752 100644 --- a/ncurses/trace/lib_tracechr.c +++ b/ncurses/trace/lib_tracechr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * + * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -39,10 +39,12 @@ #include -MODULE_ID("$Id: lib_tracechr.c,v 1.20 2009/04/18 22:48:29 tom Exp $") +MODULE_ID("$Id: lib_tracechr.c,v 1.22 2012/02/22 22:40:24 tom Exp $") #ifdef TRACE +#define MyBufSize sizeof(_nc_globals.tracechr_buf) + NCURSES_EXPORT(char *) _nc_tracechar(SCREEN *sp, int ch) { @@ -55,19 +57,22 @@ _nc_tracechar(SCREEN *sp, int ch) name = safe_keyname(SP_PARM, ch); if (name == 0 || *name == '\0') name = "NULL"; - (void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch); + _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize) + "'%.30s' = %#03o", name, ch); } else if (!is8bits(ch) || !isprint(UChar(ch))) { /* * workaround for glibc bug: * sprintf changes the result from unctrl() to an empty string if it * does not correspond to a valid multibyte sequence. */ - (void) sprintf(MyBuffer, "%#03o", ch); + _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize) + "%#03o", ch); } else { name = safe_unctrl(SP_PARM, (chtype) ch); if (name == 0 || *name == 0) name = "null"; /* shouldn't happen */ - (void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch); + _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize) + "'%.30s' = %#03o", name, ch); } return (MyBuffer); } diff --git a/ncurses/trace/lib_tracemse.c b/ncurses/trace/lib_tracemse.c index 1afd15d2..e062a26a 100644 --- a/ncurses/trace/lib_tracemse.c +++ b/ncurses/trace/lib_tracemse.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -38,7 +38,7 @@ #include -MODULE_ID("$Id: lib_tracemse.c,v 1.18 2011/01/22 19:48:08 tom Exp $") +MODULE_ID("$Id: lib_tracemse.c,v 1.20 2012/02/22 22:40:24 tom Exp $") #ifdef TRACE @@ -47,7 +47,11 @@ MODULE_ID("$Id: lib_tracemse.c,v 1.18 2011/01/22 19:48:08 tom Exp $") static char * _trace_mmask_t(SCREEN *sp, mmask_t code) { -#define SHOW(m, s) if ((code & m) == m) strcat(strcat(my_buffer, s), ", ") +#define SHOW(m, s) \ + if ((code & m) == m) { \ + _nc_STRCAT(my_buffer, s, sizeof(my_buffer)); \ + _nc_STRCAT(my_buffer, ", ", sizeof(my_buffer)); \ + } SHOW(BUTTON1_RELEASED, "release-1"); SHOW(BUTTON1_PRESSED, "press-1"); @@ -110,15 +114,16 @@ _trace_mmask_t(SCREEN *sp, mmask_t code) NCURSES_EXPORT(char *) _nc_tracemouse(SCREEN *sp, MEVENT const *ep) { - (void) sprintf(my_buffer, TRACEMSE_FMT, - ep->id, - ep->x, - ep->y, - ep->z, - (unsigned long) ep->bstate); + _nc_SPRINTF(my_buffer, _nc_SLIMIT(sizeof(my_buffer)) + TRACEMSE_FMT, + ep->id, + ep->x, + ep->y, + ep->z, + (unsigned long) ep->bstate); (void) _trace_mmask_t(sp, ep->bstate); - (void) strcat(my_buffer, "}"); + _nc_STRCAT(my_buffer, "}", sizeof(my_buffer)); return (my_buffer); } diff --git a/ncurses/trace/trace_buf.c b/ncurses/trace/trace_buf.c index 3768d098..84a7a0ce 100644 --- a/ncurses/trace/trace_buf.c +++ b/ncurses/trace/trace_buf.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -35,7 +35,7 @@ #include -MODULE_ID("$Id: trace_buf.c,v 1.18 2011/10/22 15:46:06 tom Exp $") +MODULE_ID("$Id: trace_buf.c,v 1.20 2012/02/22 22:34:31 tom Exp $") #ifdef TRACE @@ -106,10 +106,11 @@ _nc_trace_bufcat(int bufnum, const char *value) char *buffer = _nc_trace_alloc(bufnum, (size_t) 0); if (buffer != 0) { size_t have = strlen(buffer); + size_t need = strlen(value) + have; - buffer = _nc_trace_alloc(bufnum, 1 + have + strlen(value)); + buffer = _nc_trace_alloc(bufnum, 1 + need); if (buffer != 0) - (void) strcpy(buffer + have, value); + _nc_STRCPY(buffer + have, value, need); } return buffer; diff --git a/ncurses/trace/varargs.c b/ncurses/trace/varargs.c index 541173d2..99e4f765 100644 --- a/ncurses/trace/varargs.c +++ b/ncurses/trace/varargs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2001-2007,2008 Free Software Foundation, Inc. * + * Copyright (c) 2001-2008,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -34,7 +34,7 @@ #include -MODULE_ID("$Id: varargs.c,v 1.8 2008/11/16 00:19:59 juergen Exp $") +MODULE_ID("$Id: varargs.c,v 1.10 2012/02/22 22:40:24 tom Exp $") #ifdef TRACE @@ -149,25 +149,30 @@ _nc_varargs(const char *fmt, va_list ap) param = buffer; switch (used) { case atInteger: - sprintf(buffer, "%d", ival); + _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) + "%d", ival); break; case atFloat: - sprintf(buffer, "%f", fval); + _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) + "%f", fval); break; case atPoint: - sprintf(buffer, "%p", pval); + _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) + "%p", pval); break; case atString: param = _nc_visbuf2(1, sval); break; case atUnknown: default: - strcpy(buffer, "?"); + _nc_STRCPY(buffer, "?", sizeof(buffer)); break; } MyLength += strlen(param) + 2; MyBuffer = typeRealloc(char, MyLength, MyBuffer); - sprintf(MyBuffer + strlen(MyBuffer), ", %s", param); + _nc_SPRINTF(MyBuffer + strlen(MyBuffer), + _nc_SLIMIT(MyLength - strlen(MyBuffer)) + ", %s", param); } } used = atUnknown; diff --git a/ncurses/trace/visbuf.c b/ncurses/trace/visbuf.c index 6922d3e2..425810d6 100644 --- a/ncurses/trace/visbuf.c +++ b/ncurses/trace/visbuf.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2001-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 2001-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -42,7 +42,7 @@ #include #include -MODULE_ID("$Id: visbuf.c,v 1.38 2011/10/22 16:34:50 tom Exp $") +MODULE_ID("$Id: visbuf.c,v 1.40 2012/02/22 22:40:24 tom Exp $") #define NUM_VISBUFS 4 @@ -55,8 +55,16 @@ static const char l_brace[] = StringOf(L_BRACE); static const char r_brace[] = StringOf(R_BRACE); #endif +#if USE_STRING_HACKS && HAVE_SNPRINTF +#define VisChar(tp, chr, limit) _nc_vischar(tp, chr, limit) +#define LIMIT_ARG ,size_t limit +#else +#define VisChar(tp, chr, limit) _nc_vischar(tp, chr) +#define LIMIT_ARG /* nothing */ +#endif + static char * -_nc_vischar(char *tp, unsigned c) +_nc_vischar(char *tp, unsigned c LIMIT_ARG) { if (c == '"' || c == '\\') { *tp++ = '\\'; @@ -84,7 +92,8 @@ _nc_vischar(char *tp, unsigned c) *tp++ = '^'; *tp++ = (char) ('@' + c); } else { - sprintf(tp, "\\%03lo", (unsigned long) ChCharOf(c)); + _nc_SPRINTF(tp, _nc_SLIMIT(limit) + "\\%03lo", (unsigned long) ChCharOf(c)); tp += strlen(tp); } *tp = 0; @@ -97,6 +106,7 @@ _nc_visbuf2n(int bufnum, const char *buf, int len) const char *vbuf = 0; char *tp; int c; + int count; if (buf == 0) return ("(null)"); @@ -106,6 +116,7 @@ _nc_visbuf2n(int bufnum, const char *buf, int len) if (len < 0) len = (int) strlen(buf); + count = len; #ifdef TRACE vbuf = tp = _nc_trace_buf(bufnum, NormalLen(len)); #else @@ -124,8 +135,8 @@ _nc_visbuf2n(int bufnum, const char *buf, int len) #endif if (tp != 0) { *tp++ = D_QUOTE; - while ((--len >= 0) && (c = *buf++) != '\0') { - tp = _nc_vischar(tp, UChar(c)); + while ((--count >= 0) && (c = *buf++) != '\0') { + tp = VisChar(tp, UChar(c), NormalLen(len)); } *tp++ = D_QUOTE; *tp = '\0'; @@ -175,6 +186,7 @@ _nc_viswbuf2n(int bufnum, const wchar_t *buf, int len) const char *vbuf; char *tp; wchar_t c; + int count; if (buf == 0) return ("(null)"); @@ -182,6 +194,7 @@ _nc_viswbuf2n(int bufnum, const wchar_t *buf, int len) if (len < 0) len = (int) wcslen(buf); + count = len; #ifdef TRACE vbuf = tp = _nc_trace_buf(bufnum, WideLen(len)); #else @@ -193,15 +206,16 @@ _nc_viswbuf2n(int bufnum, const wchar_t *buf, int len) #endif if (tp != 0) { *tp++ = D_QUOTE; - while ((--len >= 0) && (c = *buf++) != '\0') { + while ((--count >= 0) && (c = *buf++) != '\0') { char temp[CCHARW_MAX + 80]; int j = wctomb(temp, c), k; if (j <= 0) { - sprintf(temp, "\\u%08X", (unsigned) c); + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) + "\\u%08X", (unsigned) c); j = (int) strlen(temp); } for (k = 0; k < j; ++k) { - tp = _nc_vischar(tp, UChar(temp[k])); + tp = VisChar(tp, UChar(temp[k]), WideLen(len)); } } *tp++ = D_QUOTE; @@ -315,7 +329,7 @@ _nc_viscbuf2(int bufnum, const NCURSES_CH_T * buf, int len) break; for (k = 0; k < PUTC_n; k++) { char temp[80]; - _nc_vischar(temp, UChar(PUTC_buf[k])); + VisChar(temp, UChar(PUTC_buf[k]), sizeof(temp)); (void) _nc_trace_bufcat(bufnum, temp); } } @@ -323,7 +337,7 @@ _nc_viscbuf2(int bufnum, const NCURSES_CH_T * buf, int len) #else { char temp[80]; - _nc_vischar(temp, UChar(buf[j])); + VisChar(temp, UChar(buf[j]), sizeof(temp)); result = _nc_trace_bufcat(bufnum, temp); } #endif /* USE_WIDEC_SUPPORT */ diff --git a/ncurses/tty/hardscroll.c b/ncurses/tty/hardscroll.c index af68c961..6c605257 100644 --- a/ncurses/tty/hardscroll.c +++ b/ncurses/tty/hardscroll.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * + * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -147,7 +147,7 @@ AUTHOR #include -MODULE_ID("$Id: hardscroll.c,v 1.47 2010/04/24 23:46:47 tom Exp $") +MODULE_ID("$Id: hardscroll.c,v 1.49 2012/02/22 22:40:24 tom Exp $") #if defined(SCROLLDEBUG) || defined(HASHDEBUG) @@ -173,9 +173,9 @@ NCURSES_EXPORT_VAR (int *) # if USE_HASHMAP # define oldnums(sp) (sp)->_oldnum_list # define OLDNUM(sp,n) oldnums(sp)[n] -# else /* !USE_HASHMAP */ +# else /* !USE_HASHMAP */ # define OLDNUM(sp,n) NewScreen(sp)->_line[n].oldindex -# endif /* !USE_HASHMAP */ +# endif /* !USE_HASHMAP */ #define OLDNUM_SIZE(sp) (sp)->_oldnum_size @@ -302,7 +302,9 @@ NCURSES_SP_NAME(_nc_linedump) (NCURSES_SP_DCL0) *buf = '\0'; for (n = 0; n < screen_lines(SP_PARM); n++) - (void) sprintf(buf + strlen(buf), " %02d", OLDNUM(SP_PARM, n)); + _nc_SPRINTF(buf + strlen(buf), + _nc_SLIMIT(want - strlen(buf)) + " %02d", OLDNUM(SP_PARM, n)); TR(TRACE_UPDATE | TRACE_MOVE, ("virt %s", buf)); free(buf); } diff --git a/panel/panel.c b/panel/panel.c index 96cbbab7..97bebca9 100644 --- a/panel/panel.c +++ b/panel/panel.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * + * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -36,7 +36,7 @@ /* panel.c -- implementation of panels library, some core routines */ #include "panel.priv.h" -MODULE_ID("$Id: panel.c,v 1.25 2010/01/23 21:22:16 tom Exp $") +MODULE_ID("$Id: panel.c,v 1.26 2012/02/23 10:02:15 tom Exp $") /*+------------------------------------------------------------------------- _nc_retrace_panel (pan) @@ -61,9 +61,9 @@ _nc_my_visbuf(const void *ptr) char temp[32]; if (ptr != 0) - sprintf(temp, "ptr:%p", ptr); + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "ptr:%p", ptr); else - strcpy(temp, ""); + _nc_STRCPY(temp, "", sizeof(temp)); return _nc_visbuf(temp); } #endif @@ -95,7 +95,7 @@ _nc_dStack(const char *fmt, int num, const PANEL * pan) GetPanelHook(pan); - sprintf(s80, fmt, num, pan); + _nc_SPRINTF(s80, _nc_SLIMIT(sizeof(s80)) fmt, num, pan); _tracef("%s b=%s t=%s", s80, (_nc_bottom_panel) ? USER_PTR(_nc_bottom_panel->user) : "--", (_nc_top_panel) ? USER_PTR(_nc_top_panel->user) : "--"); @@ -143,7 +143,7 @@ _nc_Touchline(const PANEL * pan, int start, int count) { char s80[80]; - sprintf(s80, "Touchline s=%d c=%d", start, count); + _nc_SPRINTF(s80, _nc_SLIMIT(sizeof(s80)) "Touchline s=%d c=%d", start, count); dPanel(s80, pan); touchline(pan->win, start, count); } diff --git a/progs/dump_entry.c b/progs/dump_entry.c index 12bef2c2..f62d5c17 100644 --- a/progs/dump_entry.c +++ b/progs/dump_entry.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -39,7 +39,7 @@ #include "termsort.c" /* this C file is generated */ #include /* so is this */ -MODULE_ID("$Id: dump_entry.c,v 1.95 2011/08/07 22:10:17 tom Exp $") +MODULE_ID("$Id: dump_entry.c,v 1.97 2012/02/23 00:00:08 tom Exp $") #define INDENT 8 #define DISCARD(string) string = ABSENT_STRING @@ -631,9 +631,9 @@ fmt_entry(TERMTYPE *tterm, predval = pred(BOOLEAN, i); if (predval != FAIL) { - (void) strcpy(buffer, name); + _nc_STRCAT(buffer, name, sizeof(buffer)); if (predval <= 0) - (void) strcat(buffer, "@"); + _nc_STRCAT(buffer, "@", sizeof(buffer)); else if (i + 1 > num_bools) num_bools = i + 1; WRAP_CONCAT; @@ -656,9 +656,11 @@ fmt_entry(TERMTYPE *tterm, predval = pred(NUMBER, i); if (predval != FAIL) { if (tterm->Numbers[i] < 0) { - sprintf(buffer, "%s@", name); + _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) + "%s@", name); } else { - sprintf(buffer, "%s#%d", name, tterm->Numbers[i]); + _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) + "%s#%d", name, tterm->Numbers[i]); if (i + 1 > num_values) num_values = i + 1; } @@ -719,14 +721,14 @@ fmt_entry(TERMTYPE *tterm, if (PRESENT(insert_character) || PRESENT(parm_ich)) { if (SAME_CAP(i, enter_insert_mode) && enter_insert_mode == ABSENT_STRING) { - (void) strcpy(buffer, "im="); + _nc_STRCAT(buffer, "im=", sizeof(buffer)); WRAP_CONCAT; continue; } if (SAME_CAP(i, exit_insert_mode) && exit_insert_mode == ABSENT_STRING) { - (void) strcpy(buffer, "ei="); + _nc_STRCAT(buffer, "ei=", sizeof(buffer)); WRAP_CONCAT; continue; } @@ -760,7 +762,8 @@ fmt_entry(TERMTYPE *tterm, num_strings = i + 1; if (!VALID_STRING(capability)) { - sprintf(buffer, "%s@", name); + _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) + "%s@", name); WRAP_CONCAT; } else if (outform == F_TERMCAP || outform == F_TCONVERR) { int params = ((i < (int) SIZEOF(parametrized)) @@ -771,13 +774,14 @@ fmt_entry(TERMTYPE *tterm, if (cv == 0) { if (outform == F_TCONVERR) { - sprintf(buffer, "%s=!!! %s WILL NOT CONVERT !!!", - name, srccap); + _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) + "%s=!!! %s WILL NOT CONVERT !!!", + name, srccap); } else if (suppress_untranslatable) { continue; } else { char *s = srccap, *d = buffer; - sprintf(d, "..%s=", name); + _nc_SPRINTF(d, _nc_SLIMIT(sizeof(buffer)) "..%s=", name); d += strlen(d); while ((*d = *s++) != 0) { if (*d == ':') { @@ -790,7 +794,8 @@ fmt_entry(TERMTYPE *tterm, } } } else { - sprintf(buffer, "%s=%s", name, cv); + _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) + "%s=%s", name, cv); } len += (int) strlen(capability) + 1; WRAP_CONCAT; @@ -826,11 +831,13 @@ fmt_entry(TERMTYPE *tterm, */ if (tversion == V_HPUX) { if (VALID_STRING(memory_lock)) { - (void) sprintf(buffer, "meml=%s", memory_lock); + _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) + "meml=%s", memory_lock); WRAP_CONCAT; } if (VALID_STRING(memory_unlock)) { - (void) sprintf(buffer, "memu=%s", memory_unlock); + _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) + "memu=%s", memory_unlock); WRAP_CONCAT; } } else if (tversion == V_AIX) { @@ -853,9 +860,11 @@ fmt_entry(TERMTYPE *tterm, tp[0] = '\0'; if (box_ok) { - (void) strcpy(buffer, "box1="); - (void) strcat(buffer, _nc_tic_expand(boxchars, - outform == F_TERMINFO, numbers)); + _nc_STRCAT(buffer, "box1=", sizeof(buffer)); + _nc_STRCAT(buffer, + _nc_tic_expand(boxchars, + outform == F_TERMINFO, numbers), + sizeof(buffer)); WRAP_CONCAT; } } @@ -947,7 +956,7 @@ kill_labels(TERMTYPE *tterm, int target) char name[10]; for (n = 0; n <= 10; ++n) { - sprintf(name, "lf%d", n); + _nc_SPRINTF(name, _nc_SLIMIT(sizeof(name)) "lf%d", n); if ((cap = find_string(tterm, name)) != ABSENT_STRING && kill_string(tterm, cap)) { target -= (int) (strlen(cap) + 5); @@ -972,7 +981,7 @@ kill_fkeys(TERMTYPE *tterm, int target) char name[10]; for (n = 60; n >= 0; --n) { - sprintf(name, "kf%d", n); + _nc_SPRINTF(name, _nc_SLIMIT(sizeof(name)) "kf%d", n); if ((cap = find_string(tterm, name)) != ABSENT_STRING && kill_string(tterm, cap)) { target -= (int) (strlen(cap) + 5); @@ -1165,7 +1174,8 @@ dump_uses(const char *name, bool infodump) if (outform == F_TERMCAP || outform == F_TCONVERR) trim_trailing(); - (void) sprintf(buffer, "%s%s", infodump ? "use=" : "tc=", name); + _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) + "%s%s", infodump ? "use=" : "tc=", name); wrap_concat(buffer); } diff --git a/progs/infocmp.c b/progs/infocmp.c index 7b52dded..021d8011 100644 --- a/progs/infocmp.c +++ b/progs/infocmp.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -42,7 +42,7 @@ #include -MODULE_ID("$Id: infocmp.c,v 1.110 2011/12/17 23:59:50 tom Exp $") +MODULE_ID("$Id: infocmp.c,v 1.112 2012/02/22 23:59:53 tom Exp $") #define L_CURL "{" #define R_CURL "}" @@ -107,7 +107,7 @@ canonical_name(char *ptr, char *buf) { char *bp; - (void) strcpy(buf, ptr); + _nc_STRCPY(buf, ptr, NAMESIZE); if ((bp = strchr(buf, '|')) != 0) *bp = '\0'; @@ -308,13 +308,13 @@ dump_numeric(int val, char *buf) { switch (val) { case ABSENT_NUMERIC: - strcpy(buf, s_absent); + _nc_STRCPY(buf, s_absent, MAX_STRING); break; case CANCELLED_NUMERIC: - strcpy(buf, s_cancel); + _nc_STRCPY(buf, s_cancel, MAX_STRING); break; default: - sprintf(buf, "%d", val); + _nc_SPRINTF(buf, _nc_SLIMIT(MAX_STRING) "%d", val); break; } } @@ -324,11 +324,12 @@ dump_string(char *val, char *buf) /* display the value of a string capability */ { if (val == ABSENT_STRING) - strcpy(buf, s_absent); + _nc_STRCPY(buf, s_absent, MAX_STRING); else if (val == CANCELLED_STRING) - strcpy(buf, s_cancel); + _nc_STRCPY(buf, s_cancel, MAX_STRING); else { - sprintf(buf, "'%.*s'", MAX_STRING - 3, TIC_EXPAND(val)); + _nc_SPRINTF(buf, _nc_SLIMIT(MAX_STRING) + "'%.*s'", MAX_STRING - 3, TIC_EXPAND(val)); } } @@ -582,15 +583,15 @@ lookup_params(const assoc * table, char *dst, char *src) size_t tlen = strlen(ap->from); if (same_param(ap->from, ep, tlen)) { - (void) strcat(dst, ap->to); + _nc_STRCAT(dst, ap->to, MAX_TERMINFO_LENGTH); found = TRUE; break; } } if (!found) - (void) strcat(dst, ep); - (void) strcat(dst, ";"); + _nc_STRCAT(dst, ep, MAX_TERMINFO_LENGTH); + _nc_STRCAT(dst, ";", MAX_TERMINFO_LENGTH); } while ((ep = strtok((char *) 0, ";"))); @@ -683,7 +684,11 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp) && (next = (size_t) csi + len) && ((sp[next] == 'h') || (sp[next] == 'l'))) { - (void) strcpy(buf2, (sp[next] == 'h') ? "ECMA+" : "ECMA-"); + _nc_STRCPY(buf2, + ((sp[next] == 'h') + ? "ECMA+" + : "ECMA-"), + sizeof(buf2)); (void) strncpy(buf3, sp + csi, len); buf3[len] = '\0'; len += (size_t) csi + 1; @@ -700,7 +705,11 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp) && (next = (size_t) csi + 1 + len) && ((sp[next] == 'h') || (sp[next] == 'l'))) { - (void) strcpy(buf2, (sp[next] == 'h') ? "DEC+" : "DEC-"); + _nc_STRCPY(buf2, + ((sp[next] == 'h') + ? "DEC+" + : "DEC-"), + sizeof(buf2)); (void) strncpy(buf3, sp + csi + 1, len); buf3[len] = '\0'; len += (size_t) csi + 2; @@ -716,7 +725,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp) && (next = (size_t) csi + len) && sp[next] == 'm') { - (void) strcpy(buf2, "SGR:"); + _nc_STRCPY(buf2, "SGR:", sizeof(buf2)); (void) strncpy(buf3, sp + csi, len); buf3[len] = '\0'; len += (size_t) csi + 1; @@ -728,8 +737,8 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp) && (csi = skip_csi(sp)) != 0 && sp[csi] == 'm') { len = (size_t) csi + 1; - (void) strcpy(buf2, "SGR:"); - strcat(buf2, ecma_highlights[0].to); + _nc_STRCPY(buf2, "SGR:", sizeof(buf2)); + _nc_STRCAT(buf2, ecma_highlights[0].to, sizeof(buf2)); expansion = buf2; } @@ -740,7 +749,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp) expansion = "RSR"; len = 1; } else { - (void) sprintf(buf2, "1;%dr", tp_lines); + _nc_SPRINTF(buf2, _nc_SLIMIT(sizeof(buf2)) "1;%dr", tp_lines); len = strlen(buf2); if (strncmp(buf2, sp + csi, len) == 0) expansion = "RSR"; @@ -751,12 +760,12 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp) /* now check for home-down */ if (!expansion && (csi = skip_csi(sp)) != 0) { - (void) sprintf(buf2, "%d;1H", tp_lines); + _nc_SPRINTF(buf2, _nc_SLIMIT(sizeof(buf2)) "%d;1H", tp_lines); len = strlen(buf2); if (strncmp(buf2, sp + csi, len) == 0) { expansion = "LL"; } else { - (void) sprintf(buf2, "%dH", tp_lines); + _nc_SPRINTF(buf2, _nc_SLIMIT(sizeof(buf2)) "%dH", tp_lines); len = strlen(buf2); if (strncmp(buf2, sp + csi, len) == 0) { expansion = "LL"; @@ -1033,19 +1042,23 @@ static char * any_initializer(const char *fmt, const char *type) { static char *initializer; + static size_t need; char *s; - if (initializer == 0) - initializer = (char *) malloc(strlen(entries->tterm.term_names) + - strlen(type) + strlen(fmt)); + if (initializer == 0) { + need = (strlen(entries->tterm.term_names) + + strlen(type) + + strlen(fmt)); + initializer = (char *) malloc(need); + } - (void) strcpy(initializer, entries->tterm.term_names); + _nc_STRCPY(initializer, entries->tterm.term_names, need); for (s = initializer; *s != 0 && *s != '|'; s++) { if (!isalnum(UChar(*s))) *s = '_'; } *s = 0; - (void) sprintf(s, fmt, type); + _nc_SPRINTF(s, _nc_SLIMIT(need) fmt, type); return initializer; } @@ -1086,7 +1099,7 @@ dump_initializers(TERMTYPE *term) && *sp != '"') *tp++ = *sp; else { - (void) sprintf(tp, "\\%03o", UChar(*sp)); + _nc_SPRINTF(tp, _nc_SLIMIT(MAX_STRING) "\\%03o", UChar(*sp)); tp += 4; } } @@ -1136,7 +1149,7 @@ dump_initializers(TERMTYPE *term) str = "CANCELLED_NUMERIC"; break; default: - sprintf(buf, "%d", term->Numbers[n]); + _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) "%d", term->Numbers[n]); str = buf; break; } @@ -1542,9 +1555,11 @@ main(int argc, char *argv[]) #else #define LEAF_FMT "%02x" #endif - (void) sprintf(tfile[termcount], "%s/" LEAF_FMT "/%s", - directory, - UChar(*argv[optind]), argv[optind]); + _nc_SPRINTF(tfile[termcount], + _nc_SLIMIT(sizeof(path)) + "%s/" LEAF_FMT "/%s", + directory, + UChar(*argv[optind]), argv[optind]); if (itrace) (void) fprintf(stderr, "%s: reading entry %s from file %s\n", diff --git a/progs/progs.priv.h b/progs/progs.priv.h index 63ff9a7b..3ead89f8 100644 --- a/progs/progs.priv.h +++ b/progs/progs.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2008,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -30,7 +30,7 @@ * Author: Thomas E. Dickey 1997-on * ****************************************************************************/ /* - * $Id: progs.priv.h,v 1.36 2011/06/26 09:31:22 tom Exp $ + * $Id: progs.priv.h,v 1.39 2012/02/22 22:11:27 tom Exp $ * * progs.priv.h * @@ -42,7 +42,7 @@ #if USE_RCS_IDS #define MODULE_ID(id) static const char Ident[] = id; #else -#define MODULE_ID(id) /*nothing*/ +#define MODULE_ID(id) /*nothing */ #endif #include @@ -90,6 +90,14 @@ # endif #endif +#if HAVE_INTTYPES_H +# include +#else +# if HAVE_STDINT_H +# include +# endif +#endif + #include #include @@ -113,6 +121,7 @@ extern int optind; #include #include +#include #include #if HAVE_NC_FREEALL #undef ExitProgram @@ -172,7 +181,7 @@ extern int optind; # elif defined(MAXPATHLEN) # define PATH_MAX MAXPATHLEN # else -# define PATH_MAX 255 /* the Posix minimum pathsize */ +# define PATH_MAX 255 /* the Posix minimum pathsize */ # endif #endif @@ -184,7 +193,7 @@ extern int optind; # if ('z'-'a' == 25) && ('z' < 127) && ('Z'-'A' == 25) && ('Z' < 127) && ('9' < 127) # define isascii(c) (UChar(c) <= 127) # else -# define isascii(c) 1 /* not really ascii anyway */ +# define isascii(c) 1 /* not really ascii anyway */ # endif #endif diff --git a/progs/tabs.c b/progs/tabs.c index 2f6915de..88bbf2ed 100644 --- a/progs/tabs.c +++ b/progs/tabs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2008-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 2008-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -37,7 +37,7 @@ #define USE_LIBTINFO #include -MODULE_ID("$Id: tabs.c,v 1.21 2011/05/21 18:31:21 tom Exp $") +MODULE_ID("$Id: tabs.c,v 1.23 2012/02/22 23:57:44 tom Exp $") static void usage(void) GCC_NORETURN; @@ -140,10 +140,11 @@ print_ruler(int *tab_list) for (n = 0; n < max_cols; n += 10) { int ch = 1 + (n / 10); char buffer[20]; - sprintf(buffer, "----+----%c", - ((ch < 10) - ? (ch + '0') - : (ch + 'A' - 10))); + _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) + "----+----%c", + ((ch < 10) + ? (ch + '0') + : (ch + 'A' - 10))); printf("%.*s", ((max_cols - n) > 10) ? 10 : (max_cols - n), buffer); } putchar('\n'); @@ -266,11 +267,11 @@ add_to_tab_list(char **append, const char *value) if (result != 0) { *result = '\0'; if (*append != 0) { - strcpy(result, *append); + _nc_STRCPY(result, *append, need); free(*append); } - strcat(result, comma); - strcat(result, copied); + _nc_STRCAT(result, comma, need); + _nc_STRCAT(result, copied, need); } *append = result; diff --git a/progs/tic.c b/progs/tic.c index aa38840e..53fa7225 100644 --- a/progs/tic.c +++ b/progs/tic.c @@ -46,7 +46,7 @@ #include #include -MODULE_ID("$Id: tic.c,v 1.160 2012/02/05 01:39:39 tom Exp $") +MODULE_ID("$Id: tic.c,v 1.162 2012/02/22 23:59:45 tom Exp $") const char *_nc_progname = "tic"; @@ -222,7 +222,7 @@ write_it(ENTRY * ep) } *d = 0; if (strlen(result) < strlen(s)) - strcpy(s, result); + _nc_STRCPY(s, result, strlen(s) + 1); } } @@ -314,7 +314,7 @@ put_translate(int c) if ((up = strchr(namebuf, '#')) != 0 || (up = strchr(namebuf, '=')) != 0 || ((up = strchr(namebuf, '@')) != 0 && up[1] == '>')) { - (void) strcpy(suffix, up); + _nc_STRCPY(suffix, up, have); *up = '\0'; } @@ -486,9 +486,9 @@ valid_db_path(const char *nominal) size_t need = strlen(nominal) + sizeof(suffix); char *result = malloc(need); - strcpy(result, nominal); + _nc_STRCPY(result, nominal, need); if (strcmp(result + need - sizeof(suffix), suffix)) { - strcat(result, suffix); + _nc_STRCAT(result, suffix, need); } #else char *result = strdup(nominal); @@ -795,16 +795,19 @@ main(int argc, char *argv[]) if (access(termcap, F_OK) == 0) { /* file exists */ source_file = termcap; - } else if ((tmp_fp = open_tempfile(strcpy(my_tmpname, - "/tmp/XXXXXX"))) - != 0) { - source_file = my_tmpname; - fprintf(tmp_fp, "%s\n", termcap); - fclose(tmp_fp); - tmp_fp = open_input(source_file); - to_remove = source_file; } else { - failed("tmpnam"); + _nc_STRCPY(my_tmpname, + "/tmp/XXXXXX", + sizeof(my_tmpname)); + if ((tmp_fp = open_tempfile(my_tmpname)) != 0) { + source_file = my_tmpname; + fprintf(tmp_fp, "%s\n", termcap); + fclose(tmp_fp); + tmp_fp = open_input(source_file); + to_remove = source_file; + } else { + failed("tmpnam"); + } } } } else { @@ -1281,19 +1284,19 @@ check_keypad(TERMTYPE *tp) assert(strlen(show) < (MAX_KP * 4)); switch (kk) { case 0: - strcat(show, " ka1"); + _nc_STRCAT(show, " ka1", sizeof(show)); break; case 1: - strcat(show, " ka3"); + _nc_STRCAT(show, " ka3", sizeof(show)); break; case 2: - strcat(show, " kb2"); + _nc_STRCAT(show, " kb2", sizeof(show)); break; case 3: - strcat(show, " kc1"); + _nc_STRCAT(show, " kc1", sizeof(show)); break; case 4: - strcat(show, " kc3"); + _nc_STRCAT(show, " kc3", sizeof(show)); break; } } @@ -1308,15 +1311,15 @@ check_keypad(TERMTYPE *tp) VALID_STRING(key_c3)) { show[0] = '\0'; if (keypad_index(key_a1) >= 0) - strcat(show, " ka1"); + _nc_STRCAT(show, " ka1", sizeof(show)); if (keypad_index(key_a3) >= 0) - strcat(show, " ka3"); + _nc_STRCAT(show, " ka3", sizeof(show)); if (keypad_index(key_b2) >= 0) - strcat(show, " kb2"); + _nc_STRCAT(show, " kb2", sizeof(show)); if (keypad_index(key_c1) >= 0) - strcat(show, " kc1"); + _nc_STRCAT(show, " kc1", sizeof(show)); if (keypad_index(key_c3) >= 0) - strcat(show, " kc3"); + _nc_STRCAT(show, " kc3", sizeof(show)); if (*show != '\0') _nc_warning("vt100 keypad map incomplete:%s", show); } diff --git a/progs/toe.c b/progs/toe.c index 34216e95..a5cf8bb8 100644 --- a/progs/toe.c +++ b/progs/toe.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -44,7 +44,7 @@ #include #endif -MODULE_ID("$Id: toe.c,v 1.64 2012/01/01 02:56:17 tom Exp $") +MODULE_ID("$Id: toe.c,v 1.66 2012/02/22 23:57:44 tom Exp $") #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, "..")) @@ -236,10 +236,11 @@ make_db_name(char *dst, const char *src, unsigned limit) if (need <= limit) { if (size >= lens - && !strcmp(src + size - lens, suffix)) - (void) strcpy(dst, src); - else - (void) sprintf(dst, "%s%s", src, suffix); + && !strcmp(src + size - lens, suffix)) { + _nc_STRCPY(dst, src, PATH_MAX); + } else { + _nc_SPRINTF(dst, _nc_SLIMIT(PATH_MAX) "%s%s", src, suffix); + } result = TRUE; } return result; @@ -387,7 +388,8 @@ typelist(int eargc, char *eargv[], if (isDotname(name_1)) continue; - (void) sprintf(cwd_buf, "%s/%.*s/", eargv[i], (int) len, name_1); + _nc_SPRINTF(cwd_buf, _nc_SLIMIT(cwd_len) + "%s/%.*s/", eargv[i], (int) len, name_1); if (chdir(cwd_buf) != 0) continue; diff --git a/progs/tset.c b/progs/tset.c index 2ee9c119..bf3bf192 100644 --- a/progs/tset.c +++ b/progs/tset.c @@ -119,7 +119,7 @@ char *ttyname(int fd); #include #include -MODULE_ID("$Id: tset.c,v 1.87 2012/01/21 23:55:05 tom Exp $") +MODULE_ID("$Id: tset.c,v 1.89 2012/02/22 22:50:47 tom Exp $") /* * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, @@ -213,10 +213,10 @@ failed(const char *msg) size_t len = strlen(_nc_progname) + 2; if ((int) len < (int) sizeof(temp) - 12) { - strcpy(temp, _nc_progname); - strcat(temp, ": "); + _nc_STRCPY(temp, _nc_progname, sizeof(temp)); + _nc_STRCAT(temp, ": ", sizeof(temp)); } else { - strcpy(temp, "tset: "); + _nc_STRCPY(temp, "tset: ", sizeof(temp)); } perror(strncat(temp, msg, sizeof(temp) - strlen(temp) - 2)); exit_error();