# vile 9.5n # patch by Thomas E. Dickey <dickey@invisible-island.net> # created Tue Jan 9 01:07:29 UTC 2007 # ------------------------------------------------------------------------------ # CHANGES | 19 # MANIFEST | 2 # aclocal.m4 | 100 + # buffer.c | 29 # configure | 3976 +++++++++++++++++++++++++++----------------------- # configure.in | 27 # edef.h | 4 # eval.c | 3 # filters/iss-filt.l | 51 # filters/iss.key | 19 # filters/m4-filt.c | 32 # filters/sh-filt.l | 5 # input.c | 18 # macros/modes.rc | 7 # macros/vileinit.rc | 8 # main.c | 48 # modes.c | 15 # package/winvile.iss | 286 +++ # patchlev.h | 6 # path.c | 6 # proto.h | 7 # random.c | 9 # revlist | 56 # statevar.c | 12 # vile-9.5.spec | 9 # vile.1 | 6 # w32reg.c | 11 # window.c | 4 # 28 files changed, 2811 insertions(+), 1964 deletions(-) # ------------------------------------------------------------------------------ Index: CHANGES --- vile-9.5m+/CHANGES 2006-12-13 01:31:20.000000000 +0000 +++ vile-9.5n/CHANGES 2007-01-08 23:30:04.000000000 +0000 @@ -1,5 +1,24 @@ Changes for vile 9.6 (released ??? ??? ?? ????) + 20070108 (n) + > Tom Dickey: + + add a character-class check to find_b_file() to prevent names such + as "<vile.1>" from being canonicalized into "vile.1" on win32 via + FindFirstFile(). This fixes a problem where ^X-n would sometimes + display the wrong buffer. + + add shifted-cursor-key bindings for winvile, like xterm. + + amend cursor-tokens mode so that ^X-e in a directory-buffer always + uses the whole line (no regular expressions). + + fix a null-pointer dereference in the cursor-tokens mode. + + minor fix to sh-filt.l to handle lines like + : ${BUILD_CC:='${CC}'} + + improve iss-flt.l to highlight preprocessor lines. + + improve winvile.iss (Inno Setup): + + use values in patchlev.h to set the package version information. + + add context menu and Send To shortcuts + + install the keyword files + + add configure --with-valgrind option. + 20061212 (m) > Tom Dickey: + add showvariables mode, for testing expressions used in [Variables]. Index: MANIFEST --- vile-9.5m+/MANIFEST 2006-12-14 01:05:53.000000000 +0000 +++ vile-9.5n/MANIFEST 2007-01-09 01:05:04.000000000 +0000 @@ -1,4 +1,4 @@ -MANIFEST for vile, version v9_5m +MANIFEST for vile, version v9_5n -------------------------------------------------------------------------------- MANIFEST this file CHANGES Change-log for VILE Index: aclocal.m4 Prereq: 1.167 --- vile-9.5m+/aclocal.m4 2006-12-01 20:45:29.000000000 +0000 +++ vile-9.5n/aclocal.m4 2006-12-16 19:24:05.000000000 +0000 @@ -1,6 +1,6 @@ dnl vile's local definitions for autoconf. dnl -dnl $Header: /usr/build/vile/vile/RCS/aclocal.m4,v 1.167 2006/12/01 20:45:29 tom Exp $ +dnl $Header: /usr/build/vile/vile/RCS/aclocal.m4,v 1.169 2006/12/16 19:24:05 tom Exp $ dnl dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- @@ -1791,7 +1791,7 @@ done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MKSTEMP version: 3 updated: 2001/11/08 20:59:59 +dnl CF_MKSTEMP version: 5 updated: 2006/12/16 12:33:30 dnl ---------- dnl Check for a working mkstemp. This creates two files, checks that they are dnl successfully created and distinct (AmigaOS apparently fails on the last). @@ -1829,7 +1829,7 @@ if (result == 0 && !strcmp(name[0], name[1])) result = 1; - exit(result); + ${cf_cv_main_return:-return}(result); } ],[cf_cv_func_mkstemp=yes ],[cf_cv_func_mkstemp=no @@ -2167,6 +2167,35 @@ test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_NO_LEAKS_OPTION version: 4 updated: 2006/12/16 14:24:05 +dnl ------------------ +dnl see CF_WITH_NO_LEAKS +AC_DEFUN([CF_NO_LEAKS_OPTION],[ +AC_MSG_CHECKING(if you want to use $1 for testing) +AC_ARG_WITH($1, + [$2], + [AC_DEFINE($3)ifelse([$4],,[ + $4 +]) + : ${with_cflags:=-g} + : ${with_no_leaks:=yes} + with_$1=yes], + [with_$1=]) +AC_MSG_RESULT(${with_$1:-no}) + +case .$with_cflags in #(vi +.*-g*) + case .$CFLAGS in #(vi + .*-g*) #(vi + ;; + *) + CF_ADD_CFLAGS([-g]) + ;; + esac + ;; +esac +])dnl +dnl --------------------------------------------------------------------------- dnl CF_OUTPUT_IF_CHANGED version: 2 updated: 1997/09/07 18:53:59 dnl -------------------- dnl Within AC_OUTPUT, check if the given file differs from the target, and @@ -2983,34 +3012,30 @@ [cf_cv_curses_dir=no]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_DBMALLOC version: 4 updated: 2004/02/28 05:49:27 +dnl CF_WITH_DBMALLOC version: 6 updated: 2006/12/16 14:24:05 dnl ---------------- dnl Configure-option for dbmalloc. The optional parameter is used to override dnl the updating of $LIBS, e.g., to avoid conflict with subsequent tests. AC_DEFUN([CF_WITH_DBMALLOC],[ -AC_MSG_CHECKING(if you want to link with dbmalloc for testing) -AC_ARG_WITH(dbmalloc, - [ --with-dbmalloc use Conor Cahill's dbmalloc library], - [with_dbmalloc=$withval], - [with_dbmalloc=no]) -AC_MSG_RESULT($with_dbmalloc) +CF_NO_LEAKS_OPTION(dbmalloc, + [ --with-dbmalloc test: use Conor Cahill's dbmalloc library], + [USE_DBMALLOC]) + if test "$with_dbmalloc" = yes ; then AC_CHECK_HEADER(dbmalloc.h, [AC_CHECK_LIB(dbmalloc,[debug_malloc]ifelse($1,,[],[,$1]))]) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_DMALLOC version: 4 updated: 2004/02/28 05:49:27 +dnl CF_WITH_DMALLOC version: 6 updated: 2006/12/16 14:24:05 dnl --------------- dnl Configure-option for dmalloc. The optional parameter is used to override dnl the updating of $LIBS, e.g., to avoid conflict with subsequent tests. AC_DEFUN([CF_WITH_DMALLOC],[ -AC_MSG_CHECKING(if you want to link with dmalloc for testing) -AC_ARG_WITH(dmalloc, - [ --with-dmalloc use Gray Watson's dmalloc library], - [with_dmalloc=$withval], - [with_dmalloc=no]) -AC_MSG_RESULT($with_dmalloc) +CF_NO_LEAKS_OPTION(dmalloc, + [ --with-dmalloc test: use Gray Watson's dmalloc library], + [USE_DMALLOC]) + if test "$with_dmalloc" = yes ; then AC_CHECK_HEADER(dmalloc.h, [AC_CHECK_LIB(dmalloc,[dmalloc_debug]ifelse($1,,[],[,$1]))]) @@ -3093,6 +3118,29 @@ fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_WITH_NO_LEAKS version: 1 updated: 2006/12/14 18:00:21 +dnl ---------------- +AC_DEFUN([CF_WITH_NO_LEAKS],[ + +AC_REQUIRE([CF_WITH_DMALLOC]) +AC_REQUIRE([CF_WITH_DBMALLOC]) +AC_REQUIRE([CF_WITH_PURIFY]) +AC_REQUIRE([CF_WITH_VALGRIND]) + +AC_MSG_CHECKING(if you want to perform memory-leak testing) +AC_ARG_WITH(no-leaks, + [ --with-no-leaks test: free permanent memory, analyze leaks], + [AC_DEFINE(NO_LEAKS) + cf_doalloc=".${with_dmalloc}${with_dbmalloc}${with_purify}${with_valgrind}" + case ${cf_doalloc} in #(vi + *yes*) ;; + *) AC_DEFINE(DOALLOC,10000) ;; + esac + with_no_leaks=yes], + [with_no_leaks=]) +AC_MSG_RESULT($with_no_leaks) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_WITH_PATHLIST version: 5 updated: 2001/12/10 01:28:30 dnl ---------------- dnl Process an option specifying a list of colon-separated paths. @@ -3135,6 +3183,24 @@ ])dnl dnl --------------------------------------------------------------------------- +dnl CF_WITH_PURIFY version: 2 updated: 2006/12/14 18:43:43 +dnl -------------- +AC_DEFUN([CF_WITH_PURIFY],[ +CF_NO_LEAKS_OPTION(purify, + [ --with-purify test: use Purify], + [USE_PURIFY], + [LINK_PREFIX="$LINK_PREFIX purify"]) +AC_SUBST(LINK_PREFIX) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21 +dnl ---------------- +AC_DEFUN([CF_WITH_VALGRIND],[ +CF_NO_LEAKS_OPTION(valgrind, + [ --with-valgrind test: use valgrind], + [USE_VALGRIND]) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_WITH_WARNINGS version: 5 updated: 2004/07/23 14:40:34 dnl ---------------- dnl Combine the checks for gcc features into a configure-script option Index: buffer.c Prereq: 1.312 --- vile-9.5m+/buffer.c 2006-12-03 16:48:16.000000000 +0000 +++ vile-9.5n/buffer.c 2007-01-08 23:23:30.000000000 +0000 @@ -5,7 +5,7 @@ * keys. Like everyone else, they set hints * for the display system. * - * $Header: /usr/build/vile/vile/RCS/buffer.c,v 1.312 2006/12/03 16:48:16 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/buffer.c,v 1.313 2007/01/08 23:23:30 tom Exp $ * */ @@ -138,6 +138,23 @@ } /* + * Check if the given string contains only pathname-characters. + */ +static int +is_pathchars(const char *fname) +{ + int result = TRUE; + int empty = TRUE; + while (*fname != EOS) { + if (!ispath(CharOf(*fname))) + break; + empty = FALSE; + ++fname; + } + return result && !empty; +} + +/* * Look for a filename in the buffer-list */ BUFFER * @@ -146,10 +163,12 @@ BUFFER *bp; char nfname[NFILEN]; - (void) lengthen_path(vl_strncpy(nfname, fname, sizeof(nfname))); - for_each_buffer(bp) { - if (same_fname(nfname, bp, FALSE)) - return bp; + if (is_pathchars(fname)) { + (void) lengthen_path(vl_strncpy(nfname, fname, sizeof(nfname))); + for_each_buffer(bp) { + if (same_fname(nfname, bp, FALSE)) + return bp; + } } return 0; } Index: configure --- vile-9.5m+/configure 2006-12-01 21:34:27.000000000 +0000 +++ vile-9.5n/configure 2006-12-21 15:38:19.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Revision: 1.225 . +# From configure.in Revision: 1.227 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20030208. +# Generated by Autoconf 2.52.20061216. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -717,11 +717,12 @@ --disable-largefile omit support for large files --with-locale use i18n support for character-types --with-iconv use iconv() support for character-types - --with-dbmalloc use Conor Cahill's dbmalloc library - --with-dmalloc use Gray Watson's dmalloc library + --with-dmalloc test: use Gray Watson's dmalloc library + --with-dbmalloc test: use Conor Cahill's dbmalloc library --with-purify test: use Purify - --with-fakevms test: use fake VMS I/O module + --with-valgrind test: use valgrind --with-no-leaks test: free permanent memory, analyze leaks + --with-fakevms test: use fake VMS I/O module --with-trace test: turn on debug-tracing --with-warnings test: turn on gcc warnings @@ -793,7 +794,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52.20030208. Invocation command line was +generated by GNU Autoconf 2.52.20061216. Invocation command line was $ $0 $@ @@ -917,7 +918,7 @@ fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:920: loading site script $ac_site_file" >&5 + { echo "$as_me:921: 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" @@ -928,7 +929,7 @@ # 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:931: loading cache $cache_file" >&5 + { echo "$as_me:932: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -936,7 +937,7 @@ esac fi else - { echo "$as_me:939: creating cache $cache_file" >&5 + { echo "$as_me:940: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -952,21 +953,21 @@ eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:955: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:956: 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:959: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:960: 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:965: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:966: 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:967: former value: $ac_old_val" >&5 + { echo "$as_me:968: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:969: current value: $ac_new_val" >&5 + { echo "$as_me:970: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -985,9 +986,9 @@ fi done if $ac_cache_corrupted; then - { echo "$as_me:988: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:989: 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:990: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:991: 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 @@ -997,6 +998,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 case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in *c*,-n*) ECHO_N= ECHO_C=' @@ -1007,10 +1009,10 @@ echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1010: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1012: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1013: \$? = $ac_status" >&5 + echo "$as_me:1015: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -1038,7 +1040,7 @@ fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1041: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1043: 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 @@ -1048,11 +1050,11 @@ # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1051: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1053: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1055: checking build system type" >&5 +echo "$as_me:1057: 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 @@ -1061,16 +1063,16 @@ test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1064: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1066: 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:1068: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1070: 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:1073: result: $ac_cv_build" >&5 +echo "$as_me:1075: 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/'` @@ -1078,7 +1080,7 @@ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then - echo "$as_me:1081: checking host system type" >&5 + echo "$as_me:1083: 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 @@ -1087,12 +1089,12 @@ 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:1090: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1092: 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:1095: result: $ac_cv_host" >&5 +echo "$as_me:1097: 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/'` @@ -1117,13 +1119,13 @@ fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1120: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1122: 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:1124: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1126: 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:1126: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1128: 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 @@ -1134,10 +1136,11 @@ 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 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:1140: checking for $ac_word" >&5 +echo "$as_me:1143: 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 @@ -1152,7 +1155,7 @@ 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:1155: found $ac_dir/$ac_word" >&5 +echo "$as_me:1158: found $ac_dir/$ac_word" >&5 break done @@ -1160,10 +1163,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1163: result: $CC" >&5 + echo "$as_me:1166: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1166: result: no" >&5 + echo "$as_me:1169: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1172,7 +1175,7 @@ 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:1175: checking for $ac_word" >&5 +echo "$as_me:1178: 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 @@ -1187,7 +1190,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1190: found $ac_dir/$ac_word" >&5 +echo "$as_me:1193: found $ac_dir/$ac_word" >&5 break done @@ -1195,10 +1198,10 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1198: result: $ac_ct_CC" >&5 + echo "$as_me:1201: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1201: result: no" >&5 + echo "$as_me:1204: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1211,7 +1214,7 @@ 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:1214: checking for $ac_word" >&5 +echo "$as_me:1217: 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 @@ -1226,7 +1229,7 @@ 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:1229: found $ac_dir/$ac_word" >&5 +echo "$as_me:1232: found $ac_dir/$ac_word" >&5 break done @@ -1234,10 +1237,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1237: result: $CC" >&5 + echo "$as_me:1240: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1240: result: no" >&5 + echo "$as_me:1243: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1246,7 +1249,7 @@ 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:1249: checking for $ac_word" >&5 +echo "$as_me:1252: 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 @@ -1261,7 +1264,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1264: found $ac_dir/$ac_word" >&5 +echo "$as_me:1267: found $ac_dir/$ac_word" >&5 break done @@ -1269,10 +1272,10 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1272: result: $ac_ct_CC" >&5 + echo "$as_me:1275: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1275: result: no" >&5 + echo "$as_me:1278: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1285,7 +1288,7 @@ 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:1288: checking for $ac_word" >&5 +echo "$as_me:1291: 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 @@ -1305,7 +1308,7 @@ continue fi ac_cv_prog_CC="cc" -echo "$as_me:1308: found $ac_dir/$ac_word" >&5 +echo "$as_me:1311: found $ac_dir/$ac_word" >&5 break done @@ -1327,10 +1330,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1330: result: $CC" >&5 + echo "$as_me:1333: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1333: result: no" >&5 + echo "$as_me:1336: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1341,7 +1344,7 @@ 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:1344: checking for $ac_word" >&5 +echo "$as_me:1347: 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 @@ -1356,7 +1359,7 @@ 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:1359: found $ac_dir/$ac_word" >&5 +echo "$as_me:1362: found $ac_dir/$ac_word" >&5 break done @@ -1364,10 +1367,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1367: result: $CC" >&5 + echo "$as_me:1370: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1370: result: no" >&5 + echo "$as_me:1373: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1380,7 +1383,7 @@ 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:1383: checking for $ac_word" >&5 +echo "$as_me:1386: 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 @@ -1395,7 +1398,7 @@ 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:1398: found $ac_dir/$ac_word" >&5 +echo "$as_me:1401: found $ac_dir/$ac_word" >&5 break done @@ -1403,10 +1406,10 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1406: result: $ac_ct_CC" >&5 + echo "$as_me:1409: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1409: result: no" >&5 + echo "$as_me:1412: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1418,32 +1421,32 @@ fi -test -z "$CC" && { { echo "$as_me:1421: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1424: 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:1426:" \ +echo "$as_me:1429:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1429: \"$ac_compiler --version </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1432: \"$ac_compiler --version </dev/null >&5\"") >&5 (eval $ac_compiler --version </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1432: \$? = $ac_status" >&5 + echo "$as_me:1435: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1434: \"$ac_compiler -v </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1437: \"$ac_compiler -v </dev/null >&5\"") >&5 (eval $ac_compiler -v </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1437: \$? = $ac_status" >&5 + echo "$as_me:1440: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1439: \"$ac_compiler -V </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1442: \"$ac_compiler -V </dev/null >&5\"") >&5 (eval $ac_compiler -V </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1442: \$? = $ac_status" >&5 + echo "$as_me:1445: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1446 "configure" +#line 1449 "configure" #include "confdefs.h" int @@ -1459,13 +1462,13 @@ # 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:1462: checking for C compiler default output" >&5 +echo "$as_me:1465: 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:1465: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1468: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1468: \$? = $ac_status" >&5 + echo "$as_me:1471: \$? = $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 @@ -1488,34 +1491,34 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1491: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1494: 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:1497: result: $ac_file" >&5 +echo "$as_me:1500: 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:1502: checking whether the C compiler works" >&5 +echo "$as_me:1505: 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:1508: \"$ac_try\"") >&5 + { (eval echo "$as_me:1511: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1511: \$? = $ac_status" >&5 + echo "$as_me:1514: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1518: error: cannot run C compiled programs. + { { echo "$as_me:1521: 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;} @@ -1523,24 +1526,24 @@ fi fi fi -echo "$as_me:1526: result: yes" >&5 +echo "$as_me:1529: 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:1533: checking whether we are cross compiling" >&5 +echo "$as_me:1536: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1535: result: $cross_compiling" >&5 +echo "$as_me:1538: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1538: checking for executable suffix" >&5 +echo "$as_me:1541: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1540: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1543: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1543: \$? = $ac_status" >&5 + echo "$as_me:1546: \$? = $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 @@ -1556,25 +1559,25 @@ esac done else - { { echo "$as_me:1559: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1562: 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:1565: result: $ac_cv_exeext" >&5 +echo "$as_me:1568: 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:1571: checking for object suffix" >&5 +echo "$as_me:1574: 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 1577 "configure" +#line 1580 "configure" #include "confdefs.h" int @@ -1586,10 +1589,10 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1589: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1592: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1592: \$? = $ac_status" >&5 + echo "$as_me:1595: \$? = $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 @@ -1601,24 +1604,24 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1604: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1607: 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:1611: result: $ac_cv_objext" >&5 +echo "$as_me:1614: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1615: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1618: 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 1621 "configure" +#line 1624 "configure" #include "confdefs.h" int @@ -1633,16 +1636,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1636: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1639: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1639: \$? = $ac_status" >&5 + echo "$as_me:1642: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1642: \"$ac_try\"") >&5 + { (eval echo "$as_me:1645: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1645: \$? = $ac_status" >&5 + echo "$as_me:1648: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1654,19 +1657,19 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1657: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1660: 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:1663: checking whether $CC accepts -g" >&5 +echo "$as_me:1666: 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 1669 "configure" +#line 1672 "configure" #include "confdefs.h" int @@ -1678,16 +1681,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1681: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1684: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1684: \$? = $ac_status" >&5 + echo "$as_me:1687: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1687: \"$ac_try\"") >&5 + { (eval echo "$as_me:1690: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1690: \$? = $ac_status" >&5 + echo "$as_me:1693: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1697,7 +1700,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1700: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1703: 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 @@ -1724,16 +1727,16 @@ #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1727: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1730: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1730: \$? = $ac_status" >&5 + echo "$as_me:1733: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1733: \"$ac_try\"") >&5 + { (eval echo "$as_me:1736: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1736: \$? = $ac_status" >&5 + echo "$as_me:1739: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1745,7 +1748,7 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1748 "configure" +#line 1751 "configure" #include "confdefs.h" #include <stdlib.h> $ac_declaration @@ -1758,16 +1761,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1761: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1764: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1764: \$? = $ac_status" >&5 + echo "$as_me:1767: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1767: \"$ac_try\"") >&5 + { (eval echo "$as_me:1770: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1770: \$? = $ac_status" >&5 + echo "$as_me:1773: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1777,7 +1780,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1780 "configure" +#line 1783 "configure" #include "confdefs.h" $ac_declaration int @@ -1789,16 +1792,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1792: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1795: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1795: \$? = $ac_status" >&5 + echo "$as_me:1798: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1798: \"$ac_try\"") >&5 + { (eval echo "$as_me:1801: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1801: \$? = $ac_status" >&5 + echo "$as_me:1804: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -1824,13 +1827,15 @@ 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 ac_ext=c ac_cpp='$CPP $CPPFLAGS' 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 -echo "$as_me:1833: checking how to run the C preprocessor" >&5 +ac_main_return=return +echo "$as_me:1838: 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 @@ -1851,18 +1856,18 @@ # 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 1854 "configure" +#line 1859 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:1859: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1864: \"$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:1865: \$? = $ac_status" >&5 + echo "$as_me:1870: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -1885,17 +1890,17 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 1888 "configure" +#line 1893 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:1892: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1897: \"$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:1898: \$? = $ac_status" >&5 + echo "$as_me:1903: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -1932,7 +1937,7 @@ else ac_cv_prog_CPP=$CPP fi -echo "$as_me:1935: result: $CPP" >&5 +echo "$as_me:1940: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -1942,18 +1947,18 @@ # 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 1945 "configure" +#line 1950 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:1950: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1955: \"$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:1956: \$? = $ac_status" >&5 + echo "$as_me:1961: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -1976,17 +1981,17 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 1979 "configure" +#line 1984 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:1983: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1988: \"$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:1989: \$? = $ac_status" >&5 + echo "$as_me:1994: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2014,7 +2019,7 @@ if $ac_preproc_ok; then : else - { { echo "$as_me:2017: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2022: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2024,16 +2029,17 @@ 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 if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:2029: checking whether $CC needs -traditional" >&5 + echo "$as_me:2035: 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 2036 "configure" +#line 2042 "configure" #include "confdefs.h" #include <sgtty.h> int Autoconf = TIOCGETP; @@ -2048,7 +2054,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat >conftest.$ac_ext <<_ACEOF -#line 2051 "configure" +#line 2057 "configure" #include "confdefs.h" #include <termio.h> int Autoconf = TCGETA; @@ -2061,7 +2067,7 @@ fi fi -echo "$as_me:2064: result: $ac_cv_prog_gcc_traditional" >&5 +echo "$as_me:2070: 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" @@ -2070,10 +2076,10 @@ ### checks for UNIX variants that set C preprocessor variables -echo "$as_me:2073: checking for AIX" >&5 +echo "$as_me:2079: checking for AIX" >&5 echo $ECHO_N "checking for AIX... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 2076 "configure" +#line 2082 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -2082,24 +2088,24 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then - echo "$as_me:2085: result: yes" >&5 + echo "$as_me:2091: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\EOF #define _ALL_SOURCE 1 EOF else - echo "$as_me:2092: result: no" >&5 + echo "$as_me:2098: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest* -echo "$as_me:2097: checking for POSIXized ISC" >&5 +echo "$as_me:2103: 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:2102: result: yes" >&5 + echo "$as_me:2108: result: yes" >&5 echo "${ECHO_T}yes" >&6 ISC=yes # If later tests want to check for ISC. @@ -2113,28 +2119,28 @@ CC="$CC -Xp" fi else - echo "$as_me:2116: result: no" >&5 + echo "$as_me:2122: result: no" >&5 echo "${ECHO_T}no" >&6 ISC= fi -echo "$as_me:2121: checking for minix/config.h" >&5 +echo "$as_me:2127: checking for minix/config.h" >&5 echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6 if test "${ac_cv_header_minix_config_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2127 "configure" +#line 2133 "configure" #include "confdefs.h" #include <minix/config.h> _ACEOF -if { (eval echo "$as_me:2131: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2137: \"$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:2137: \$? = $ac_status" >&5 + echo "$as_me:2143: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2153,7 +2159,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:2156: result: $ac_cv_header_minix_config_h" >&5 +echo "$as_me:2162: result: $ac_cv_header_minix_config_h" >&5 echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6 if test $ac_cv_header_minix_config_h = yes; then MINIX=yes @@ -2184,12 +2190,12 @@ if test "$" = yes ; then case $host_os in linux*|gnu*) - echo "$as_me:2187: checking if this is really Intel C compiler" >&5 + echo "$as_me:2193: 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 2192 "configure" +#line 2198 "configure" #include "confdefs.h" int @@ -2206,16 +2212,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2209: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2215: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2212: \$? = $ac_status" >&5 + echo "$as_me:2218: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2215: \"$ac_try\"") >&5 + { (eval echo "$as_me:2221: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2218: \$? = $ac_status" >&5 + echo "$as_me:2224: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -2226,7 +2232,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:2229: result: $INTEL_COMPILER" >&5 + echo "$as_me:2235: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -2249,7 +2255,7 @@ #define PROG_EXT "$PROG_EXT" EOF -echo "$as_me:2252: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "$as_me:2258: 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 @@ -2343,7 +2349,7 @@ fi cat >conftest.$ac_ext <<_ACEOF -#line 2346 "configure" +#line 2352 "configure" #include "confdefs.h" #ifndef CC_HAS_PROTOS @@ -2364,16 +2370,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2367: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2373: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2370: \$? = $ac_status" >&5 + echo "$as_me:2376: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2373: \"$ac_try\"") >&5 + { (eval echo "$as_me:2379: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2376: \$? = $ac_status" >&5 + echo "$as_me:2382: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ansi_cc="$cf_arg"; break else @@ -2386,7 +2392,7 @@ CPPFLAGS="$cf_save_CPPFLAGS" fi -echo "$as_me:2389: result: $cf_cv_ansi_cc" >&5 +echo "$as_me:2395: result: $cf_cv_ansi_cc" >&5 echo "${ECHO_T}$cf_cv_ansi_cc" >&6 if test "$cf_cv_ansi_cc" != "no"; then @@ -2469,7 +2475,7 @@ fi if test "$cf_cv_ansi_cc" = "no"; then - { { echo "$as_me:2472: error: Your compiler does not appear to recognize prototypes. + { { echo "$as_me:2478: 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 @@ -2482,7 +2488,7 @@ { (exit 1); exit 1; }; } fi -echo "$as_me:2485: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:2491: 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 @@ -2490,7 +2496,7 @@ ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 2493 "configure" +#line 2499 "configure" #include "confdefs.h" #include <stdarg.h> #include <stdio.h> @@ -2539,16 +2545,16 @@ do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:2542: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2548: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2545: \$? = $ac_status" >&5 + echo "$as_me:2551: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2548: \"$ac_try\"") >&5 + { (eval echo "$as_me:2554: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2551: \$? = $ac_status" >&5 + echo "$as_me:2557: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2565,21 +2571,21 @@ case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2568: result: none needed" >&5 + echo "$as_me:2574: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2571: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2577: 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:2576: checking for an ANSI C-conforming const" >&5 +echo "$as_me:2582: 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 2582 "configure" +#line 2588 "configure" #include "confdefs.h" int @@ -2637,16 +2643,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2640: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2646: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2643: \$? = $ac_status" >&5 + echo "$as_me:2649: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2646: \"$ac_try\"") >&5 + { (eval echo "$as_me:2652: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2649: \$? = $ac_status" >&5 + echo "$as_me:2655: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -2656,7 +2662,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2659: result: $ac_cv_c_const" >&5 +echo "$as_me:2665: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -2666,14 +2672,14 @@ fi -echo "$as_me:2669: checking if we can initialize unions" >&5 +echo "$as_me:2675: checking if we can initialize unions" >&5 echo $ECHO_N "checking if we can initialize unions... $ECHO_C" >&6 if test "${cf_cv_init_unions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2676 "configure" +#line 2682 "configure" #include "confdefs.h" int @@ -2685,16 +2691,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2688: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2694: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2691: \$? = $ac_status" >&5 + echo "$as_me:2697: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2694: \"$ac_try\"") >&5 + { (eval echo "$as_me:2700: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2697: \$? = $ac_status" >&5 + echo "$as_me:2703: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_init_unions=yes else @@ -2705,13 +2711,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2708: result: $cf_cv_init_unions" >&5 +echo "$as_me:2714: result: $cf_cv_init_unions" >&5 echo "${ECHO_T}$cf_cv_init_unions" >&6 test $cf_cv_init_unions = no && cat >>confdefs.h <<\EOF #define CC_CANNOT_INIT_UNIONS 1 EOF -echo "$as_me:2714: checking if $CC -U and -D options work together" >&5 +echo "$as_me:2720: checking if $CC -U and -D options work together" >&5 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6 if test "${cf_cv_cc_u_d_options+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2720,7 +2726,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" cat >conftest.$ac_ext <<_ACEOF -#line 2723 "configure" +#line 2729 "configure" #include "confdefs.h" int @@ -2739,16 +2745,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2742: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2748: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2745: \$? = $ac_status" >&5 + echo "$as_me:2751: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2748: \"$ac_try\"") >&5 + { (eval echo "$as_me:2754: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2751: \$? = $ac_status" >&5 + echo "$as_me:2757: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cc_u_d_options=yes @@ -2762,7 +2768,7 @@ CPPFLAGS="$cf_save_CPPFLAGS" fi -echo "$as_me:2765: result: $cf_cv_cc_u_d_options" >&5 +echo "$as_me:2771: result: $cf_cv_cc_u_d_options" >&5 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6 cf_XOPEN_SOURCE=500 @@ -2788,14 +2794,14 @@ ;; linux*|gnu*) #(vi -echo "$as_me:2791: checking if we must define _GNU_SOURCE" >&5 +echo "$as_me:2797: 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 2798 "configure" +#line 2804 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2810,16 +2816,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2813: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2819: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2816: \$? = $ac_status" >&5 + echo "$as_me:2822: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2819: \"$ac_try\"") >&5 + { (eval echo "$as_me:2825: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2822: \$? = $ac_status" >&5 + echo "$as_me:2828: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -2828,7 +2834,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 2831 "configure" +#line 2837 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2843,16 +2849,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2846: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2852: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2849: \$? = $ac_status" >&5 + echo "$as_me:2855: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2852: \"$ac_try\"") >&5 + { (eval echo "$as_me:2858: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2855: \$? = $ac_status" >&5 + echo "$as_me:2861: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -2867,7 +2873,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2870: result: $cf_cv_gnu_source" >&5 +echo "$as_me:2876: 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" @@ -2894,14 +2900,14 @@ CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" ;; *) - echo "$as_me:2897: checking if we should define _XOPEN_SOURCE" >&5 + echo "$as_me:2903: 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 2904 "configure" +#line 2910 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2916,16 +2922,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2919: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2925: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2922: \$? = $ac_status" >&5 + echo "$as_me:2928: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2925: \"$ac_try\"") >&5 + { (eval echo "$as_me:2931: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2928: \$? = $ac_status" >&5 + echo "$as_me:2934: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -2934,7 +2940,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 2937 "configure" +#line 2943 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2949,16 +2955,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2952: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2958: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2955: \$? = $ac_status" >&5 + echo "$as_me:2961: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2958: \"$ac_try\"") >&5 + { (eval echo "$as_me:2964: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2961: \$? = $ac_status" >&5 + echo "$as_me:2967: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -2973,7 +2979,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2976: result: $cf_cv_xopen_source" >&5 +echo "$as_me:2982: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -3007,16 +3013,16 @@ sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'` -echo "$as_me:3010: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:3016: 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 "(line 3016) testing if the symbol is already defined go no further ..." 1>&5 +echo "(line 3022) testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3019 "configure" +#line 3025 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3031,16 +3037,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3034: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3040: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3037: \$? = $ac_status" >&5 + echo "$as_me:3043: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3040: \"$ac_try\"") >&5 + { (eval echo "$as_me:3046: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3043: \$? = $ac_status" >&5 + echo "$as_me:3049: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -3061,7 +3067,7 @@ esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 3064 "configure" +#line 3070 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3076,16 +3082,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3079: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3085: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3082: \$? = $ac_status" >&5 + echo "$as_me:3088: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3085: \"$ac_try\"") >&5 + { (eval echo "$as_me:3091: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3088: \$? = $ac_status" >&5 + echo "$as_me:3094: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3096,15 +3102,15 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "(line 3099) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "(line 3105) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "(line 3104) testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "(line 3110) testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3107 "configure" +#line 3113 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3119,16 +3125,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3122: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3128: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3125: \$? = $ac_status" >&5 + echo "$as_me:3131: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3128: \"$ac_try\"") >&5 + { (eval echo "$as_me:3134: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3131: \$? = $ac_status" >&5 + echo "$as_me:3137: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3144,7 +3150,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3147: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:3153: 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 @@ -3165,7 +3171,7 @@ 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:3168: checking for $ac_word" >&5 +echo "$as_me:3174: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LEX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3180,7 +3186,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LEX="$ac_prog" -echo "$as_me:3183: found $ac_dir/$ac_word" >&5 +echo "$as_me:3189: found $ac_dir/$ac_word" >&5 break done @@ -3188,10 +3194,10 @@ fi LEX=$ac_cv_prog_LEX if test -n "$LEX"; then - echo "$as_me:3191: result: $LEX" >&5 + echo "$as_me:3197: result: $LEX" >&5 echo "${ECHO_T}$LEX" >&6 else - echo "$as_me:3194: result: no" >&5 + echo "$as_me:3200: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3201,7 +3207,7 @@ if test -z "$LEXLIB" then - echo "$as_me:3204: checking for yywrap in -lfl" >&5 + echo "$as_me:3210: checking for yywrap in -lfl" >&5 echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6 if test "${ac_cv_lib_fl_yywrap+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3209,7 +3215,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lfl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3212 "configure" +#line 3218 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3228,16 +3234,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3231: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3237: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3234: \$? = $ac_status" >&5 + echo "$as_me:3240: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3237: \"$ac_try\"") >&5 + { (eval echo "$as_me:3243: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3240: \$? = $ac_status" >&5 + echo "$as_me:3246: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_fl_yywrap=yes else @@ -3248,12 +3254,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3251: result: $ac_cv_lib_fl_yywrap" >&5 +echo "$as_me:3257: result: $ac_cv_lib_fl_yywrap" >&5 echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6 if test $ac_cv_lib_fl_yywrap = yes; then LEXLIB="-lfl" else - echo "$as_me:3256: checking for yywrap in -ll" >&5 + echo "$as_me:3262: checking for yywrap in -ll" >&5 echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6 if test "${ac_cv_lib_l_yywrap+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3261,7 +3267,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ll $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3264 "configure" +#line 3270 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3280,16 +3286,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3283: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3289: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3286: \$? = $ac_status" >&5 + echo "$as_me:3292: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3289: \"$ac_try\"") >&5 + { (eval echo "$as_me:3295: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3292: \$? = $ac_status" >&5 + echo "$as_me:3298: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_l_yywrap=yes else @@ -3300,7 +3306,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3303: result: $ac_cv_lib_l_yywrap" >&5 +echo "$as_me:3309: result: $ac_cv_lib_l_yywrap" >&5 echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6 if test $ac_cv_lib_l_yywrap = yes; then LEXLIB="-ll" @@ -3311,7 +3317,7 @@ fi if test "x$LEX" != "x:"; then - echo "$as_me:3314: checking lex output file root" >&5 + echo "$as_me:3320: checking lex output file root" >&5 echo $ECHO_N "checking lex output file root... $ECHO_C" >&6 if test "${ac_cv_prog_lex_root+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3325,16 +3331,16 @@ elif test -f lexyy.c; then ac_cv_prog_lex_root=lexyy else - { { echo "$as_me:3328: error: cannot find output from $LEX; giving up" >&5 + { { echo "$as_me:3334: error: cannot find output from $LEX; giving up" >&5 echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:3333: result: $ac_cv_prog_lex_root" >&5 +echo "$as_me:3339: result: $ac_cv_prog_lex_root" >&5 echo "${ECHO_T}$ac_cv_prog_lex_root" >&6 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root -echo "$as_me:3337: checking whether yytext is a pointer" >&5 +echo "$as_me:3343: checking whether yytext is a pointer" >&5 echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6 if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3350,16 +3356,16 @@ `cat $LEX_OUTPUT_ROOT.c` _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3353: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3359: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3356: \$? = $ac_status" >&5 + echo "$as_me:3362: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3359: \"$ac_try\"") >&5 + { (eval echo "$as_me:3365: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3362: \$? = $ac_status" >&5 + echo "$as_me:3368: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_lex_yytext_pointer=yes else @@ -3371,7 +3377,7 @@ rm -f "${LEX_OUTPUT_ROOT}.c" fi -echo "$as_me:3374: result: $ac_cv_prog_lex_yytext_pointer" >&5 +echo "$as_me:3380: result: $ac_cv_prog_lex_yytext_pointer" >&5 echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6 if test $ac_cv_prog_lex_yytext_pointer = yes; then @@ -3385,7 +3391,7 @@ ### checks for alternative programs -echo "$as_me:3388: checking for makeflags variable" >&5 +echo "$as_me:3394: 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 @@ -3419,7 +3425,7 @@ rm -f cf_makeflags.tmp fi -echo "$as_me:3422: result: $cf_cv_makeflags" >&5 +echo "$as_me:3428: result: $cf_cv_makeflags" >&5 echo "${ECHO_T}$cf_cv_makeflags" >&6 # Find a good install program. We prefer a C program (faster), @@ -3434,7 +3440,7 @@ # 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:3437: checking for a BSD compatible install" >&5 +echo "$as_me:3443: 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 @@ -3483,7 +3489,7 @@ INSTALL=$ac_install_sh fi fi -echo "$as_me:3486: result: $INSTALL" >&5 +echo "$as_me:3492: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -3494,7 +3500,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:3497: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:3503: 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 @@ -3514,11 +3520,11 @@ rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:3517: result: yes" >&5 + echo "$as_me:3523: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:3521: result: no" >&5 + echo "$as_me:3527: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -3527,7 +3533,7 @@ 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:3530: checking for $ac_word" >&5 +echo "$as_me:3536: 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 @@ -3542,7 +3548,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AWK="$ac_prog" -echo "$as_me:3545: found $ac_dir/$ac_word" >&5 +echo "$as_me:3551: found $ac_dir/$ac_word" >&5 break done @@ -3550,10 +3556,10 @@ fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:3553: result: $AWK" >&5 + echo "$as_me:3559: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:3556: result: no" >&5 + echo "$as_me:3562: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3563,7 +3569,7 @@ 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:3566: checking for $ac_word" >&5 +echo "$as_me:3572: 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 @@ -3578,7 +3584,7 @@ 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:3581: found $ac_dir/$ac_word" >&5 +echo "$as_me:3587: found $ac_dir/$ac_word" >&5 break done @@ -3586,10 +3592,10 @@ fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:3589: result: $RANLIB" >&5 + echo "$as_me:3595: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:3592: result: no" >&5 + echo "$as_me:3598: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3598,7 +3604,7 @@ 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:3601: checking for $ac_word" >&5 +echo "$as_me:3607: 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 @@ -3613,7 +3619,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:3616: found $ac_dir/$ac_word" >&5 +echo "$as_me:3622: found $ac_dir/$ac_word" >&5 break done @@ -3622,10 +3628,10 @@ fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:3625: result: $ac_ct_RANLIB" >&5 + echo "$as_me:3631: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:3628: result: no" >&5 + echo "$as_me:3634: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3638,7 +3644,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "$as_me:3641: checking for archiver (symbol AR)" >&5 +echo "$as_me:3647: checking for archiver (symbol AR)" >&5 echo $ECHO_N "checking for archiver (symbol AR)... $ECHO_C" >&6 if test -z "$AR" ; then @@ -3647,7 +3653,7 @@ fi cf_cv_subst_AR=$AR -echo "$as_me:3650: result: $AR" >&5 +echo "$as_me:3656: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 fi @@ -3656,7 +3662,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "$as_me:3659: checking for archiver options (symbol AR_OPTS)" >&5 +echo "$as_me:3665: checking for archiver options (symbol AR_OPTS)" >&5 echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6 if test -z "$AR_OPTS" ; then @@ -3665,12 +3671,12 @@ fi cf_cv_subst_AR_OPTS=$AR_OPTS -echo "$as_me:3668: result: $AR_OPTS" >&5 +echo "$as_me:3674: result: $AR_OPTS" >&5 echo "${ECHO_T}$AR_OPTS" >&6 fi -echo "$as_me:3673: checking if you want to see long compiling messages" >&5 +echo "$as_me:3679: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -3704,7 +3710,7 @@ ECHO_CC='' fi; -echo "$as_me:3707: result: $enableval" >&5 +echo "$as_me:3713: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 case $cf_cv_system_name in @@ -3723,7 +3729,7 @@ BUILTLIBS= BUILTSRCS= -echo "$as_me:3726: checking if you wish to build only core functions" >&5 +echo "$as_me:3732: checking if you wish to build only core functions" >&5 echo $ECHO_N "checking if you wish to build only core functions... $ECHO_C" >&6 # Check whether --enable-extensions or --disable-extensions was given. @@ -3740,7 +3746,7 @@ DISABLE_EXTS=no fi; -echo "$as_me:3743: result: $DISABLE_EXTS" >&5 +echo "$as_me:3749: result: $DISABLE_EXTS" >&5 echo "${ECHO_T}$DISABLE_EXTS" >&6 if test "$DISABLE_EXTS" = yes ; then cat >>confdefs.h <<\EOF @@ -3757,7 +3763,7 @@ cf_extensions=yes fi -echo "$as_me:3760: checking if you wish to disable shell/external commands" >&5 +echo "$as_me:3766: checking if you wish to disable shell/external commands" >&5 echo $ECHO_N "checking if you wish to disable shell/external commands... $ECHO_C" >&6 # Check whether --enable-shell or --disable-shell was given. @@ -3774,7 +3780,7 @@ DISABLE_SHELL=no fi; -echo "$as_me:3777: result: $DISABLE_SHELL" >&5 +echo "$as_me:3783: result: $DISABLE_SHELL" >&5 echo "${ECHO_T}$DISABLE_SHELL" >&6 if test "$DISABLE_SHELL" = yes ; then cat >>confdefs.h <<\EOF @@ -3786,7 +3792,7 @@ fi ### use option --with-cflags to set default CFLAGS -echo "$as_me:3789: checking for CFLAGS options" >&5 +echo "$as_me:3795: checking for CFLAGS options" >&5 echo $ECHO_N "checking for CFLAGS options... $ECHO_C" >&6 # Check whether --with-CFLAGS or --without-CFLAGS was given. @@ -3810,10 +3816,10 @@ elif test -z "$CFLAGS" ; then CFLAGS="-O" fi -echo "$as_me:3813: result: $cflags" >&5 +echo "$as_me:3819: result: $cflags" >&5 echo "${ECHO_T}$cflags" >&6 -echo "$as_me:3816: checking if you want to compile-in plugin support" >&5 +echo "$as_me:3822: checking if you want to compile-in plugin support" >&5 echo $ECHO_N "checking if you want to compile-in plugin support... $ECHO_C" >&6 # Check whether --enable-plugins or --disable-plugins was given. @@ -3830,10 +3836,10 @@ with_plugins=no fi; -echo "$as_me:3833: result: $with_plugins" >&5 +echo "$as_me:3839: result: $with_plugins" >&5 echo "${ECHO_T}$with_plugins" >&6 -echo "$as_me:3836: checking if you want to build syntax filters" >&5 +echo "$as_me:3842: checking if you want to build syntax filters" >&5 echo $ECHO_N "checking if you want to build syntax filters... $ECHO_C" >&6 # Check whether --enable-filters or --disable-filters was given. @@ -3850,7 +3856,7 @@ with_filters=yes fi; -echo "$as_me:3853: result: $with_filters" >&5 +echo "$as_me:3859: result: $with_filters" >&5 echo "${ECHO_T}$with_filters" >&6 MAKE_FILTERS= @@ -3862,7 +3868,7 @@ : ${VILE_LOADABLE_FILTERS=none} : ${VILE_EXTERNAL_FILTERS=all} -echo "$as_me:3865: checking if you want built-in syntax filters" >&5 +echo "$as_me:3871: checking if you want built-in syntax filters" >&5 echo $ECHO_N "checking if you want built-in syntax filters... $ECHO_C" >&6 # Check whether --with-builtin-filters or --without-builtin-filters was given. @@ -3873,10 +3879,10 @@ VILE_BUILT_IN_FILTERS=none fi; test "$VILE_BUILT_IN_FILTERS" = no && VILE_BUILT_IN_FILTERS=none -echo "$as_me:3876: result: $VILE_BUILT_IN_FILTERS" >&5 +echo "$as_me:3882: result: $VILE_BUILT_IN_FILTERS" >&5 echo "${ECHO_T}$VILE_BUILT_IN_FILTERS" >&6 -echo "$as_me:3879: checking if you want loadable syntax filters" >&5 +echo "$as_me:3885: checking if you want loadable syntax filters" >&5 echo $ECHO_N "checking if you want loadable syntax filters... $ECHO_C" >&6 # Check whether --with-loadable-filters or --without-loadable-filters was given. @@ -3887,7 +3893,7 @@ VILE_LOADABLE_FILTERS=none fi; test "$VILE_LOADABLE_FILTERS" = no && VILE_LOADABLE_FILTERS=none -echo "$as_me:3890: result: $VILE_LOADABLE_FILTERS" >&5 +echo "$as_me:3896: result: $VILE_LOADABLE_FILTERS" >&5 echo "${ECHO_T}$VILE_LOADABLE_FILTERS" >&6 # If both "--with-builtin-filters" and "--with-loadable-filters" were given, @@ -3905,7 +3911,7 @@ do if test "$cf_b" = "$cf_l" then - { { echo "$as_me:3908: error: Cannot overlap built-in and loadable filter lists" >&5 + { { echo "$as_me:3914: error: Cannot overlap built-in and loadable filter lists" >&5 echo "$as_me: error: Cannot overlap built-in and loadable filter lists" >&2;} { (exit 1); exit 1; }; } fi @@ -3948,7 +3954,7 @@ test -z "$VILE_EXTERNAL_FILTERS" && VILE_EXTERNAL_FILTERS=none fi -echo "$as_me:3951: checking if any filters require flex" >&5 +echo "$as_me:3957: checking if any filters require flex" >&5 echo $ECHO_N "checking if any filters require flex... $ECHO_C" >&6 builtins=`sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak l "$VILE_BUILT_IN_FILTERS"` @@ -3961,48 +3967,48 @@ else cf_needflex=no fi -echo "$as_me:3964: result: $cf_needflex" >&5 +echo "$as_me:3970: result: $cf_needflex" >&5 echo "${ECHO_T}$cf_needflex" >&6 if test "$cf_needflex" = yes ; then test -z "$LEX" && LEX=lex -echo "$as_me:3970: checking if $LEX is really flex" >&5 +echo "$as_me:3976: checking if $LEX is really flex" >&5 echo $ECHO_N "checking if $LEX is really flex... $ECHO_C" >&6 if ( $LEX '-?' 2>&1 |fgrep flex >/dev/null ) then - echo "$as_me:3974: result: yes" >&5 + echo "$as_me:3980: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:3976: checking version of $LEX" >&5 + echo "$as_me:3982: checking version of $LEX" >&5 echo $ECHO_N "checking version of $LEX... $ECHO_C" >&6 LEX_VERSION=`$LEX --version 2>&1 | sed -e 's/^.* //;s/^[^0-9]*//'` - echo "$as_me:3979: result: $LEX_VERSION" >&5 + echo "$as_me:3985: result: $LEX_VERSION" >&5 echo "${ECHO_T}$LEX_VERSION" >&6 else - echo "$as_me:3982: result: no" >&5 + echo "$as_me:3988: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test -z "$LEX_VERSION" then - { { echo "$as_me:3988: error: You need flex to compile builtin filters" >&5 + { { echo "$as_me:3994: error: You need flex to compile builtin filters" >&5 echo "$as_me: error: You need flex to compile builtin filters" >&2;} { (exit 1); exit 1; }; } elif ( expr $LEX_VERSION \< 2.5 >/dev/null ) then - { { echo "$as_me:3993: error: Sorry - your version of flex is too old: $LEX_VERSION" >&5 + { { echo "$as_me:3999: error: Sorry - your version of flex is too old: $LEX_VERSION" >&5 echo "$as_me: error: Sorry - your version of flex is too old: $LEX_VERSION" >&2;} { (exit 1); exit 1; }; } elif ( expr $LEX_VERSION \>= 2.6 >/dev/null ) then - { { echo "$as_me:3998: error: Sorry - your version of flex is too unstable: $LEX_VERSION" >&5 + { { echo "$as_me:4004: error: Sorry - your version of flex is too unstable: $LEX_VERSION" >&5 echo "$as_me: error: Sorry - your version of flex is too unstable: $LEX_VERSION" >&2;} { (exit 1); exit 1; }; } else LEX_SUBVERSION=`echo "$LEX_VERSION" | sed -e 's/^2.5.//'` if test -z "$LEX_SUBVERSION" then - { { echo "$as_me:4005: error: This version of flex cannot compile builtin filters" >&5 + { { echo "$as_me:4011: error: This version of flex cannot compile builtin filters" >&5 echo "$as_me: error: This version of flex cannot compile builtin filters" >&2;} { (exit 1); exit 1; }; } elif test $LEX_SUBVERSION = 4a @@ -4011,7 +4017,7 @@ elif ( expr $LEX_SUBVERSION \> 4 >/dev/null ) then - { { echo "$as_me:4014: error: This version of flex cannot compile builtin filters" >&5 + { { echo "$as_me:4020: error: This version of flex cannot compile builtin filters" >&5 echo "$as_me: error: This version of flex cannot compile builtin filters" >&2;} { (exit 1); exit 1; }; } fi @@ -4026,7 +4032,7 @@ MAKE_FILTERS="#" fi -echo "$as_me:4029: checking for library path" >&5 +echo "$as_me:4035: checking for library path" >&5 echo $ECHO_N "checking for library path... $ECHO_C" >&6 # Check whether --with-libdir-path or --without-libdir-path was given. @@ -4066,7 +4072,7 @@ cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:4069: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:4075: 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; }; } ;; @@ -4088,10 +4094,10 @@ eval 'VILE_LIBDIR_PATH="$cf_dst_path"' -echo "$as_me:4091: result: $VILE_LIBDIR_PATH" >&5 +echo "$as_me:4097: result: $VILE_LIBDIR_PATH" >&5 echo "${ECHO_T}$VILE_LIBDIR_PATH" >&6 -echo "$as_me:4094: checking for startup path" >&5 +echo "$as_me:4100: checking for startup path" >&5 echo $ECHO_N "checking for startup path... $ECHO_C" >&6 # Check whether --with-startup-path or --without-startup-path was given. @@ -4131,7 +4137,7 @@ cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:4134: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:4140: 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; }; } ;; @@ -4153,10 +4159,10 @@ eval 'VILE_STARTUP_PATH="$cf_dst_path"' -echo "$as_me:4156: result: $VILE_STARTUP_PATH" >&5 +echo "$as_me:4162: result: $VILE_STARTUP_PATH" >&5 echo "${ECHO_T}$VILE_STARTUP_PATH" >&6 -echo "$as_me:4159: checking if $LEX supports character classes" >&5 +echo "$as_me:4165: checking if $LEX supports character classes" >&5 echo $ECHO_N "checking if $LEX supports character classes... $ECHO_C" >&6 cat >conftest.l <<CF_EOF IDENT [[:alpha:]][[:alnum:]]+ @@ -4166,24 +4172,24 @@ {DATE} { ECHO; } CF_EOF cf_lex_char_classes="$LEX conftest.l 1>&5" -if { (eval echo "$as_me:4169: \"$cf_lex_char_classes\"") >&5 +if { (eval echo "$as_me:4175: \"$cf_lex_char_classes\"") >&5 (eval $cf_lex_char_classes) 2>&5 ac_status=$? - echo "$as_me:4172: \$? = $ac_status" >&5 + echo "$as_me:4178: \$? = $ac_status" >&5 (exit $ac_status); }; then LEX_CHAR_CLASSES=yes else LEX_CHAR_CLASSES=no fi -echo "$as_me:4178: result: $LEX_CHAR_CLASSES" >&5 +echo "$as_me:4184: result: $LEX_CHAR_CLASSES" >&5 echo "${ECHO_T}$LEX_CHAR_CLASSES" >&6 rm -f conftest.* $LEX_OUTPUT_ROOT.c if test "$LEX_CHAR_CLASSES" != yes ; then - { echo "$as_me:4182: WARNING: Your $LEX program does not support character classes. Get flex." >&5 + { echo "$as_me:4188: WARNING: Your $LEX program does not support character classes. Get flex." >&5 echo "$as_me: WARNING: Your $LEX program does not support character classes. Get flex." >&2;} fi -echo "$as_me:4186: checking if $LEX supports states" >&5 +echo "$as_me:4192: checking if $LEX supports states" >&5 echo $ECHO_N "checking if $LEX supports states... $ECHO_C" >&6 cat >conftest.l <<CF_EOF %s X Y Z @@ -4193,21 +4199,21 @@ nothing ECHO; CF_EOF cf_lex_states="$LEX conftest.l 1>&5" -if { (eval echo "$as_me:4196: \"$cf_lex_states\"") >&5 +if { (eval echo "$as_me:4202: \"$cf_lex_states\"") >&5 (eval $cf_lex_states) 2>&5 ac_status=$? - echo "$as_me:4199: \$? = $ac_status" >&5 + echo "$as_me:4205: \$? = $ac_status" >&5 (exit $ac_status); }; then cf_lex_states=yes else cf_lex_states=no fi -echo "$as_me:4205: result: $cf_lex_states" >&5 +echo "$as_me:4211: result: $cf_lex_states" >&5 echo "${ECHO_T}$cf_lex_states" >&6 rm -f conftest.* $LEX_OUTPUT_ROOT.c MAKE_LEX= if test "$cf_lex_states" != yes ; then - { echo "$as_me:4210: WARNING: Your $LEX program does not support states. Get flex." >&5 + { echo "$as_me:4216: WARNING: Your $LEX program does not support states. Get flex." >&5 echo "$as_me: WARNING: Your $LEX program does not support states. Get flex." >&2;} MAKE_LEX="#" fi @@ -4218,7 +4224,7 @@ LEX_CHAR_CLASSES='sh $(srcdir)/noclass.sh ' fi -echo "$as_me:4221: checking if you want to use perl as an extension language" >&5 +echo "$as_me:4227: checking if you want to use perl as an extension language" >&5 echo $ECHO_N "checking if you want to use perl as an extension language... $ECHO_C" >&6 # Check whether --with-perl or --without-perl was given. @@ -4228,16 +4234,16 @@ else with_perl=no fi; -echo "$as_me:4231: result: $with_perl" >&5 +echo "$as_me:4237: result: $with_perl" >&5 echo "${ECHO_T}$with_perl" >&6 if test "$with_perl" = yes ; then # find perl binary -echo "$as_me:4235: checking for perl-5.004" >&5 +echo "$as_me:4241: checking for perl-5.004" >&5 echo $ECHO_N "checking for perl-5.004... $ECHO_C" >&6 if test "${cf_cv_prog_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "configure:4240: ...version 5.004 required" >&5 + echo "configure:4246: ...version 5.004 required" >&5 # allow user to override if test -n "$PERL"; then cf_try="$PERL" @@ -4247,7 +4253,7 @@ cf_version=`echo '[]'|sed -e 's/^./$/'` for cf_prog in $cf_try; do - echo "configure:4250: trying $cf_prog" >&5 + echo "configure:4256: trying $cf_prog" >&5 if ($cf_prog -e 'printf "found version %g\n",'$cf_version';exit('$cf_version'<5.004)') 1>&5 2>&1; then cf_cv_prog_PERL=$cf_prog break @@ -4256,15 +4262,15 @@ fi PERL="$cf_cv_prog_PERL" if test -n "$PERL"; then - echo "$as_me:4259: result: $PERL" >&5 + echo "$as_me:4265: result: $PERL" >&5 echo "${ECHO_T}$PERL" >&6 else - echo "$as_me:4262: result: no" >&5 + echo "$as_me:4268: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$PERL" = no; then - { { echo "$as_me:4267: error: perl not found" >&5 + { { echo "$as_me:4273: error: perl not found" >&5 echo "$as_me: error: perl not found" >&2;} { (exit 1); exit 1; }; } fi @@ -4356,7 +4362,7 @@ if test "$cf_check_cflags" != "$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 4359 "configure" +#line 4365 "configure" #include "confdefs.h" #include <stdio.h> int @@ -4368,16 +4374,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4371: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4377: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4374: \$? = $ac_status" >&5 + echo "$as_me:4380: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4377: \"$ac_try\"") >&5 + { (eval echo "$as_me:4383: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4380: \$? = $ac_status" >&5 + echo "$as_me:4386: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -4402,13 +4408,13 @@ # X11 checks will sometimes add to CFLAGS. We want the state of CFLAGS # prior to these checks -echo "$as_me:4405: checking for getpwnam" >&5 +echo "$as_me:4411: checking for getpwnam" >&5 echo $ECHO_N "checking for getpwnam... $ECHO_C" >&6 if test "${ac_cv_func_getpwnam+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4411 "configure" +#line 4417 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getpwnam (); below. */ @@ -4439,16 +4445,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4442: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4448: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4445: \$? = $ac_status" >&5 + echo "$as_me:4451: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4448: \"$ac_try\"") >&5 + { (eval echo "$as_me:4454: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4451: \$? = $ac_status" >&5 + echo "$as_me:4457: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_getpwnam=yes else @@ -4458,13 +4464,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4461: result: $ac_cv_func_getpwnam" >&5 +echo "$as_me:4467: result: $ac_cv_func_getpwnam" >&5 echo "${ECHO_T}$ac_cv_func_getpwnam" >&6 if test $ac_cv_func_getpwnam = yes; then : else -echo "$as_me:4467: checking for getpwnam in -lsun" >&5 +echo "$as_me:4473: checking for getpwnam in -lsun" >&5 echo $ECHO_N "checking for getpwnam in -lsun... $ECHO_C" >&6 if test "${ac_cv_lib_sun_getpwnam+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4472,7 +4478,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsun $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4475 "configure" +#line 4481 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4491,16 +4497,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4494: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4500: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4497: \$? = $ac_status" >&5 + echo "$as_me:4503: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4500: \"$ac_try\"") >&5 + { (eval echo "$as_me:4506: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4503: \$? = $ac_status" >&5 + echo "$as_me:4509: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_sun_getpwnam=yes else @@ -4511,7 +4517,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4514: result: $ac_cv_lib_sun_getpwnam" >&5 +echo "$as_me:4520: result: $ac_cv_lib_sun_getpwnam" >&5 echo "${ECHO_T}$ac_cv_lib_sun_getpwnam" >&6 if test $ac_cv_lib_sun_getpwnam = yes; then cat >>confdefs.h <<EOF @@ -4529,7 +4535,7 @@ 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:4532: checking for $ac_word" >&5 +echo "$as_me:4538: 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 @@ -4544,7 +4550,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LINT="$ac_prog" -echo "$as_me:4547: found $ac_dir/$ac_word" >&5 +echo "$as_me:4553: found $ac_dir/$ac_word" >&5 break done @@ -4552,10 +4558,10 @@ fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:4555: result: $LINT" >&5 + echo "$as_me:4561: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:4558: result: no" >&5 + echo "$as_me:4564: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4571,13 +4577,13 @@ fi ### checks for header files -echo "$as_me:4574: checking for ANSI C header files" >&5 +echo "$as_me:4580: 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 4580 "configure" +#line 4586 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -4585,13 +4591,13 @@ #include <float.h> _ACEOF -if { (eval echo "$as_me:4588: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4594: \"$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:4594: \$? = $ac_status" >&5 + echo "$as_me:4600: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4613,7 +4619,7 @@ 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 4616 "configure" +#line 4622 "configure" #include "confdefs.h" #include <string.h> @@ -4631,7 +4637,7 @@ 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 4634 "configure" +#line 4640 "configure" #include "confdefs.h" #include <stdlib.h> @@ -4652,7 +4658,7 @@ : else cat >conftest.$ac_ext <<_ACEOF -#line 4655 "configure" +#line 4661 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -4673,20 +4679,20 @@ for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + $ac_main_return(2); + $ac_main_return (0); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4681: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4687: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4684: \$? = $ac_status" >&5 + echo "$as_me:4690: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4686: \"$ac_try\"") >&5 + { (eval echo "$as_me:4692: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4689: \$? = $ac_status" >&5 + echo "$as_me:4695: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -4699,7 +4705,7 @@ fi fi fi -echo "$as_me:4702: result: $ac_cv_header_stdc" >&5 +echo "$as_me:4708: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -4712,13 +4718,13 @@ 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:4715: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:4721: 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 4721 "configure" +#line 4727 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -4733,16 +4739,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4736: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4742: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4739: \$? = $ac_status" >&5 + echo "$as_me:4745: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4742: \"$ac_try\"") >&5 + { (eval echo "$as_me:4748: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4745: \$? = $ac_status" >&5 + echo "$as_me:4751: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -4752,7 +4758,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4755: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4761: 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 <<EOF @@ -4765,7 +4771,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - echo "$as_me:4768: checking for opendir in -ldir" >&5 + echo "$as_me:4774: 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 @@ -4773,7 +4779,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4776 "configure" +#line 4782 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4792,16 +4798,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4795: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4801: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4798: \$? = $ac_status" >&5 + echo "$as_me:4804: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4801: \"$ac_try\"") >&5 + { (eval echo "$as_me:4807: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4804: \$? = $ac_status" >&5 + echo "$as_me:4810: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -4812,14 +4818,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4815: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:4821: 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:4822: checking for opendir in -lx" >&5 + echo "$as_me:4828: 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 @@ -4827,7 +4833,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4830 "configure" +#line 4836 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4846,16 +4852,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4849: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4855: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4852: \$? = $ac_status" >&5 + echo "$as_me:4858: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4855: \"$ac_try\"") >&5 + { (eval echo "$as_me:4861: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4858: \$? = $ac_status" >&5 + echo "$as_me:4864: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -4866,7 +4872,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4869: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:4875: 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" @@ -4874,13 +4880,13 @@ fi - echo "$as_me:4877: checking for nl_langinfo and CODESET" >&5 + echo "$as_me:4883: 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 4883 "configure" +#line 4889 "configure" #include "confdefs.h" #include <langinfo.h> int @@ -4892,16 +4898,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4895: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4901: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4898: \$? = $ac_status" >&5 + echo "$as_me:4904: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4901: \"$ac_try\"") >&5 + { (eval echo "$as_me:4907: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4904: \$? = $ac_status" >&5 + echo "$as_me:4910: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else @@ -4912,7 +4918,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4915: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:4921: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test $am_cv_langinfo_codeset = yes; then @@ -4954,23 +4960,23 @@ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4957: checking for $ac_header" >&5 +echo "$as_me:4963: 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 4963 "configure" +#line 4969 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4967: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4973: \"$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:4973: \$? = $ac_status" >&5 + echo "$as_me:4979: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4989,7 +4995,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4992: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4998: 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 <<EOF @@ -5000,13 +5006,13 @@ done ### checks for typedefs -echo "$as_me:5003: checking return type of signal handlers" >&5 +echo "$as_me:5009: 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 5009 "configure" +#line 5015 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -5028,16 +5034,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5031: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5037: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5034: \$? = $ac_status" >&5 + echo "$as_me:5040: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5037: \"$ac_try\"") >&5 + { (eval echo "$as_me:5043: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5040: \$? = $ac_status" >&5 + echo "$as_me:5046: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signal=void else @@ -5047,7 +5053,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5050: result: $ac_cv_type_signal" >&5 +echo "$as_me:5056: result: $ac_cv_type_signal" >&5 echo "${ECHO_T}$ac_cv_type_signal" >&6 cat >>confdefs.h <<EOF @@ -5076,28 +5082,28 @@ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5079: checking for $ac_header" >&5 +echo "$as_me:5085: 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 5085 "configure" +#line 5091 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5091: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5097: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5094: \$? = $ac_status" >&5 + echo "$as_me:5100: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5097: \"$ac_try\"") >&5 + { (eval echo "$as_me:5103: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5100: \$? = $ac_status" >&5 + echo "$as_me:5106: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -5107,7 +5113,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5110: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5116: 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 <<EOF @@ -5117,13 +5123,13 @@ fi done -echo "$as_me:5120: checking for size_t" >&5 +echo "$as_me:5126: checking for size_t" >&5 echo $ECHO_N "checking for size_t... $ECHO_C" >&6 if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5126 "configure" +#line 5132 "configure" #include "confdefs.h" $ac_includes_default int @@ -5138,16 +5144,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5141: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5147: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5144: \$? = $ac_status" >&5 + echo "$as_me:5150: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5147: \"$ac_try\"") >&5 + { (eval echo "$as_me:5153: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5150: \$? = $ac_status" >&5 + echo "$as_me:5156: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_size_t=yes else @@ -5157,7 +5163,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5160: result: $ac_cv_type_size_t" >&5 +echo "$as_me:5166: result: $ac_cv_type_size_t" >&5 echo "${ECHO_T}$ac_cv_type_size_t" >&6 if test $ac_cv_type_size_t = yes; then : @@ -5169,13 +5175,13 @@ fi -echo "$as_me:5172: checking for uid_t in sys/types.h" >&5 +echo "$as_me:5178: checking for uid_t in sys/types.h" >&5 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 if test "${ac_cv_type_uid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5178 "configure" +#line 5184 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5189,7 +5195,7 @@ rm -f conftest* fi -echo "$as_me:5192: result: $ac_cv_type_uid_t" >&5 +echo "$as_me:5198: result: $ac_cv_type_uid_t" >&5 echo "${ECHO_T}$ac_cv_type_uid_t" >&6 if test $ac_cv_type_uid_t = no; then @@ -5203,13 +5209,13 @@ fi -echo "$as_me:5206: checking for pid_t" >&5 +echo "$as_me:5212: 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 5212 "configure" +#line 5218 "configure" #include "confdefs.h" $ac_includes_default int @@ -5224,16 +5230,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5227: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5233: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5230: \$? = $ac_status" >&5 + echo "$as_me:5236: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5233: \"$ac_try\"") >&5 + { (eval echo "$as_me:5239: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5236: \$? = $ac_status" >&5 + echo "$as_me:5242: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -5243,7 +5249,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5246: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:5252: 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 : @@ -5255,13 +5261,13 @@ fi -echo "$as_me:5258: checking for time_t" >&5 +echo "$as_me:5264: checking for time_t" >&5 echo $ECHO_N "checking for time_t... $ECHO_C" >&6 if test "${ac_cv_type_time_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5264 "configure" +#line 5270 "configure" #include "confdefs.h" $ac_includes_default int @@ -5276,16 +5282,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5279: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5285: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5282: \$? = $ac_status" >&5 + echo "$as_me:5288: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5285: \"$ac_try\"") >&5 + { (eval echo "$as_me:5291: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5288: \$? = $ac_status" >&5 + echo "$as_me:5294: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_time_t=yes else @@ -5295,7 +5301,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5298: result: $ac_cv_type_time_t" >&5 +echo "$as_me:5304: result: $ac_cv_type_time_t" >&5 echo "${ECHO_T}$ac_cv_type_time_t" >&6 if test $ac_cv_type_time_t = yes; then : @@ -5309,18 +5315,18 @@ ### checks for library functions if test "$cross_compiling" = no; then - echo "$as_me:5312: checking whether setvbuf arguments are reversed" >&5 + echo "$as_me:5318: 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:5318: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:5324: 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 5323 "configure" +#line 5329 "configure" #include "confdefs.h" #include <stdio.h> /* If setvbuf has the reversed format, exit 0. */ @@ -5331,21 +5337,21 @@ A reversed system may check and see that the address of main is not _IOLBF, _IONBF, or _IOFBF, and return nonzero. */ if (setvbuf(stdout, _IOLBF, (char *) main, BUFSIZ) != 0) - exit(1); + $ac_main_return(1); putc('\r', stdout); - exit(0); /* Non-reversed systems segv here. */ + $ac_main_return(0); /* Non-reversed systems segv here. */ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5340: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5346: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5343: \$? = $ac_status" >&5 + echo "$as_me:5349: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5345: \"$ac_try\"") >&5 + { (eval echo "$as_me:5351: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5348: \$? = $ac_status" >&5 + echo "$as_me:5354: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_setvbuf_reversed=yes else @@ -5358,7 +5364,7 @@ fi rm -f core core.* *.core fi -echo "$as_me:5361: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "$as_me:5367: 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 @@ -5371,13 +5377,13 @@ fi ### checks for structures -echo "$as_me:5374: checking whether stat file-mode macros are broken" >&5 +echo "$as_me:5380: checking whether stat file-mode macros are broken" >&5 echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6 if test "${ac_cv_header_stat_broken+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5380 "configure" +#line 5386 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -5416,7 +5422,7 @@ rm -f conftest* fi -echo "$as_me:5419: result: $ac_cv_header_stat_broken" >&5 +echo "$as_me:5425: result: $ac_cv_header_stat_broken" >&5 echo "${ECHO_T}$ac_cv_header_stat_broken" >&6 if test $ac_cv_header_stat_broken = yes; then @@ -5426,13 +5432,13 @@ fi -echo "$as_me:5429: checking for struct stat.st_blksize" >&5 +echo "$as_me:5435: checking for struct stat.st_blksize" >&5 echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6 if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5435 "configure" +#line 5441 "configure" #include "confdefs.h" $ac_includes_default int @@ -5446,16 +5452,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5449: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5455: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5452: \$? = $ac_status" >&5 + echo "$as_me:5458: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5455: \"$ac_try\"") >&5 + { (eval echo "$as_me:5461: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5458: \$? = $ac_status" >&5 + echo "$as_me:5464: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_member_struct_stat_st_blksize=yes else @@ -5465,7 +5471,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5468: result: $ac_cv_member_struct_stat_st_blksize" >&5 +echo "$as_me:5474: result: $ac_cv_member_struct_stat_st_blksize" >&5 echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6 if test $ac_cv_member_struct_stat_st_blksize = yes; then @@ -5479,13 +5485,13 @@ fi -echo "$as_me:5482: checking for struct stat.st_blocks" >&5 +echo "$as_me:5488: checking for struct stat.st_blocks" >&5 echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6 if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5488 "configure" +#line 5494 "configure" #include "confdefs.h" $ac_includes_default int @@ -5499,16 +5505,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5502: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5508: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5505: \$? = $ac_status" >&5 + echo "$as_me:5511: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5508: \"$ac_try\"") >&5 + { (eval echo "$as_me:5514: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5511: \$? = $ac_status" >&5 + echo "$as_me:5517: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_member_struct_stat_st_blocks=yes else @@ -5518,7 +5524,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5521: result: $ac_cv_member_struct_stat_st_blocks" >&5 +echo "$as_me:5527: result: $ac_cv_member_struct_stat_st_blocks" >&5 echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6 if test $ac_cv_member_struct_stat_st_blocks = yes; then @@ -5534,13 +5540,13 @@ LIBOBJS="$LIBOBJS fileblocks.$ac_objext" fi -echo "$as_me:5537: checking for struct stat.st_rdev" >&5 +echo "$as_me:5543: checking for struct stat.st_rdev" >&5 echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6 if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5543 "configure" +#line 5549 "configure" #include "confdefs.h" $ac_includes_default int @@ -5554,16 +5560,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5557: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5563: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5560: \$? = $ac_status" >&5 + echo "$as_me:5566: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5563: \"$ac_try\"") >&5 + { (eval echo "$as_me:5569: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5566: \$? = $ac_status" >&5 + echo "$as_me:5572: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_member_struct_stat_st_rdev=yes else @@ -5573,7 +5579,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5576: result: $ac_cv_member_struct_stat_st_rdev" >&5 +echo "$as_me:5582: result: $ac_cv_member_struct_stat_st_rdev" >&5 echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6 if test $ac_cv_member_struct_stat_st_rdev = yes; then @@ -5587,13 +5593,13 @@ fi -echo "$as_me:5590: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "$as_me:5596: checking whether struct tm is in sys/time.h or time.h" >&5 echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6 if test "${ac_cv_struct_tm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5596 "configure" +#line 5602 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -5607,16 +5613,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5610: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5616: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5613: \$? = $ac_status" >&5 + echo "$as_me:5619: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5616: \"$ac_try\"") >&5 + { (eval echo "$as_me:5622: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5619: \$? = $ac_status" >&5 + echo "$as_me:5625: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_struct_tm=time.h else @@ -5626,7 +5632,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5629: result: $ac_cv_struct_tm" >&5 +echo "$as_me:5635: result: $ac_cv_struct_tm" >&5 echo "${ECHO_T}$ac_cv_struct_tm" >&6 if test $ac_cv_struct_tm = sys/time.h; then @@ -5636,13 +5642,13 @@ fi -echo "$as_me:5639: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:5645: 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 5645 "configure" +#line 5651 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -5658,16 +5664,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5661: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5667: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5664: \$? = $ac_status" >&5 + echo "$as_me:5670: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5667: \"$ac_try\"") >&5 + { (eval echo "$as_me:5673: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5670: \$? = $ac_status" >&5 + echo "$as_me:5676: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -5677,7 +5683,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5680: result: $ac_cv_header_time" >&5 +echo "$as_me:5686: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -5687,14 +5693,14 @@ fi -echo "$as_me:5690: checking if we can include select.h with time.h" >&5 +echo "$as_me:5696: checking if we can include select.h with time.h" >&5 echo $ECHO_N "checking if we can include select.h with time.h... $ECHO_C" >&6 if test "${cf_cv_select_with_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5697 "configure" +#line 5703 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5724,16 +5730,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5727: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5733: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5730: \$? = $ac_status" >&5 + echo "$as_me:5736: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5733: \"$ac_try\"") >&5 + { (eval echo "$as_me:5739: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5736: \$? = $ac_status" >&5 + echo "$as_me:5742: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_select_with_time=yes else @@ -5744,20 +5750,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5747: result: $cf_cv_select_with_time" >&5 +echo "$as_me:5753: result: $cf_cv_select_with_time" >&5 echo "${ECHO_T}$cf_cv_select_with_time" >&6 test $cf_cv_select_with_time = yes && cat >>confdefs.h <<\EOF #define SELECT_WITH_TIME 1 EOF -echo "$as_me:5753: checking if we may include sys/resource.h with sys/wait.h" >&5 +echo "$as_me:5759: checking if we may include sys/resource.h with sys/wait.h" >&5 echo $ECHO_N "checking if we may include sys/resource.h with sys/wait.h... $ECHO_C" >&6 if test "${cf_cv_resource_with_wait+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5760 "configure" +#line 5766 "configure" #include "confdefs.h" #if defined(HAVE_SYS_TIME_H) && (defined(SELECT_WITH_TIME) || !(defined(HAVE_SELECT_H || defined(HAVE_SYS_SELECT_H)))) @@ -5781,16 +5787,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5784: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5790: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5787: \$? = $ac_status" >&5 + echo "$as_me:5793: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5790: \"$ac_try\"") >&5 + { (eval echo "$as_me:5796: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5793: \$? = $ac_status" >&5 + echo "$as_me:5799: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_resource_with_wait=yes else @@ -5801,7 +5807,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5804: result: $cf_cv_resource_with_wait" >&5 +echo "$as_me:5810: result: $cf_cv_resource_with_wait" >&5 echo "${ECHO_T}$cf_cv_resource_with_wait" >&6 test $cf_cv_resource_with_wait = yes && cat >>confdefs.h <<\EOF #define RESOURCE_WITH_WAIT 1 @@ -5814,23 +5820,23 @@ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5817: checking for $ac_header" >&5 +echo "$as_me:5823: 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 5823 "configure" +#line 5829 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5827: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5833: \"$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:5833: \$? = $ac_status" >&5 + echo "$as_me:5839: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5849,7 +5855,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5852: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5858: 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 <<EOF @@ -5864,23 +5870,23 @@ for ac_header in sys/termio.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5867: checking for $ac_header" >&5 +echo "$as_me:5873: 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 5873 "configure" +#line 5879 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5877: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5883: \"$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:5883: \$? = $ac_status" >&5 + echo "$as_me:5889: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5899,7 +5905,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5902: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5908: 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 <<EOF @@ -5917,10 +5923,10 @@ *) termios_bad=maybe ;; esac if test "$termios_bad" = maybe ; then - echo "$as_me:5920: checking whether termios.h needs _POSIX_SOURCE" >&5 + echo "$as_me:5926: 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 5923 "configure" +#line 5929 "configure" #include "confdefs.h" #include <termios.h> int @@ -5932,16 +5938,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5935: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5941: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5938: \$? = $ac_status" >&5 + echo "$as_me:5944: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5941: \"$ac_try\"") >&5 + { (eval echo "$as_me:5947: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5944: \$? = $ac_status" >&5 + echo "$as_me:5950: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=no else @@ -5949,7 +5955,7 @@ cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 5952 "configure" +#line 5958 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -5963,16 +5969,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5966: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5972: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5969: \$? = $ac_status" >&5 + echo "$as_me:5975: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5972: \"$ac_try\"") >&5 + { (eval echo "$as_me:5978: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5975: \$? = $ac_status" >&5 + echo "$as_me:5981: \$? = $ac_status" >&5 (exit $ac_status); }; }; then termios_bad=unknown else @@ -5987,12 +5993,12 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:5990: result: $termios_bad" >&5 + echo "$as_me:5996: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:5995: checking declaration of size-change" >&5 +echo "$as_me:6001: 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 @@ -6007,7 +6013,7 @@ CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat >conftest.$ac_ext <<_ACEOF -#line 6010 "configure" +#line 6016 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef HAVE_TERMIOS_H @@ -6051,16 +6057,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6054: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6060: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6057: \$? = $ac_status" >&5 + echo "$as_me:6063: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6060: \"$ac_try\"") >&5 + { (eval echo "$as_me:6066: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6063: \$? = $ac_status" >&5 + echo "$as_me:6069: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sizechange=yes else @@ -6079,7 +6085,7 @@ done fi -echo "$as_me:6082: result: $cf_cv_sizechange" >&5 +echo "$as_me:6088: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then cat >>confdefs.h <<\EOF @@ -6096,7 +6102,7 @@ esac fi -echo "$as_me:6099: checking for file-pointer ready definition" >&5 +echo "$as_me:6105: checking for file-pointer ready definition" >&5 echo $ECHO_N "checking for file-pointer ready definition... $ECHO_C" >&6 if test "${cf_cv_fp_isready+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6110,7 +6116,7 @@ echo "test-compile $definition" 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 6113 "configure" +#line 6119 "configure" #include "confdefs.h" #include <stdio.h> @@ -6125,16 +6131,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6128: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6134: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6131: \$? = $ac_status" >&5 + echo "$as_me:6137: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6134: \"$ac_try\"") >&5 + { (eval echo "$as_me:6140: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6137: \$? = $ac_status" >&5 + echo "$as_me:6143: \$? = $ac_status" >&5 (exit $ac_status); }; }; then echo "$definition" >conftest.env break @@ -6158,21 +6164,21 @@ test -f conftest.env && cf_cv_fp_isready=`cat conftest.env` fi -echo "$as_me:6161: result: $cf_cv_fp_isready" >&5 +echo "$as_me:6167: result: $cf_cv_fp_isready" >&5 echo "${ECHO_T}$cf_cv_fp_isready" >&6 test "$cf_cv_fp_isready" != none && cat >>confdefs.h <<EOF #define isready_c(p) $cf_cv_fp_isready EOF -echo "$as_me:6168: checking for <wctype.h> and functions" >&5 +echo "$as_me:6174: checking for <wctype.h> and functions" >&5 echo $ECHO_N "checking for <wctype.h> and functions... $ECHO_C" >&6 if test "${cf_cv_have_wctype+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6175 "configure" +#line 6181 "configure" #include "confdefs.h" #include <wctype.h> @@ -6199,16 +6205,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6202: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6208: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6205: \$? = $ac_status" >&5 + echo "$as_me:6211: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6208: \"$ac_try\"") >&5 + { (eval echo "$as_me:6214: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6211: \$? = $ac_status" >&5 + echo "$as_me:6217: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_wctype=yes else @@ -6219,10 +6225,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6222: result: $cf_cv_have_wctype" >&5 +echo "$as_me:6228: result: $cf_cv_have_wctype" >&5 echo "${ECHO_T}$cf_cv_have_wctype" >&6 if test "$cf_cv_have_wctype" = yes ; then - echo "$as_me:6225: checking for library containing wctype" >&5 + echo "$as_me:6231: checking for library containing wctype" >&5 echo $ECHO_N "checking for library containing wctype... $ECHO_C" >&6 if test "${ac_cv_search_wctype+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6230,7 +6236,7 @@ ac_func_search_save_LIBS=$LIBS ac_cv_search_wctype=no cat >conftest.$ac_ext <<_ACEOF -#line 6233 "configure" +#line 6239 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6249,16 +6255,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6252: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6258: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6255: \$? = $ac_status" >&5 + echo "$as_me:6261: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6258: \"$ac_try\"") >&5 + { (eval echo "$as_me:6264: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6261: \$? = $ac_status" >&5 + echo "$as_me:6267: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_search_wctype="none required" else @@ -6270,7 +6276,7 @@ for ac_lib in w; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6273 "configure" +#line 6279 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6289,16 +6295,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6292: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6298: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6295: \$? = $ac_status" >&5 + echo "$as_me:6301: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6298: \"$ac_try\"") >&5 + { (eval echo "$as_me:6304: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6301: \$? = $ac_status" >&5 + echo "$as_me:6307: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_search_wctype="-l$ac_lib" break @@ -6311,7 +6317,7 @@ fi LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:6314: result: $ac_cv_search_wctype" >&5 +echo "$as_me:6320: result: $ac_cv_search_wctype" >&5 echo "${ECHO_T}$ac_cv_search_wctype" >&6 if test "$ac_cv_search_wctype" != no; then test "$ac_cv_search_wctype" = "none required" || LIBS="$ac_cv_search_wctype $LIBS" @@ -6324,7 +6330,7 @@ fi ### checks for system services and user specified options -echo "$as_me:6327: checking for long file names" >&5 +echo "$as_me:6333: 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 @@ -6363,7 +6369,7 @@ rm -rf $ac_xdir 2>/dev/null done fi -echo "$as_me:6366: result: $ac_cv_sys_long_file_names" >&5 +echo "$as_me:6372: 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 @@ -6373,7 +6379,7 @@ fi -echo "$as_me:6376: checking for restartable reads on pipes" >&5 +echo "$as_me:6382: checking for restartable reads on pipes" >&5 echo $ECHO_N "checking for restartable reads on pipes... $ECHO_C" >&6 if test "${cf_cv_can_restart_read+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6383,7 +6389,7 @@ cf_cv_can_restart_read=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 6386 "configure" +#line 6392 "configure" #include "confdefs.h" /* Exit 0 (true) if wait returns something other than -1, i.e. the pid of the child, which means that wait was restarted @@ -6430,15 +6436,15 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6433: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6439: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6436: \$? = $ac_status" >&5 + echo "$as_me:6442: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6438: \"$ac_try\"") >&5 + { (eval echo "$as_me:6444: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6441: \$? = $ac_status" >&5 + echo "$as_me:6447: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_can_restart_read=yes else @@ -6451,7 +6457,7 @@ fi fi -echo "$as_me:6454: result: $cf_cv_can_restart_read" >&5 +echo "$as_me:6460: result: $cf_cv_can_restart_read" >&5 echo "${ECHO_T}$cf_cv_can_restart_read" >&6 test $cf_cv_can_restart_read = yes && cat >>confdefs.h <<\EOF @@ -6460,18 +6466,18 @@ # is a read() of a pipe restartable? -echo "$as_me:6463: checking whether setpgrp takes no argument" >&5 +echo "$as_me:6469: checking whether setpgrp takes no argument" >&5 echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6 if test "${ac_cv_func_setpgrp_void+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { { echo "$as_me:6469: error: cannot check setpgrp if cross compiling" >&5 + { { echo "$as_me:6475: error: cannot check setpgrp if cross compiling" >&5 echo "$as_me: error: cannot check setpgrp if cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line 6474 "configure" +#line 6480 "configure" #include "confdefs.h" #if HAVE_UNISTD_H # include <unistd.h> @@ -6482,21 +6488,21 @@ { /* If this system has a BSD-style setpgrp, which takes arguments, exit successfully. */ - exit (setpgrp (1,1) == -1); + $ac_main_return (setpgrp (1,1) == -1); ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6491: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6497: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6494: \$? = $ac_status" >&5 + echo "$as_me:6500: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6496: \"$ac_try\"") >&5 + { (eval echo "$as_me:6502: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6499: \$? = $ac_status" >&5 + echo "$as_me:6505: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_setpgrp_void=no else @@ -6508,7 +6514,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:6511: result: $ac_cv_func_setpgrp_void" >&5 +echo "$as_me:6517: result: $ac_cv_func_setpgrp_void" >&5 echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6 if test $ac_cv_func_setpgrp_void = yes; then @@ -6518,14 +6524,14 @@ fi -echo "$as_me:6521: checking whether getpgrp takes no argument" >&5 +echo "$as_me:6527: checking whether getpgrp takes no argument" >&5 echo $ECHO_N "checking whether getpgrp takes no argument... $ECHO_C" >&6 if test "${ac_cv_func_getpgrp_void+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else # Use it with a single arg. cat >conftest.$ac_ext <<_ACEOF -#line 6528 "configure" +#line 6534 "configure" #include "confdefs.h" $ac_includes_default int @@ -6537,16 +6543,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6540: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6546: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6543: \$? = $ac_status" >&5 + echo "$as_me:6549: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6546: \"$ac_try\"") >&5 + { (eval echo "$as_me:6552: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6549: \$? = $ac_status" >&5 + echo "$as_me:6555: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_func_getpgrp_1=yes else @@ -6557,7 +6563,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext # Use it with no arg. cat >conftest.$ac_ext <<_ACEOF -#line 6560 "configure" +#line 6566 "configure" #include "confdefs.h" $ac_includes_default int @@ -6569,16 +6575,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6572: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6578: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6575: \$? = $ac_status" >&5 + echo "$as_me:6581: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6578: \"$ac_try\"") >&5 + { (eval echo "$as_me:6584: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6581: \$? = $ac_status" >&5 + echo "$as_me:6587: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_func_getpgrp_0=yes else @@ -6592,12 +6598,12 @@ yes:no) ac_cv_func_getpgrp_void=yes;; no:yes) ac_cv_func_getpgrp_void=false;; *) if test "$cross_compiling" = yes; then - { { echo "$as_me:6595: error: cannot check getpgrp if cross compiling" >&5 + { { echo "$as_me:6601: error: cannot check getpgrp if cross compiling" >&5 echo "$as_me: error: cannot check getpgrp if cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line 6600 "configure" +#line 6606 "configure" #include "confdefs.h" $ac_includes_default @@ -6624,11 +6630,11 @@ /* If all of these values are the same, it's pretty sure that we're on a system that ignores getpgrp's first argument. */ if (pg2 == pg4 && pg1 == pg3 && pg2 == pg3) - exit (0); + $ac_main_return (0); child = fork (); if (child < 0) - exit(1); + $ac_main_return(1); else if (child == 0) { np = getpid (); @@ -6638,28 +6644,28 @@ setpgrp (np, pg1); ng = getpgrp (0); /* Same result for Sys V and BSD */ if (ng == pg1) - exit (1); + $ac_main_return (1); else - exit (0); + $ac_main_return (0); } else { wait (&s); - exit (s>>8); + $ac_main_return (s>>8); } } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6654: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6660: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6657: \$? = $ac_status" >&5 + echo "$as_me:6663: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6659: \"$ac_try\"") >&5 + { (eval echo "$as_me:6665: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6662: \$? = $ac_status" >&5 + echo "$as_me:6668: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_getpgrp_void=yes else @@ -6673,7 +6679,7 @@ esac # $ac_func_getpgrp_0:$ac_func_getpgrp_1 fi -echo "$as_me:6676: result: $ac_cv_func_getpgrp_void" >&5 +echo "$as_me:6682: result: $ac_cv_func_getpgrp_void" >&5 echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6 if test $ac_cv_func_getpgrp_void = yes; then @@ -6683,7 +6689,7 @@ fi -echo "$as_me:6686: checking if killpg is needed" >&5 +echo "$as_me:6692: checking if killpg is needed" >&5 echo $ECHO_N "checking if killpg is needed... $ECHO_C" >&6 if test "${cf_cv_need_killpg+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6693,7 +6699,7 @@ cf_cv_need_killpg=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 6696 "configure" +#line 6702 "configure" #include "confdefs.h" #include <sys/types.h> @@ -6718,15 +6724,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6721: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6727: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6724: \$? = $ac_status" >&5 + echo "$as_me:6730: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6726: \"$ac_try\"") >&5 + { (eval echo "$as_me:6732: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6729: \$? = $ac_status" >&5 + echo "$as_me:6735: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_killpg=no else @@ -6739,21 +6745,21 @@ fi fi -echo "$as_me:6742: result: $cf_cv_need_killpg" >&5 +echo "$as_me:6748: result: $cf_cv_need_killpg" >&5 echo "${ECHO_T}$cf_cv_need_killpg" >&6 test $cf_cv_need_killpg = yes && cat >>confdefs.h <<\EOF #define HAVE_KILLPG 1 EOF -echo "$as_me:6749: checking if external errno is declared" >&5 +echo "$as_me:6755: 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 6756 "configure" +#line 6762 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -6771,16 +6777,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6774: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6780: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6777: \$? = $ac_status" >&5 + echo "$as_me:6783: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6780: \"$ac_try\"") >&5 + { (eval echo "$as_me:6786: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6783: \$? = $ac_status" >&5 + echo "$as_me:6789: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_errno=yes else @@ -6791,7 +6797,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6794: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:6800: result: $cf_cv_dcl_errno" >&5 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then @@ -6806,14 +6812,14 @@ # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:6809: checking if external errno exists" >&5 +echo "$as_me:6815: 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 6816 "configure" +#line 6822 "configure" #include "confdefs.h" #undef errno @@ -6828,16 +6834,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6831: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6837: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6834: \$? = $ac_status" >&5 + echo "$as_me:6840: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6837: \"$ac_try\"") >&5 + { (eval echo "$as_me:6843: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6840: \$? = $ac_status" >&5 + echo "$as_me:6846: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_errno=yes else @@ -6848,7 +6854,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6851: result: $cf_cv_have_errno" >&5 +echo "$as_me:6857: result: $cf_cv_have_errno" >&5 echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then @@ -6861,14 +6867,14 @@ fi -echo "$as_me:6864: checking if external sys_nerr is declared" >&5 +echo "$as_me:6870: checking if external sys_nerr is declared" >&5 echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_sys_nerr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6871 "configure" +#line 6877 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -6886,16 +6892,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6889: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6895: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6892: \$? = $ac_status" >&5 + echo "$as_me:6898: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6895: \"$ac_try\"") >&5 + { (eval echo "$as_me:6901: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6898: \$? = $ac_status" >&5 + echo "$as_me:6904: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_sys_nerr=yes else @@ -6906,7 +6912,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6909: result: $cf_cv_dcl_sys_nerr" >&5 +echo "$as_me:6915: result: $cf_cv_dcl_sys_nerr" >&5 echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6 if test "$cf_cv_dcl_sys_nerr" = no ; then @@ -6921,14 +6927,14 @@ # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:6924: checking if external sys_nerr exists" >&5 +echo "$as_me:6930: checking if external sys_nerr exists" >&5 echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6 if test "${cf_cv_have_sys_nerr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6931 "configure" +#line 6937 "configure" #include "confdefs.h" #undef sys_nerr @@ -6943,16 +6949,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6946: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6952: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6949: \$? = $ac_status" >&5 + echo "$as_me:6955: \$? = $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:6958: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6955: \$? = $ac_status" >&5 + echo "$as_me:6961: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_sys_nerr=yes else @@ -6963,7 +6969,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6966: result: $cf_cv_have_sys_nerr" >&5 +echo "$as_me:6972: result: $cf_cv_have_sys_nerr" >&5 echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6 if test "$cf_cv_have_sys_nerr" = yes ; then @@ -6976,14 +6982,14 @@ fi -echo "$as_me:6979: checking if external sys_errlist is declared" >&5 +echo "$as_me:6985: checking if external sys_errlist is declared" >&5 echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_sys_errlist+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6986 "configure" +#line 6992 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -7001,16 +7007,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7004: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7010: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7007: \$? = $ac_status" >&5 + echo "$as_me:7013: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7010: \"$ac_try\"") >&5 + { (eval echo "$as_me:7016: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7013: \$? = $ac_status" >&5 + echo "$as_me:7019: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_sys_errlist=yes else @@ -7021,7 +7027,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7024: result: $cf_cv_dcl_sys_errlist" >&5 +echo "$as_me:7030: result: $cf_cv_dcl_sys_errlist" >&5 echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6 if test "$cf_cv_dcl_sys_errlist" = no ; then @@ -7036,14 +7042,14 @@ # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:7039: checking if external sys_errlist exists" >&5 +echo "$as_me:7045: checking if external sys_errlist exists" >&5 echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6 if test "${cf_cv_have_sys_errlist+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7046 "configure" +#line 7052 "configure" #include "confdefs.h" #undef sys_errlist @@ -7058,16 +7064,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7061: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7067: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7064: \$? = $ac_status" >&5 + echo "$as_me:7070: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7067: \"$ac_try\"") >&5 + { (eval echo "$as_me:7073: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7070: \$? = $ac_status" >&5 + echo "$as_me:7076: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_sys_errlist=yes else @@ -7078,7 +7084,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7081: result: $cf_cv_have_sys_errlist" >&5 +echo "$as_me:7087: result: $cf_cv_have_sys_errlist" >&5 echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6 if test "$cf_cv_have_sys_errlist" = yes ; then @@ -7104,7 +7110,7 @@ #define os_chosen 1 EOF -echo "$as_me:7107: checking for screen type" >&5 +echo "$as_me:7113: checking for screen type" >&5 echo $ECHO_N "checking for screen type... $ECHO_C" >&6 # Check whether --with-screen or --without-screen was given. @@ -7125,14 +7131,14 @@ if test -z "$screen"; then screen=termcap; fi -echo "$as_me:7128: result: $screen" >&5 +echo "$as_me:7134: result: $screen" >&5 echo "${ECHO_T}$screen" >&6 : See if this is any type of xvile configuration: case "$screen" in [Oo]pen[Ll]ook | [Mm]otif* | [xX] | [Aa]thena | [xX][atTmMoO]* | [xX]11 | neXtaw | XawPlus ) EXTRA_INSTALL_FILES="$EXTRA_INSTALL_FILES \$(INSTALL_X_FILES)" - echo "$as_me:7135: checking for X" >&5 + echo "$as_me:7141: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -7229,17 +7235,17 @@ # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF -#line 7232 "configure" +#line 7238 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> _ACEOF -if { (eval echo "$as_me:7236: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:7242: \"$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:7242: \$? = $ac_status" >&5 + echo "$as_me:7248: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7272,7 +7278,7 @@ ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7275 "configure" +#line 7281 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> int @@ -7284,16 +7290,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7287: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7293: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7290: \$? = $ac_status" >&5 + echo "$as_me:7296: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7293: \"$ac_try\"") >&5 + { (eval echo "$as_me:7299: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7296: \$? = $ac_status" >&5 + echo "$as_me:7302: \$? = $ac_status" >&5 (exit $ac_status); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -7331,7 +7337,7 @@ fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:7334: result: $have_x" >&5 + echo "$as_me:7340: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -7341,7 +7347,7 @@ # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:7344: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:7350: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -7365,11 +7371,11 @@ # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:7368: checking whether -R must be followed by a space" >&5 + echo "$as_me:7374: checking whether -R must be followed by a space" >&5 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line 7372 "configure" +#line 7378 "configure" #include "confdefs.h" int @@ -7381,16 +7387,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7384: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7390: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7387: \$? = $ac_status" >&5 + echo "$as_me:7393: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7390: \"$ac_try\"") >&5 + { (eval echo "$as_me:7396: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7393: \$? = $ac_status" >&5 + echo "$as_me:7399: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_nospace=yes else @@ -7400,13 +7406,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_nospace = yes; then - echo "$as_me:7403: result: no" >&5 + echo "$as_me:7409: result: no" >&5 echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line 7409 "configure" +#line 7415 "configure" #include "confdefs.h" int @@ -7418,16 +7424,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7421: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7427: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7424: \$? = $ac_status" >&5 + echo "$as_me:7430: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7427: \"$ac_try\"") >&5 + { (eval echo "$as_me:7433: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7430: \$? = $ac_status" >&5 + echo "$as_me:7436: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_space=yes else @@ -7437,11 +7443,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_space = yes; then - echo "$as_me:7440: result: yes" >&5 + echo "$as_me:7446: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:7444: result: neither works" >&5 + echo "$as_me:7450: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -7461,7 +7467,7 @@ # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >conftest.$ac_ext <<_ACEOF -#line 7464 "configure" +#line 7470 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7480,22 +7486,22 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7483: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7489: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7486: \$? = $ac_status" >&5 + echo "$as_me:7492: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7489: \"$ac_try\"") >&5 + { (eval echo "$as_me:7495: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7492: \$? = $ac_status" >&5 + echo "$as_me:7498: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:7498: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:7504: checking for dnet_ntoa in -ldnet" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7503,7 +7509,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7506 "configure" +#line 7512 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7522,16 +7528,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7525: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7531: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7528: \$? = $ac_status" >&5 + echo "$as_me:7534: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7531: \"$ac_try\"") >&5 + { (eval echo "$as_me:7537: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7534: \$? = $ac_status" >&5 + echo "$as_me:7540: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -7542,14 +7548,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7545: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:7551: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:7552: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:7558: checking for dnet_ntoa in -ldnet_stub" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7557,7 +7563,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7560 "configure" +#line 7566 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7576,16 +7582,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7579: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7585: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7582: \$? = $ac_status" >&5 + echo "$as_me:7588: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7585: \"$ac_try\"") >&5 + { (eval echo "$as_me:7591: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7588: \$? = $ac_status" >&5 + echo "$as_me:7594: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -7596,7 +7602,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7599: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:7605: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" @@ -7615,13 +7621,13 @@ # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:7618: checking for gethostbyname" >&5 + echo "$as_me:7624: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7624 "configure" +#line 7630 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname (); below. */ @@ -7652,16 +7658,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7655: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7661: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7658: \$? = $ac_status" >&5 + echo "$as_me:7664: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7661: \"$ac_try\"") >&5 + { (eval echo "$as_me:7667: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7664: \$? = $ac_status" >&5 + echo "$as_me:7670: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gethostbyname=yes else @@ -7671,11 +7677,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7674: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:7680: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:7678: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:7684: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7683,7 +7689,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7686 "configure" +#line 7692 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7702,16 +7708,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7705: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7711: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7708: \$? = $ac_status" >&5 + echo "$as_me:7714: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7711: \"$ac_try\"") >&5 + { (eval echo "$as_me:7717: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7714: \$? = $ac_status" >&5 + echo "$as_me:7720: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -7722,14 +7728,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7725: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:7731: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 if test $ac_cv_lib_nsl_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:7732: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:7738: checking for gethostbyname in -lbsd" >&5 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7737,7 +7743,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7740 "configure" +#line 7746 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7756,16 +7762,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7759: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7765: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7762: \$? = $ac_status" >&5 + echo "$as_me:7768: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7765: \"$ac_try\"") >&5 + { (eval echo "$as_me:7771: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7768: \$? = $ac_status" >&5 + echo "$as_me:7774: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -7776,7 +7782,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7779: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:7785: result: $ac_cv_lib_bsd_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 if test $ac_cv_lib_bsd_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" @@ -7792,13 +7798,13 @@ # variants that don't use the nameserver (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:7795: checking for connect" >&5 + echo "$as_me:7801: checking for connect" >&5 echo $ECHO_N "checking for connect... $ECHO_C" >&6 if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7801 "configure" +#line 7807 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect (); below. */ @@ -7829,16 +7835,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7832: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7838: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7835: \$? = $ac_status" >&5 + echo "$as_me:7841: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7838: \"$ac_try\"") >&5 + { (eval echo "$as_me:7844: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7841: \$? = $ac_status" >&5 + echo "$as_me:7847: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_connect=yes else @@ -7848,11 +7854,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7851: result: $ac_cv_func_connect" >&5 +echo "$as_me:7857: result: $ac_cv_func_connect" >&5 echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo "$as_me:7855: checking for connect in -lsocket" >&5 + echo "$as_me:7861: checking for connect in -lsocket" >&5 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7860,7 +7866,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7863 "configure" +#line 7869 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7879,16 +7885,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7882: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7888: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7885: \$? = $ac_status" >&5 + echo "$as_me:7891: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7888: \"$ac_try\"") >&5 + { (eval echo "$as_me:7894: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7891: \$? = $ac_status" >&5 + echo "$as_me:7897: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_connect=yes else @@ -7899,7 +7905,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7902: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:7908: result: $ac_cv_lib_socket_connect" >&5 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" @@ -7908,13 +7914,13 @@ fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:7911: checking for remove" >&5 + echo "$as_me:7917: checking for remove" >&5 echo $ECHO_N "checking for remove... $ECHO_C" >&6 if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7917 "configure" +#line 7923 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove (); below. */ @@ -7945,16 +7951,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7948: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7954: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7951: \$? = $ac_status" >&5 + echo "$as_me:7957: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7954: \"$ac_try\"") >&5 + { (eval echo "$as_me:7960: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7957: \$? = $ac_status" >&5 + echo "$as_me:7963: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_remove=yes else @@ -7964,11 +7970,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7967: result: $ac_cv_func_remove" >&5 +echo "$as_me:7973: result: $ac_cv_func_remove" >&5 echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo "$as_me:7971: checking for remove in -lposix" >&5 + echo "$as_me:7977: checking for remove in -lposix" >&5 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7976,7 +7982,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7979 "configure" +#line 7985 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7995,16 +8001,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7998: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8004: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8001: \$? = $ac_status" >&5 + echo "$as_me:8007: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8004: \"$ac_try\"") >&5 + { (eval echo "$as_me:8010: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8007: \$? = $ac_status" >&5 + echo "$as_me:8013: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_posix_remove=yes else @@ -8015,7 +8021,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8018: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:8024: result: $ac_cv_lib_posix_remove" >&5 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" @@ -8024,13 +8030,13 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:8027: checking for shmat" >&5 + echo "$as_me:8033: checking for shmat" >&5 echo $ECHO_N "checking for shmat... $ECHO_C" >&6 if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8033 "configure" +#line 8039 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat (); below. */ @@ -8061,16 +8067,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8064: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8070: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8067: \$? = $ac_status" >&5 + echo "$as_me:8073: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8070: \"$ac_try\"") >&5 + { (eval echo "$as_me:8076: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8073: \$? = $ac_status" >&5 + echo "$as_me:8079: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_shmat=yes else @@ -8080,11 +8086,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8083: result: $ac_cv_func_shmat" >&5 +echo "$as_me:8089: result: $ac_cv_func_shmat" >&5 echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo "$as_me:8087: checking for shmat in -lipc" >&5 + echo "$as_me:8093: checking for shmat in -lipc" >&5 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8092,7 +8098,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8095 "configure" +#line 8101 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8111,16 +8117,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8114: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8120: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8117: \$? = $ac_status" >&5 + echo "$as_me:8123: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8120: \"$ac_try\"") >&5 + { (eval echo "$as_me:8126: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8123: \$? = $ac_status" >&5 + echo "$as_me:8129: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -8131,7 +8137,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8134: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:8140: result: $ac_cv_lib_ipc_shmat" >&5 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" @@ -8149,7 +8155,7 @@ # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:8152: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:8158: checking for IceConnectionNumber in -lICE" >&5 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8157,7 +8163,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8160 "configure" +#line 8166 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8176,16 +8182,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8179: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8185: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8182: \$? = $ac_status" >&5 + echo "$as_me:8188: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8185: \"$ac_try\"") >&5 + { (eval echo "$as_me:8191: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8188: \$? = $ac_status" >&5 + echo "$as_me:8194: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -8196,7 +8202,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8199: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:8205: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" @@ -8290,7 +8296,7 @@ if test "$cf_check_cflags" != "$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 8293 "configure" +#line 8299 "configure" #include "confdefs.h" #include <stdio.h> int @@ -8302,16 +8308,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8305: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8311: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8308: \$? = $ac_status" >&5 + echo "$as_me:8314: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8311: \"$ac_try\"") >&5 + { (eval echo "$as_me:8317: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8314: \$? = $ac_status" >&5 + echo "$as_me:8320: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8328,13 +8334,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8331: checking for XOpenDisplay" >&5 +echo "$as_me:8337: checking for XOpenDisplay" >&5 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6 if test "${ac_cv_func_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8337 "configure" +#line 8343 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char XOpenDisplay (); below. */ @@ -8365,16 +8371,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8368: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8374: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8371: \$? = $ac_status" >&5 + echo "$as_me:8377: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8374: \"$ac_try\"") >&5 + { (eval echo "$as_me:8380: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8377: \$? = $ac_status" >&5 + echo "$as_me:8383: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XOpenDisplay=yes else @@ -8384,13 +8390,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8387: result: $ac_cv_func_XOpenDisplay" >&5 +echo "$as_me:8393: result: $ac_cv_func_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6 if test $ac_cv_func_XOpenDisplay = yes; then : else -echo "$as_me:8393: checking for XOpenDisplay in -lX11" >&5 +echo "$as_me:8399: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8398,7 +8404,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8401 "configure" +#line 8407 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8417,16 +8423,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8420: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8426: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8423: \$? = $ac_status" >&5 + echo "$as_me:8429: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8426: \"$ac_try\"") >&5 + { (eval echo "$as_me:8432: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8429: \$? = $ac_status" >&5 + echo "$as_me:8435: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -8437,7 +8443,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8440: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:8446: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test $ac_cv_lib_X11_XOpenDisplay = yes; then LIBS="-lX11 $LIBS" @@ -8445,13 +8451,13 @@ fi -echo "$as_me:8448: checking for XtAppInitialize" >&5 +echo "$as_me:8454: checking for XtAppInitialize" >&5 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6 if test "${ac_cv_func_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8454 "configure" +#line 8460 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char XtAppInitialize (); below. */ @@ -8482,16 +8488,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8485: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8491: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8488: \$? = $ac_status" >&5 + echo "$as_me:8494: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8491: \"$ac_try\"") >&5 + { (eval echo "$as_me:8497: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8494: \$? = $ac_status" >&5 + echo "$as_me:8500: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XtAppInitialize=yes else @@ -8501,13 +8507,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8504: result: $ac_cv_func_XtAppInitialize" >&5 +echo "$as_me:8510: result: $ac_cv_func_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6 if test $ac_cv_func_XtAppInitialize = yes; then : else -echo "$as_me:8510: checking for XtAppInitialize in -lXt" >&5 +echo "$as_me:8516: checking for XtAppInitialize in -lXt" >&5 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8515,7 +8521,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8518 "configure" +#line 8524 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8534,16 +8540,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8537: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8543: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8540: \$? = $ac_status" >&5 + echo "$as_me:8546: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8543: \"$ac_try\"") >&5 + { (eval echo "$as_me:8549: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8546: \$? = $ac_status" >&5 + echo "$as_me:8552: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xt_XtAppInitialize=yes else @@ -8554,7 +8560,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8557: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "$as_me:8563: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then cat >>confdefs.h <<\EOF @@ -8568,7 +8574,7 @@ fi if test $cf_have_X_LIBS = no ; then - { echo "$as_me:8571: WARNING: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:8577: WARNING: Unable to successfully link X Toolkit library (-lXt) with test program. You will have to check and add the proper libraries by hand to makefile." >&5 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with @@ -8576,7 +8582,7 @@ to makefile." >&2;} fi -echo "$as_me:8579: checking if you want narrow prototypes for X libraries" >&5 +echo "$as_me:8585: checking if you want narrow prototypes for X libraries" >&5 echo $ECHO_N "checking if you want narrow prototypes for X libraries... $ECHO_C" >&6 case `$ac_config_guess` in #(vi @@ -8602,10 +8608,10 @@ enable_narrowproto=$cf_default_narrowproto fi; -echo "$as_me:8605: result: $enable_narrowproto" >&5 +echo "$as_me:8611: result: $enable_narrowproto" >&5 echo "${ECHO_T}$enable_narrowproto" >&6 -echo "$as_me:8608: checking if we should use imake to help" >&5 +echo "$as_me:8614: checking if we should use imake to help" >&5 echo $ECHO_N "checking if we should use imake to help... $ECHO_C" >&6 # Check whether --enable-imake or --disable-imake was given. @@ -8622,7 +8628,7 @@ enable_imake=yes fi; -echo "$as_me:8625: result: $enable_imake" >&5 +echo "$as_me:8631: result: $enable_imake" >&5 echo "${ECHO_T}$enable_imake" >&6 if test "$enable_imake" = yes ; then @@ -8631,7 +8637,7 @@ 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:8634: checking for $ac_word" >&5 +echo "$as_me:8640: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_IMAKE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8648,7 +8654,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_IMAKE="$ac_dir/$ac_word" - echo "$as_me:8651: found $ac_dir/$ac_word" >&5 + echo "$as_me:8657: found $ac_dir/$ac_word" >&5 break fi done @@ -8659,10 +8665,10 @@ IMAKE=$ac_cv_path_IMAKE if test -n "$IMAKE"; then - echo "$as_me:8662: result: $IMAKE" >&5 + echo "$as_me:8668: result: $IMAKE" >&5 echo "${ECHO_T}$IMAKE" >&6 else - echo "$as_me:8665: result: no" >&5 + echo "$as_me:8671: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8735,7 +8741,7 @@ esac done if test -z "$cf_config" ; then - { echo "$as_me:8738: WARNING: Could not find imake config-directory" >&5 + { echo "$as_me:8744: WARNING: Could not find imake config-directory" >&5 echo "$as_me: WARNING: Could not find imake config-directory" >&2;} else cf_imake_opts="$cf_imake_opts -I$cf_config" @@ -8744,7 +8750,7 @@ test -n "$verbose" && echo " Using $IMAKE $cf_config" 1>&6 else - { echo "$as_me:8747: WARNING: Cannot run $IMAKE" >&5 + { echo "$as_me:8753: WARNING: Cannot run $IMAKE" >&5 echo "$as_me: WARNING: Cannot run $IMAKE" >&2;} fi fi @@ -9081,7 +9087,7 @@ if test "$cf_check_cflags" != "$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 9084 "configure" +#line 9090 "configure" #include "confdefs.h" #include <stdio.h> int @@ -9093,16 +9099,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9096: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9102: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9099: \$? = $ac_status" >&5 + echo "$as_me:9105: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9102: \"$ac_try\"") >&5 + { (eval echo "$as_me:9108: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9105: \$? = $ac_status" >&5 + echo "$as_me:9111: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9132,23 +9138,23 @@ for ac_header in X11/IntrinsicI.h X11/Xpoll.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:9135: checking for $ac_header" >&5 +echo "$as_me:9141: 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 9141 "configure" +#line 9147 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:9145: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:9151: \"$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:9151: \$? = $ac_status" >&5 + echo "$as_me:9157: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9167,7 +9173,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:9170: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:9176: 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 <<EOF @@ -9193,7 +9199,7 @@ fi LDFLAGS="$LDFLAGS $X_LIBS" -echo "$as_me:9196: checking for XmuClientWindow in -lXmu" >&5 +echo "$as_me:9202: checking for XmuClientWindow in -lXmu" >&5 echo $ECHO_N "checking for XmuClientWindow in -lXmu... $ECHO_C" >&6 if test "${ac_cv_lib_Xmu_XmuClientWindow+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9201,7 +9207,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXmu $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9204 "configure" +#line 9210 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9220,16 +9226,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9223: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9229: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9226: \$? = $ac_status" >&5 + echo "$as_me:9232: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9229: \"$ac_try\"") >&5 + { (eval echo "$as_me:9235: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9232: \$? = $ac_status" >&5 + echo "$as_me:9238: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xmu_XmuClientWindow=yes else @@ -9240,7 +9246,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9243: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5 +echo "$as_me:9249: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5 echo "${ECHO_T}$ac_cv_lib_Xmu_XmuClientWindow" >&6 if test $ac_cv_lib_Xmu_XmuClientWindow = yes; then cat >>confdefs.h <<EOF @@ -9251,7 +9257,7 @@ fi -echo "$as_me:9254: checking for OlToolkitInitialize in -lXol" >&5 +echo "$as_me:9260: checking for OlToolkitInitialize in -lXol" >&5 echo $ECHO_N "checking for OlToolkitInitialize in -lXol... $ECHO_C" >&6 if test "${ac_cv_lib_Xol_OlToolkitInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9259,7 +9265,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXol $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9262 "configure" +#line 9268 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9278,16 +9284,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9281: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9287: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9284: \$? = $ac_status" >&5 + echo "$as_me:9290: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9287: \"$ac_try\"") >&5 + { (eval echo "$as_me:9293: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9290: \$? = $ac_status" >&5 + echo "$as_me:9296: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xol_OlToolkitInitialize=yes else @@ -9298,12 +9304,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9301: result: $ac_cv_lib_Xol_OlToolkitInitialize" >&5 +echo "$as_me:9307: result: $ac_cv_lib_Xol_OlToolkitInitialize" >&5 echo "${ECHO_T}$ac_cv_lib_Xol_OlToolkitInitialize" >&6 if test $ac_cv_lib_Xol_OlToolkitInitialize = yes; then LIBS="-lXol -lm $LIBS" else - { { echo "$as_me:9306: error: Unable to successfully link OpenLook library (-lXol) with test program" >&5 + { { echo "$as_me:9312: error: Unable to successfully link OpenLook library (-lXol) with test program" >&5 echo "$as_me: error: Unable to successfully link OpenLook library (-lXol) with test program" >&2;} { (exit 1); exit 1; }; } fi @@ -9318,23 +9324,23 @@ for ac_header in X11/IntrinsicI.h Xm/XmP.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:9321: checking for $ac_header" >&5 +echo "$as_me:9327: 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 9327 "configure" +#line 9333 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:9331: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:9337: \"$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:9337: \$? = $ac_status" >&5 + echo "$as_me:9343: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9353,7 +9359,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:9356: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:9362: 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 <<EOF @@ -9363,7 +9369,7 @@ fi done -echo "$as_me:9366: checking for regcmp in -lgen" >&5 +echo "$as_me:9372: checking for regcmp in -lgen" >&5 echo $ECHO_N "checking for regcmp in -lgen... $ECHO_C" >&6 if test "${ac_cv_lib_gen_regcmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9371,7 +9377,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9374 "configure" +#line 9380 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9390,16 +9396,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9393: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9399: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9396: \$? = $ac_status" >&5 + echo "$as_me:9402: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9399: \"$ac_try\"") >&5 + { (eval echo "$as_me:9405: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9402: \$? = $ac_status" >&5 + echo "$as_me:9408: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gen_regcmp=yes else @@ -9410,7 +9416,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9413: result: $ac_cv_lib_gen_regcmp" >&5 +echo "$as_me:9419: result: $ac_cv_lib_gen_regcmp" >&5 echo "${ECHO_T}$ac_cv_lib_gen_regcmp" >&6 if test $ac_cv_lib_gen_regcmp = yes; then cat >>confdefs.h <<EOF @@ -9421,7 +9427,7 @@ fi -echo "$as_me:9424: checking for XmuClientWindow in -lXmu" >&5 +echo "$as_me:9430: checking for XmuClientWindow in -lXmu" >&5 echo $ECHO_N "checking for XmuClientWindow in -lXmu... $ECHO_C" >&6 if test "${ac_cv_lib_Xmu_XmuClientWindow+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9429,7 +9435,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXmu $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9432 "configure" +#line 9438 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9448,16 +9454,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9451: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9457: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9454: \$? = $ac_status" >&5 + echo "$as_me:9460: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9457: \"$ac_try\"") >&5 + { (eval echo "$as_me:9463: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9460: \$? = $ac_status" >&5 + echo "$as_me:9466: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xmu_XmuClientWindow=yes else @@ -9468,7 +9474,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9471: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5 +echo "$as_me:9477: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5 echo "${ECHO_T}$ac_cv_lib_Xmu_XmuClientWindow" >&6 if test $ac_cv_lib_Xmu_XmuClientWindow = yes; then cat >>confdefs.h <<EOF @@ -9479,7 +9485,7 @@ fi -echo "$as_me:9482: checking for XpStartDoc in -lXp" >&5 +echo "$as_me:9488: checking for XpStartDoc in -lXp" >&5 echo $ECHO_N "checking for XpStartDoc in -lXp... $ECHO_C" >&6 if test "${ac_cv_lib_Xp_XpStartDoc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9487,7 +9493,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXp $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9490 "configure" +#line 9496 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9506,16 +9512,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9509: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9515: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9512: \$? = $ac_status" >&5 + echo "$as_me:9518: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9515: \"$ac_try\"") >&5 + { (eval echo "$as_me:9521: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9518: \$? = $ac_status" >&5 + echo "$as_me:9524: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xp_XpStartDoc=yes else @@ -9526,7 +9532,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9529: result: $ac_cv_lib_Xp_XpStartDoc" >&5 +echo "$as_me:9535: result: $ac_cv_lib_Xp_XpStartDoc" >&5 echo "${ECHO_T}$ac_cv_lib_Xp_XpStartDoc" >&6 if test $ac_cv_lib_Xp_XpStartDoc = yes; then cat >>confdefs.h <<EOF @@ -9537,7 +9543,7 @@ fi -echo "$as_me:9540: checking for XextCreateExtension in -lXext" >&5 +echo "$as_me:9546: checking for XextCreateExtension in -lXext" >&5 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9545,7 +9551,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9548 "configure" +#line 9554 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9564,16 +9570,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9567: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9573: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9570: \$? = $ac_status" >&5 + echo "$as_me:9576: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9573: \"$ac_try\"") >&5 + { (eval echo "$as_me:9579: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9576: \$? = $ac_status" >&5 + echo "$as_me:9582: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -9584,13 +9590,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9587: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:9593: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then LIBS="-lXext $LIBS" fi -echo "$as_me:9593: checking for XpmCreatePixmapFromXpmImage in -lXpm" >&5 +echo "$as_me:9599: checking for XpmCreatePixmapFromXpmImage in -lXpm" >&5 echo $ECHO_N "checking for XpmCreatePixmapFromXpmImage in -lXpm... $ECHO_C" >&6 if test "${ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9598,7 +9604,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXpm $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9601 "configure" +#line 9607 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9617,16 +9623,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9620: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9626: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9623: \$? = $ac_status" >&5 + echo "$as_me:9629: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9626: \"$ac_try\"") >&5 + { (eval echo "$as_me:9632: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9629: \$? = $ac_status" >&5 + echo "$as_me:9635: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage=yes else @@ -9637,13 +9643,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9640: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage" >&5 +echo "$as_me:9646: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage" >&5 echo "${ECHO_T}$ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage" >&6 if test $ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage = yes; then LIBS="-lXpm $LIBS" fi -echo "$as_me:9646: checking for XmbTextListToTextProperty in -lXIM" >&5 +echo "$as_me:9652: checking for XmbTextListToTextProperty in -lXIM" >&5 echo $ECHO_N "checking for XmbTextListToTextProperty in -lXIM... $ECHO_C" >&6 if test "${ac_cv_lib_XIM_XmbTextListToTextProperty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9651,7 +9657,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXIM $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9654 "configure" +#line 9660 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9670,16 +9676,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9673: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9679: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9676: \$? = $ac_status" >&5 + echo "$as_me:9682: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9679: \"$ac_try\"") >&5 + { (eval echo "$as_me:9685: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9682: \$? = $ac_status" >&5 + echo "$as_me:9688: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_XIM_XmbTextListToTextProperty=yes else @@ -9690,7 +9696,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9693: result: $ac_cv_lib_XIM_XmbTextListToTextProperty" >&5 +echo "$as_me:9699: result: $ac_cv_lib_XIM_XmbTextListToTextProperty" >&5 echo "${ECHO_T}$ac_cv_lib_XIM_XmbTextListToTextProperty" >&6 if test $ac_cv_lib_XIM_XmbTextListToTextProperty = yes; then cat >>confdefs.h <<EOF @@ -9700,7 +9706,7 @@ LIBS="-lXIM $LIBS" fi -echo "$as_me:9703: checking for XmProcessTraversal in -lXm" >&5 +echo "$as_me:9709: checking for XmProcessTraversal in -lXm" >&5 echo $ECHO_N "checking for XmProcessTraversal in -lXm... $ECHO_C" >&6 if test "${ac_cv_lib_Xm_XmProcessTraversal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9708,7 +9714,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXm $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9711 "configure" +#line 9717 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9727,16 +9733,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9730: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9736: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9733: \$? = $ac_status" >&5 + echo "$as_me:9739: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9736: \"$ac_try\"") >&5 + { (eval echo "$as_me:9742: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9739: \$? = $ac_status" >&5 + echo "$as_me:9745: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xm_XmProcessTraversal=yes else @@ -9747,12 +9753,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9750: result: $ac_cv_lib_Xm_XmProcessTraversal" >&5 +echo "$as_me:9756: result: $ac_cv_lib_Xm_XmProcessTraversal" >&5 echo "${ECHO_T}$ac_cv_lib_Xm_XmProcessTraversal" >&6 if test $ac_cv_lib_Xm_XmProcessTraversal = yes; then LIBS="-lXm $LIBS" else - { { echo "$as_me:9755: error: Unable to successfully link Motif library (-lXm) with test program" >&5 + { { echo "$as_me:9761: error: Unable to successfully link Motif library (-lXm) with test program" >&5 echo "$as_me: error: Unable to successfully link Motif library (-lXm) with test program" >&2;} { (exit 1); exit 1; }; } fi @@ -9773,7 +9779,7 @@ cf_x_athena=${cf_x_athena-Xaw} -echo "$as_me:9776: checking if you want to link with Xaw 3d library" >&5 +echo "$as_me:9782: checking if you want to link with Xaw 3d library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6 withval= @@ -9784,14 +9790,14 @@ fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$as_me:9787: result: yes" >&5 + echo "$as_me:9793: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:9790: result: no" >&5 + echo "$as_me:9796: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:9794: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:9800: checking if you want to link with neXT Athena library" >&5 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6 withval= @@ -9802,14 +9808,14 @@ fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$as_me:9805: result: yes" >&5 + echo "$as_me:9811: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:9808: result: no" >&5 + echo "$as_me:9814: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:9812: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:9818: checking if you want to link with Athena-Plus library" >&5 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6 withval= @@ -9820,14 +9826,14 @@ fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$as_me:9823: result: yes" >&5 + echo "$as_me:9829: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:9826: result: no" >&5 + echo "$as_me:9832: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:9830: checking for XextCreateExtension in -lXext" >&5 +echo "$as_me:9836: checking for XextCreateExtension in -lXext" >&5 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9835,7 +9841,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9838 "configure" +#line 9844 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9854,16 +9860,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9857: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9863: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9860: \$? = $ac_status" >&5 + echo "$as_me:9866: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9863: \"$ac_try\"") >&5 + { (eval echo "$as_me:9869: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9866: \$? = $ac_status" >&5 + echo "$as_me:9872: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -9874,7 +9880,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9877: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:9883: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then LIBS="-lXext $LIBS" @@ -9896,14 +9902,14 @@ cf_test=X11/$cf_x_athena_root/SimpleMenu.h if test $cf_path != default ; then CPPFLAGS="-I$cf_path/include $cf_save" - echo "$as_me:9899: checking for $cf_test in $cf_path" >&5 + echo "$as_me:9905: checking for $cf_test in $cf_path" >&5 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6 else - echo "$as_me:9902: checking for $cf_test" >&5 + echo "$as_me:9908: checking for $cf_test" >&5 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi cat >conftest.$ac_ext <<_ACEOF -#line 9906 "configure" +#line 9912 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> @@ -9917,16 +9923,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9920: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9926: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9923: \$? = $ac_status" >&5 + echo "$as_me:9929: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9926: \"$ac_try\"") >&5 + { (eval echo "$as_me:9932: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9929: \$? = $ac_status" >&5 + echo "$as_me:9935: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -9935,7 +9941,7 @@ cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:9938: result: $cf_result" >&5 + echo "$as_me:9944: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_include=$cf_path @@ -9947,7 +9953,7 @@ done if test -z "$cf_x_athena_include" ; then - { echo "$as_me:9950: WARNING: Unable to successfully find Athena header files with test program" >&5 + { echo "$as_me:9956: WARNING: Unable to successfully find Athena header files with test program" >&5 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;} elif test "$cf_x_athena_include" != default ; then CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include" @@ -9972,15 +9978,15 @@ cf_test=XawSimpleMenuAddGlobalActions if test $cf_path != default ; then LIBS="-L$cf_path/lib $cf_lib $LIBS" - echo "$as_me:9975: checking for $cf_lib in $cf_path" >&5 + echo "$as_me:9981: checking for $cf_lib in $cf_path" >&5 echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6 else LIBS="$cf_lib $LIBS" - echo "$as_me:9979: checking for $cf_test in $cf_lib" >&5 + echo "$as_me:9985: checking for $cf_test in $cf_lib" >&5 echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6 fi cat >conftest.$ac_ext <<_ACEOF -#line 9983 "configure" +#line 9989 "configure" #include "confdefs.h" int @@ -9992,16 +9998,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9995: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10001: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9998: \$? = $ac_status" >&5 + echo "$as_me:10004: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10001: \"$ac_try\"") >&5 + { (eval echo "$as_me:10007: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10004: \$? = $ac_status" >&5 + echo "$as_me:10010: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -10010,7 +10016,7 @@ cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:10013: result: $cf_result" >&5 + echo "$as_me:10019: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_lib="$cf_lib" @@ -10022,7 +10028,7 @@ done if test -z "$cf_x_athena_lib" ; then - { { echo "$as_me:10025: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + { { echo "$as_me:10031: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;} { (exit 1); exit 1; }; } fi @@ -10058,7 +10064,7 @@ #define DISP_CURSES 1 EOF -echo "$as_me:10061: checking for extra include directories" >&5 +echo "$as_me:10067: checking for extra include directories" >&5 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6 if test "${cf_cv_curses_incdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10078,11 +10084,11 @@ esac fi -echo "$as_me:10081: result: $cf_cv_curses_incdir" >&5 +echo "$as_me:10087: result: $cf_cv_curses_incdir" >&5 echo "${ECHO_T}$cf_cv_curses_incdir" >&6 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS" -echo "$as_me:10085: checking if we have identified curses headers" >&5 +echo "$as_me:10091: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10096,7 +10102,7 @@ ncurses/ncurses.h do cat >conftest.$ac_ext <<_ACEOF -#line 10099 "configure" +#line 10105 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -10108,16 +10114,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10111: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10117: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10114: \$? = $ac_status" >&5 + echo "$as_me:10120: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10117: \"$ac_try\"") >&5 + { (eval echo "$as_me:10123: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10120: \$? = $ac_status" >&5 + echo "$as_me:10126: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -10128,11 +10134,11 @@ done fi -echo "$as_me:10131: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:10137: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:10135: error: No curses header-files found" >&5 + { { echo "$as_me:10141: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -10142,23 +10148,23 @@ for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:10145: checking for $ac_header" >&5 +echo "$as_me:10151: 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 10151 "configure" +#line 10157 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:10155: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:10161: \"$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:10161: \$? = $ac_status" >&5 + echo "$as_me:10167: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -10177,7 +10183,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:10180: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:10186: 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 <<EOF @@ -10187,7 +10193,7 @@ fi done -echo "$as_me:10190: checking for terminfo header" >&5 +echo "$as_me:10196: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10205,7 +10211,7 @@ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 10208 "configure" +#line 10214 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header-curses.h}> @@ -10220,16 +10226,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10223: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10229: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10226: \$? = $ac_status" >&5 + echo "$as_me:10232: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10229: \"$ac_try\"") >&5 + { (eval echo "$as_me:10235: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10232: \$? = $ac_status" >&5 + echo "$as_me:10238: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -10245,7 +10251,7 @@ done fi -echo "$as_me:10248: result: $cf_cv_term_header" >&5 +echo "$as_me:10254: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -10274,7 +10280,7 @@ ;; esac -echo "$as_me:10277: checking for ncurses version" >&5 +echo "$as_me:10283: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10300,10 +10306,10 @@ #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:10303: \"$cf_try\"") >&5 + { (eval echo "$as_me:10309: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:10306: \$? = $ac_status" >&5 + echo "$as_me:10312: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -10313,7 +10319,7 @@ else cat >conftest.$ac_ext <<_ACEOF -#line 10316 "configure" +#line 10322 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10338,15 +10344,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:10341: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10347: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10344: \$? = $ac_status" >&5 + echo "$as_me:10350: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10346: \"$ac_try\"") >&5 + { (eval echo "$as_me:10352: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10349: \$? = $ac_status" >&5 + echo "$as_me:10355: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -10360,16 +10366,16 @@ rm -f $cf_tempfile fi -echo "$as_me:10363: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:10369: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:10369: checking if we have identified curses libraries" >&5 +echo "$as_me:10375: checking if we have identified curses libraries" >&5 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 10372 "configure" +#line 10378 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -10381,16 +10387,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10384: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10390: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10387: \$? = $ac_status" >&5 + echo "$as_me:10393: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10390: \"$ac_try\"") >&5 + { (eval echo "$as_me:10396: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10393: \$? = $ac_status" >&5 + echo "$as_me:10399: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -10399,13 +10405,13 @@ cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:10402: result: $cf_result" >&5 +echo "$as_me:10408: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then case $host_os in #(vi freebsd*) #(vi - echo "$as_me:10408: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:10414: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10413,7 +10419,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10416 "configure" +#line 10422 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10432,16 +10438,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10435: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10441: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10438: \$? = $ac_status" >&5 + echo "$as_me:10444: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10441: \"$ac_try\"") >&5 + { (eval echo "$as_me:10447: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10444: \$? = $ac_status" >&5 + echo "$as_me:10450: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -10452,7 +10458,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10455: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:10461: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then LIBS="-lmytinfo $LIBS" @@ -10460,7 +10466,7 @@ ;; hpux10.*) #(vi - echo "$as_me:10463: checking for initscr in -lcur_colr" >&5 + echo "$as_me:10469: checking for initscr in -lcur_colr" >&5 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10468,7 +10474,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lcur_colr $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10471 "configure" +#line 10477 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10487,16 +10493,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10490: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10496: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10493: \$? = $ac_status" >&5 + echo "$as_me:10499: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10496: \"$ac_try\"") >&5 + { (eval echo "$as_me:10502: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10499: \$? = $ac_status" >&5 + echo "$as_me:10505: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cur_colr_initscr=yes else @@ -10507,7 +10513,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10510: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "$as_me:10516: result: $ac_cv_lib_cur_colr_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 if test $ac_cv_lib_cur_colr_initscr = yes; then @@ -10516,7 +10522,7 @@ else - echo "$as_me:10519: checking for initscr in -lHcurses" >&5 + echo "$as_me:10525: checking for initscr in -lHcurses" >&5 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10524,7 +10530,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lHcurses $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10527 "configure" +#line 10533 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10543,16 +10549,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10546: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10552: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10549: \$? = $ac_status" >&5 + echo "$as_me:10555: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10552: \"$ac_try\"") >&5 + { (eval echo "$as_me:10558: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10555: \$? = $ac_status" >&5 + echo "$as_me:10561: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Hcurses_initscr=yes else @@ -10563,7 +10569,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10566: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "$as_me:10572: result: $ac_cv_lib_Hcurses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6 if test $ac_cv_lib_Hcurses_initscr = yes; then @@ -10601,13 +10607,13 @@ # Check for library containing tgoto. Do this before curses library # because it may be needed to link the test-case for initscr. - echo "$as_me:10604: checking for tgoto" >&5 + echo "$as_me:10610: checking for tgoto" >&5 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6 if test "${ac_cv_func_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10610 "configure" +#line 10616 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char tgoto (); below. */ @@ -10638,16 +10644,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10641: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10647: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10644: \$? = $ac_status" >&5 + echo "$as_me:10650: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10647: \"$ac_try\"") >&5 + { (eval echo "$as_me:10653: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10650: \$? = $ac_status" >&5 + echo "$as_me:10656: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_tgoto=yes else @@ -10657,7 +10663,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10660: result: $ac_cv_func_tgoto" >&5 +echo "$as_me:10666: result: $ac_cv_func_tgoto" >&5 echo "${ECHO_T}$ac_cv_func_tgoto" >&6 if test $ac_cv_func_tgoto = yes; then cf_term_lib=predefined @@ -10666,7 +10672,7 @@ for cf_term_lib in $cf_check_list termcap termlib unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` -echo "$as_me:10669: checking for tgoto in -l$cf_term_lib" >&5 +echo "$as_me:10675: checking for tgoto in -l$cf_term_lib" >&5 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10674,7 +10680,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_term_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10677 "configure" +#line 10683 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10693,16 +10699,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10696: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10702: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10699: \$? = $ac_status" >&5 + echo "$as_me:10705: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10702: \"$ac_try\"") >&5 + { (eval echo "$as_me:10708: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10705: \$? = $ac_status" >&5 + echo "$as_me:10711: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -10713,7 +10719,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10716: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:10722: 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 break @@ -10728,7 +10734,7 @@ for cf_curs_lib in $cf_check_list xcurses jcurses unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh` -echo "$as_me:10731: checking for initscr in -l$cf_curs_lib" >&5 +echo "$as_me:10737: checking for initscr in -l$cf_curs_lib" >&5 echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10736,7 +10742,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_curs_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10739 "configure" +#line 10745 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10755,16 +10761,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10758: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10764: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10761: \$? = $ac_status" >&5 + echo "$as_me:10767: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10764: \"$ac_try\"") >&5 + { (eval echo "$as_me:10770: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10767: \$? = $ac_status" >&5 + echo "$as_me:10773: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -10775,23 +10781,23 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10778: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:10784: 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 break fi done - test $cf_curs_lib = unknown && { { echo "$as_me:10785: error: no curses library found" >&5 + test $cf_curs_lib = unknown && { { echo "$as_me:10791: error: no curses library found" >&5 echo "$as_me: error: no curses library found" >&2;} { (exit 1); exit 1; }; } LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown ; then - echo "$as_me:10791: checking if we can link with $cf_curs_lib library" >&5 + echo "$as_me:10797: checking if we can link with $cf_curs_lib library" >&5 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 10794 "configure" +#line 10800 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -10803,16 +10809,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10806: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10812: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10809: \$? = $ac_status" >&5 + echo "$as_me:10815: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10812: \"$ac_try\"") >&5 + { (eval echo "$as_me:10818: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10815: \$? = $ac_status" >&5 + echo "$as_me:10821: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -10821,18 +10827,18 @@ cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:10824: result: $cf_result" >&5 + echo "$as_me:10830: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 - test $cf_result = no && { { echo "$as_me:10826: error: Cannot link curses library" >&5 + test $cf_result = no && { { echo "$as_me:10832: error: Cannot link curses library" >&5 echo "$as_me: error: Cannot link curses library" >&2;} { (exit 1); exit 1; }; } elif test "$cf_curs_lib" = "$cf_term_lib" ; then : elif test "$cf_term_lib" != predefined ; then - echo "$as_me:10832: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + echo "$as_me:10838: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 10835 "configure" +#line 10841 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -10844,16 +10850,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10847: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10853: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10850: \$? = $ac_status" >&5 + echo "$as_me:10856: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10853: \"$ac_try\"") >&5 + { (eval echo "$as_me:10859: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10856: \$? = $ac_status" >&5 + echo "$as_me:10862: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=no else @@ -10862,7 +10868,7 @@ LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10865 "configure" +#line 10871 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -10874,16 +10880,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10877: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10883: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10880: \$? = $ac_status" >&5 + echo "$as_me:10886: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10883: \"$ac_try\"") >&5 + { (eval echo "$as_me:10889: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10886: \$? = $ac_status" >&5 + echo "$as_me:10892: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -10895,7 +10901,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:10898: result: $cf_result" >&5 + echo "$as_me:10904: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 fi fi @@ -10938,7 +10944,7 @@ withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:10941: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:10947: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -10956,7 +10962,7 @@ 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:10959: checking for $ac_word" >&5 +echo "$as_me:10965: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10973,7 +10979,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" - echo "$as_me:10976: found $ac_dir/$ac_word" >&5 + echo "$as_me:10982: found $ac_dir/$ac_word" >&5 break fi done @@ -10984,10 +10990,10 @@ NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:10987: result: $NCURSES_CONFIG" >&5 + echo "$as_me:10993: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:10990: result: no" >&5 + echo "$as_me:10996: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -11022,7 +11028,7 @@ test "$cf_cv_curses_dir" != "no" && \ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" -echo "$as_me:11025: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:11031: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11034,7 +11040,7 @@ do cat >conftest.$ac_ext <<_ACEOF -#line 11037 "configure" +#line 11043 "configure" #include "confdefs.h" #include <$cf_header> @@ -11058,16 +11064,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11061: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11067: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11064: \$? = $ac_status" >&5 + echo "$as_me:11070: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11067: \"$ac_try\"") >&5 + { (eval echo "$as_me:11073: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11070: \$? = $ac_status" >&5 + echo "$as_me:11076: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -11082,14 +11088,14 @@ done fi -echo "$as_me:11085: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:11091: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:11092: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:11098: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11184,7 +11190,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 11187 "configure" +#line 11193 "configure" #include "confdefs.h" #include <stdio.h> int @@ -11196,16 +11202,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11199: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11205: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11202: \$? = $ac_status" >&5 + echo "$as_me:11208: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11205: \"$ac_try\"") >&5 + { (eval echo "$as_me:11211: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11208: \$? = $ac_status" >&5 + echo "$as_me:11214: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -11232,7 +11238,7 @@ do cat >conftest.$ac_ext <<_ACEOF -#line 11235 "configure" +#line 11241 "configure" #include "confdefs.h" #include <$cf_header> @@ -11256,16 +11262,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11259: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11265: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11262: \$? = $ac_status" >&5 + echo "$as_me:11268: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11265: \"$ac_try\"") >&5 + { (eval echo "$as_me:11271: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11268: \$? = $ac_status" >&5 + echo "$as_me:11274: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -11286,12 +11292,12 @@ CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11289: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11295: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:11294: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:11300: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` @@ -11313,7 +11319,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 11316 "configure" +#line 11322 "configure" #include "confdefs.h" #include <stdio.h> int @@ -11325,16 +11331,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11328: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11334: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11331: \$? = $ac_status" >&5 + echo "$as_me:11337: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11334: \"$ac_try\"") >&5 + { (eval echo "$as_me:11340: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11337: \$? = $ac_status" >&5 + echo "$as_me:11343: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -11383,7 +11389,7 @@ ;; esac -echo "$as_me:11386: checking for terminfo header" >&5 +echo "$as_me:11392: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11401,7 +11407,7 @@ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 11404 "configure" +#line 11410 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header-curses.h}> @@ -11416,16 +11422,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11419: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11425: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11422: \$? = $ac_status" >&5 + echo "$as_me:11428: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11425: \"$ac_try\"") >&5 + { (eval echo "$as_me:11431: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11428: \$? = $ac_status" >&5 + echo "$as_me:11434: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -11441,7 +11447,7 @@ done fi -echo "$as_me:11444: result: $cf_cv_term_header" >&5 +echo "$as_me:11450: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -11475,7 +11481,7 @@ #define NCURSES 1 EOF -echo "$as_me:11478: checking for ncurses version" >&5 +echo "$as_me:11484: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11501,10 +11507,10 @@ #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:11504: \"$cf_try\"") >&5 + { (eval echo "$as_me:11510: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:11507: \$? = $ac_status" >&5 + echo "$as_me:11513: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -11514,7 +11520,7 @@ else cat >conftest.$ac_ext <<_ACEOF -#line 11517 "configure" +#line 11523 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -11539,15 +11545,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11542: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11548: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11545: \$? = $ac_status" >&5 + echo "$as_me:11551: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11547: \"$ac_try\"") >&5 + { (eval echo "$as_me:11553: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11550: \$? = $ac_status" >&5 + echo "$as_me:11556: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -11561,7 +11567,7 @@ rm -f $cf_tempfile fi -echo "$as_me:11564: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:11570: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 @@ -11573,7 +11579,7 @@ # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:11576: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:11582: 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 @@ -11581,7 +11587,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11584 "configure" +#line 11590 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11600,16 +11606,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11603: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11609: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11606: \$? = $ac_status" >&5 + echo "$as_me:11612: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11609: \"$ac_try\"") >&5 + { (eval echo "$as_me:11615: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11612: \$? = $ac_status" >&5 + echo "$as_me:11618: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -11620,10 +11626,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11623: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:11629: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test $ac_cv_lib_gpm_Gpm_Open = yes; then - echo "$as_me:11626: checking for initscr in -lgpm" >&5 + echo "$as_me:11632: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11631,7 +11637,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11634 "configure" +#line 11640 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11650,16 +11656,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11653: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11659: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11656: \$? = $ac_status" >&5 + echo "$as_me:11662: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11659: \"$ac_try\"") >&5 + { (eval echo "$as_me:11665: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11662: \$? = $ac_status" >&5 + echo "$as_me:11668: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -11670,7 +11676,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11673: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:11679: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test $ac_cv_lib_gpm_initscr = yes; then LIBS="$cf_ncurses_SAVE" @@ -11685,7 +11691,7 @@ # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:11688: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:11694: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11693,7 +11699,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11696 "configure" +#line 11702 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11712,16 +11718,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11715: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11721: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11718: \$? = $ac_status" >&5 + echo "$as_me:11724: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11721: \"$ac_try\"") >&5 + { (eval echo "$as_me:11727: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11724: \$? = $ac_status" >&5 + echo "$as_me:11730: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -11732,7 +11738,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11735: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:11741: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -11751,13 +11757,13 @@ eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:11754: checking for initscr" >&5 + echo "$as_me:11760: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11760 "configure" +#line 11766 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr (); below. */ @@ -11788,16 +11794,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11791: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11797: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11794: \$? = $ac_status" >&5 + echo "$as_me:11800: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11797: \"$ac_try\"") >&5 + { (eval echo "$as_me:11803: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11800: \$? = $ac_status" >&5 + echo "$as_me:11806: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -11807,18 +11813,18 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11810: result: $ac_cv_func_initscr" >&5 +echo "$as_me:11816: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test $ac_cv_func_initscr = yes; then eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:11817: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:11823: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11821 "configure" +#line 11827 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -11830,25 +11836,25 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11833: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11839: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11836: \$? = $ac_status" >&5 + echo "$as_me:11842: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11839: \"$ac_try\"") >&5 + { (eval echo "$as_me:11845: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11842: \$? = $ac_status" >&5 + echo "$as_me:11848: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:11844: result: yes" >&5 + echo "$as_me:11850: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:11851: result: no" >&5 +echo "$as_me:11857: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search="" @@ -11908,11 +11914,11 @@ for cf_libdir in $cf_search do - echo "$as_me:11911: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:11917: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11915 "configure" +#line 11921 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -11924,25 +11930,25 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11927: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11933: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11930: \$? = $ac_status" >&5 + echo "$as_me:11936: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11933: \"$ac_try\"") >&5 + { (eval echo "$as_me:11939: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11936: \$? = $ac_status" >&5 + echo "$as_me:11942: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:11938: result: yes" >&5 + echo "$as_me:11944: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:11945: result: no" >&5 +echo "$as_me:11951: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -11957,7 +11963,7 @@ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:11960: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:11966: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -11965,7 +11971,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:11968: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:11974: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -11975,7 +11981,7 @@ fi done cat >conftest.$ac_ext <<_ACEOF -#line 11978 "configure" +#line 11984 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -11987,23 +11993,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11990: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11996: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11993: \$? = $ac_status" >&5 + echo "$as_me:11999: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11996: \"$ac_try\"") >&5 + { (eval echo "$as_me:12002: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11999: \$? = $ac_status" >&5 + echo "$as_me:12005: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:12001: result: yes" >&5 + echo "$as_me:12007: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:12006: result: no" >&5 +echo "$as_me:12012: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -12033,7 +12039,7 @@ 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:12036: checking for $ac_word" >&5 +echo "$as_me:12042: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12050,7 +12056,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" - echo "$as_me:12053: found $ac_dir/$ac_word" >&5 + echo "$as_me:12059: found $ac_dir/$ac_word" >&5 break fi done @@ -12061,10 +12067,10 @@ NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:12064: result: $NCURSES_CONFIG" >&5 + echo "$as_me:12070: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:12067: result: no" >&5 + echo "$as_me:12073: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -12099,7 +12105,7 @@ test "$cf_cv_curses_dir" != "no" && \ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" -echo "$as_me:12102: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:12108: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12111,7 +12117,7 @@ do cat >conftest.$ac_ext <<_ACEOF -#line 12114 "configure" +#line 12120 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -12143,16 +12149,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12146: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12152: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12149: \$? = $ac_status" >&5 + echo "$as_me:12155: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12152: \"$ac_try\"") >&5 + { (eval echo "$as_me:12158: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12155: \$? = $ac_status" >&5 + echo "$as_me:12161: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -12167,14 +12173,14 @@ done fi -echo "$as_me:12170: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:12176: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:12177: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:12183: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12269,7 +12275,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 12272 "configure" +#line 12278 "configure" #include "confdefs.h" #include <stdio.h> int @@ -12281,16 +12287,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12284: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12290: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12287: \$? = $ac_status" >&5 + echo "$as_me:12293: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12290: \"$ac_try\"") >&5 + { (eval echo "$as_me:12296: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12293: \$? = $ac_status" >&5 + echo "$as_me:12299: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -12317,7 +12323,7 @@ do cat >conftest.$ac_ext <<_ACEOF -#line 12320 "configure" +#line 12326 "configure" #include "confdefs.h" #include <$cf_header> @@ -12341,16 +12347,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12344: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12350: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12347: \$? = $ac_status" >&5 + echo "$as_me:12353: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12350: \"$ac_try\"") >&5 + { (eval echo "$as_me:12356: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12353: \$? = $ac_status" >&5 + echo "$as_me:12359: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -12371,12 +12377,12 @@ CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12374: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12380: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:12379: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:12385: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` @@ -12398,7 +12404,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 12401 "configure" +#line 12407 "configure" #include "confdefs.h" #include <stdio.h> int @@ -12410,16 +12416,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12413: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12419: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12416: \$? = $ac_status" >&5 + echo "$as_me:12422: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12419: \"$ac_try\"") >&5 + { (eval echo "$as_me:12425: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12422: \$? = $ac_status" >&5 + echo "$as_me:12428: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -12468,7 +12474,7 @@ ;; esac -echo "$as_me:12471: checking for terminfo header" >&5 +echo "$as_me:12477: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12486,7 +12492,7 @@ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 12489 "configure" +#line 12495 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header-curses.h}> @@ -12501,16 +12507,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12504: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12510: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12507: \$? = $ac_status" >&5 + echo "$as_me:12513: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12510: \"$ac_try\"") >&5 + { (eval echo "$as_me:12516: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12513: \$? = $ac_status" >&5 + echo "$as_me:12519: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -12526,7 +12532,7 @@ done fi -echo "$as_me:12529: result: $cf_cv_term_header" >&5 +echo "$as_me:12535: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -12560,7 +12566,7 @@ #define NCURSES 1 EOF -echo "$as_me:12563: checking for ncurses version" >&5 +echo "$as_me:12569: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12586,10 +12592,10 @@ #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:12589: \"$cf_try\"") >&5 + { (eval echo "$as_me:12595: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:12592: \$? = $ac_status" >&5 + echo "$as_me:12598: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -12599,7 +12605,7 @@ else cat >conftest.$ac_ext <<_ACEOF -#line 12602 "configure" +#line 12608 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -12624,15 +12630,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12627: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12633: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12630: \$? = $ac_status" >&5 + echo "$as_me:12636: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12632: \"$ac_try\"") >&5 + { (eval echo "$as_me:12638: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12635: \$? = $ac_status" >&5 + echo "$as_me:12641: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -12646,7 +12652,7 @@ rm -f $cf_tempfile fi -echo "$as_me:12649: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:12655: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 @@ -12658,7 +12664,7 @@ # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:12661: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:12667: 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 @@ -12666,7 +12672,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12669 "configure" +#line 12675 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12685,16 +12691,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12688: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12694: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12691: \$? = $ac_status" >&5 + echo "$as_me:12697: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12694: \"$ac_try\"") >&5 + { (eval echo "$as_me:12700: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12697: \$? = $ac_status" >&5 + echo "$as_me:12703: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -12705,10 +12711,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12708: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:12714: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test $ac_cv_lib_gpm_Gpm_Open = yes; then - echo "$as_me:12711: checking for initscr in -lgpm" >&5 + echo "$as_me:12717: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12716,7 +12722,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12719 "configure" +#line 12725 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12735,16 +12741,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12738: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12744: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12741: \$? = $ac_status" >&5 + echo "$as_me:12747: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12744: \"$ac_try\"") >&5 + { (eval echo "$as_me:12750: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12747: \$? = $ac_status" >&5 + echo "$as_me:12753: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -12755,7 +12761,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12758: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:12764: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test $ac_cv_lib_gpm_initscr = yes; then LIBS="$cf_ncurses_SAVE" @@ -12770,7 +12776,7 @@ # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:12773: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:12779: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12778,7 +12784,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12781 "configure" +#line 12787 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12797,16 +12803,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12800: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12806: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12803: \$? = $ac_status" >&5 + echo "$as_me:12809: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12806: \"$ac_try\"") >&5 + { (eval echo "$as_me:12812: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12809: \$? = $ac_status" >&5 + echo "$as_me:12815: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -12817,7 +12823,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12820: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:12826: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -12836,13 +12842,13 @@ eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:12839: checking for initscr" >&5 + echo "$as_me:12845: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12845 "configure" +#line 12851 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr (); below. */ @@ -12873,16 +12879,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12876: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12882: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12879: \$? = $ac_status" >&5 + echo "$as_me:12885: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12882: \"$ac_try\"") >&5 + { (eval echo "$as_me:12888: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12885: \$? = $ac_status" >&5 + echo "$as_me:12891: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -12892,18 +12898,18 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12895: result: $ac_cv_func_initscr" >&5 +echo "$as_me:12901: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test $ac_cv_func_initscr = yes; then eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:12902: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:12908: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12906 "configure" +#line 12912 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -12915,25 +12921,25 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12918: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12924: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12921: \$? = $ac_status" >&5 + echo "$as_me:12927: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12924: \"$ac_try\"") >&5 + { (eval echo "$as_me:12930: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12927: \$? = $ac_status" >&5 + echo "$as_me:12933: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:12929: result: yes" >&5 + echo "$as_me:12935: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:12936: result: no" >&5 +echo "$as_me:12942: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search="" @@ -12993,11 +12999,11 @@ for cf_libdir in $cf_search do - echo "$as_me:12996: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:13002: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13000 "configure" +#line 13006 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -13009,25 +13015,25 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13012: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13018: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13015: \$? = $ac_status" >&5 + echo "$as_me:13021: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13018: \"$ac_try\"") >&5 + { (eval echo "$as_me:13024: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13021: \$? = $ac_status" >&5 + echo "$as_me:13027: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:13023: result: yes" >&5 + echo "$as_me:13029: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:13030: result: no" >&5 +echo "$as_me:13036: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -13042,7 +13048,7 @@ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:13045: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:13051: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -13050,7 +13056,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:13053: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:13059: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -13060,7 +13066,7 @@ fi done cat >conftest.$ac_ext <<_ACEOF -#line 13063 "configure" +#line 13069 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -13072,23 +13078,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13075: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13081: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13078: \$? = $ac_status" >&5 + echo "$as_me:13084: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13081: \"$ac_try\"") >&5 + { (eval echo "$as_me:13087: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13084: \$? = $ac_status" >&5 + echo "$as_me:13090: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:13086: result: yes" >&5 + echo "$as_me:13092: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:13091: result: no" >&5 +echo "$as_me:13097: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -13111,7 +13117,7 @@ #define DISP_TERMCAP 1 EOF - echo "$as_me:13114: checking if you want to use ncurses" >&5 + echo "$as_me:13120: checking if you want to use ncurses" >&5 echo $ECHO_N "checking if you want to use ncurses... $ECHO_C" >&6 # Check whether --with-ncurses or --without-ncurses was given. @@ -13121,7 +13127,7 @@ else withval=no fi; - echo "$as_me:13124: result: $withval" >&5 + echo "$as_me:13130: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 if test "${cf_cv_termlib+set}" = set; then @@ -13130,7 +13136,7 @@ cf_cv_termlib=none cat >conftest.$ac_ext <<_ACEOF -#line 13133 "configure" +#line 13139 "configure" #include "confdefs.h" int @@ -13142,19 +13148,19 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13145: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13151: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13148: \$? = $ac_status" >&5 + echo "$as_me:13154: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13151: \"$ac_try\"") >&5 + { (eval echo "$as_me:13157: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13154: \$? = $ac_status" >&5 + echo "$as_me:13160: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >conftest.$ac_ext <<_ACEOF -#line 13157 "configure" +#line 13163 "configure" #include "confdefs.h" int @@ -13166,16 +13172,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13169: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13175: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13172: \$? = $ac_status" >&5 + echo "$as_me:13178: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13175: \"$ac_try\"") >&5 + { (eval echo "$as_me:13181: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13178: \$? = $ac_status" >&5 + echo "$as_me:13184: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_termlib=terminfo else @@ -13200,7 +13206,7 @@ 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:13203: checking for $ac_word" >&5 +echo "$as_me:13209: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13217,7 +13223,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" - echo "$as_me:13220: found $ac_dir/$ac_word" >&5 + echo "$as_me:13226: found $ac_dir/$ac_word" >&5 break fi done @@ -13228,10 +13234,10 @@ NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:13231: result: $NCURSES_CONFIG" >&5 + echo "$as_me:13237: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:13234: result: no" >&5 + echo "$as_me:13240: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -13266,7 +13272,7 @@ test "$cf_cv_curses_dir" != "no" && \ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" -echo "$as_me:13269: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:13275: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13278,7 +13284,7 @@ do cat >conftest.$ac_ext <<_ACEOF -#line 13281 "configure" +#line 13287 "configure" #include "confdefs.h" #include <$cf_header> @@ -13302,16 +13308,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13305: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13311: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13308: \$? = $ac_status" >&5 + echo "$as_me:13314: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13311: \"$ac_try\"") >&5 + { (eval echo "$as_me:13317: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13314: \$? = $ac_status" >&5 + echo "$as_me:13320: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -13326,14 +13332,14 @@ done fi -echo "$as_me:13329: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:13335: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:13336: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:13342: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13428,7 +13434,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 13431 "configure" +#line 13437 "configure" #include "confdefs.h" #include <stdio.h> int @@ -13440,16 +13446,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13443: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13449: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13446: \$? = $ac_status" >&5 + echo "$as_me:13452: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13449: \"$ac_try\"") >&5 + { (eval echo "$as_me:13455: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13452: \$? = $ac_status" >&5 + echo "$as_me:13458: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -13476,7 +13482,7 @@ do cat >conftest.$ac_ext <<_ACEOF -#line 13479 "configure" +#line 13485 "configure" #include "confdefs.h" #include <$cf_header> @@ -13500,16 +13506,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13503: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13509: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13506: \$? = $ac_status" >&5 + echo "$as_me:13512: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13509: \"$ac_try\"") >&5 + { (eval echo "$as_me:13515: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13512: \$? = $ac_status" >&5 + echo "$as_me:13518: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -13530,12 +13536,12 @@ CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:13533: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:13539: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:13538: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:13544: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` @@ -13557,7 +13563,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 13560 "configure" +#line 13566 "configure" #include "confdefs.h" #include <stdio.h> int @@ -13569,16 +13575,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13572: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13578: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13575: \$? = $ac_status" >&5 + echo "$as_me:13581: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13578: \"$ac_try\"") >&5 + { (eval echo "$as_me:13584: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13581: \$? = $ac_status" >&5 + echo "$as_me:13587: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -13627,7 +13633,7 @@ ;; esac -echo "$as_me:13630: checking for terminfo header" >&5 +echo "$as_me:13636: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13645,7 +13651,7 @@ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 13648 "configure" +#line 13654 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header-curses.h}> @@ -13660,16 +13666,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13663: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13669: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13666: \$? = $ac_status" >&5 + echo "$as_me:13672: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13669: \"$ac_try\"") >&5 + { (eval echo "$as_me:13675: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13672: \$? = $ac_status" >&5 + echo "$as_me:13678: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -13685,7 +13691,7 @@ done fi -echo "$as_me:13688: result: $cf_cv_term_header" >&5 +echo "$as_me:13694: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -13719,7 +13725,7 @@ #define NCURSES 1 EOF -echo "$as_me:13722: checking for ncurses version" >&5 +echo "$as_me:13728: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13745,10 +13751,10 @@ #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:13748: \"$cf_try\"") >&5 + { (eval echo "$as_me:13754: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:13751: \$? = $ac_status" >&5 + echo "$as_me:13757: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -13758,7 +13764,7 @@ else cat >conftest.$ac_ext <<_ACEOF -#line 13761 "configure" +#line 13767 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -13783,15 +13789,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:13786: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13792: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13789: \$? = $ac_status" >&5 + echo "$as_me:13795: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13791: \"$ac_try\"") >&5 + { (eval echo "$as_me:13797: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13794: \$? = $ac_status" >&5 + echo "$as_me:13800: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -13805,7 +13811,7 @@ rm -f $cf_tempfile fi -echo "$as_me:13808: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:13814: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 @@ -13817,7 +13823,7 @@ # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:13820: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:13826: 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 @@ -13825,7 +13831,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13828 "configure" +#line 13834 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13844,16 +13850,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13847: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13853: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13850: \$? = $ac_status" >&5 + echo "$as_me:13856: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13853: \"$ac_try\"") >&5 + { (eval echo "$as_me:13859: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13856: \$? = $ac_status" >&5 + echo "$as_me:13862: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -13864,10 +13870,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13867: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:13873: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test $ac_cv_lib_gpm_Gpm_Open = yes; then - echo "$as_me:13870: checking for initscr in -lgpm" >&5 + echo "$as_me:13876: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13875,7 +13881,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13878 "configure" +#line 13884 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13894,16 +13900,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13897: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13903: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13900: \$? = $ac_status" >&5 + echo "$as_me:13906: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13903: \"$ac_try\"") >&5 + { (eval echo "$as_me:13909: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13906: \$? = $ac_status" >&5 + echo "$as_me:13912: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -13914,7 +13920,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13917: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:13923: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test $ac_cv_lib_gpm_initscr = yes; then LIBS="$cf_ncurses_SAVE" @@ -13929,7 +13935,7 @@ # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:13932: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:13938: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13937,7 +13943,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13940 "configure" +#line 13946 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13956,16 +13962,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13959: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13965: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13962: \$? = $ac_status" >&5 + echo "$as_me:13968: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13965: \"$ac_try\"") >&5 + { (eval echo "$as_me:13971: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13968: \$? = $ac_status" >&5 + echo "$as_me:13974: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -13976,7 +13982,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13979: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:13985: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -13995,13 +14001,13 @@ eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:13998: checking for initscr" >&5 + echo "$as_me:14004: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14004 "configure" +#line 14010 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr (); below. */ @@ -14032,16 +14038,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14035: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14041: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14038: \$? = $ac_status" >&5 + echo "$as_me:14044: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14041: \"$ac_try\"") >&5 + { (eval echo "$as_me:14047: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14044: \$? = $ac_status" >&5 + echo "$as_me:14050: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -14051,18 +14057,18 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14054: result: $ac_cv_func_initscr" >&5 +echo "$as_me:14060: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test $ac_cv_func_initscr = yes; then eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:14061: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:14067: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14065 "configure" +#line 14071 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -14074,25 +14080,25 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14077: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14083: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14080: \$? = $ac_status" >&5 + echo "$as_me:14086: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14083: \"$ac_try\"") >&5 + { (eval echo "$as_me:14089: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14086: \$? = $ac_status" >&5 + echo "$as_me:14092: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:14088: result: yes" >&5 + echo "$as_me:14094: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:14095: result: no" >&5 +echo "$as_me:14101: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search="" @@ -14152,11 +14158,11 @@ for cf_libdir in $cf_search do - echo "$as_me:14155: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:14161: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14159 "configure" +#line 14165 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -14168,25 +14174,25 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14171: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14177: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14174: \$? = $ac_status" >&5 + echo "$as_me:14180: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14177: \"$ac_try\"") >&5 + { (eval echo "$as_me:14183: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14180: \$? = $ac_status" >&5 + echo "$as_me:14186: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:14182: result: yes" >&5 + echo "$as_me:14188: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:14189: result: no" >&5 +echo "$as_me:14195: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -14201,7 +14207,7 @@ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:14204: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:14210: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -14209,7 +14215,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:14212: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:14218: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -14219,7 +14225,7 @@ fi done cat >conftest.$ac_ext <<_ACEOF -#line 14222 "configure" +#line 14228 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -14231,23 +14237,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14234: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14240: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14237: \$? = $ac_status" >&5 + echo "$as_me:14243: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14240: \"$ac_try\"") >&5 + { (eval echo "$as_me:14246: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14243: \$? = $ac_status" >&5 + echo "$as_me:14249: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:14245: result: yes" >&5 + echo "$as_me:14251: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:14250: result: no" >&5 +echo "$as_me:14256: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -14275,10 +14281,10 @@ LIBS="-l$cf_lib $cf_save_LIBS" for cf_func in tigetstr tgetstr do - echo "$as_me:14278: checking for $cf_func in -l$cf_lib" >&5 + echo "$as_me:14284: checking for $cf_func in -l$cf_lib" >&5 echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 14281 "configure" +#line 14287 "configure" #include "confdefs.h" int @@ -14290,16 +14296,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14293: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14299: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14296: \$? = $ac_status" >&5 + echo "$as_me:14302: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14299: \"$ac_try\"") >&5 + { (eval echo "$as_me:14305: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14302: \$? = $ac_status" >&5 + echo "$as_me:14308: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -14308,7 +14314,7 @@ cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:14311: result: $cf_result" >&5 + echo "$as_me:14317: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then if test "$cf_func" = tigetstr ; then @@ -14325,7 +14331,7 @@ fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. - echo "$as_me:14328: checking for initscr in -lcurses" >&5 + echo "$as_me:14334: checking for initscr in -lcurses" >&5 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6 if test "${ac_cv_lib_curses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14333,7 +14339,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14336 "configure" +#line 14342 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14352,16 +14358,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14355: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14361: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14358: \$? = $ac_status" >&5 + echo "$as_me:14364: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14361: \"$ac_try\"") >&5 + { (eval echo "$as_me:14367: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14364: \$? = $ac_status" >&5 + echo "$as_me:14370: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_curses_initscr=yes else @@ -14372,13 +14378,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14375: result: $ac_cv_lib_curses_initscr" >&5 +echo "$as_me:14381: result: $ac_cv_lib_curses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6 if test $ac_cv_lib_curses_initscr = yes; then LIBS="$LIBS -lcurses" cf_cv_termlib=termcap fi - echo "$as_me:14381: checking for tgoto in -ltermcap" >&5 + echo "$as_me:14387: checking for tgoto in -ltermcap" >&5 echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6 if test "${ac_cv_lib_termcap_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14386,7 +14392,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ltermcap $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14389 "configure" +#line 14395 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14405,16 +14411,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14408: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14414: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14411: \$? = $ac_status" >&5 + echo "$as_me:14417: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14414: \"$ac_try\"") >&5 + { (eval echo "$as_me:14420: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14417: \$? = $ac_status" >&5 + echo "$as_me:14423: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_termcap_tgoto=yes else @@ -14425,7 +14431,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14428: result: $ac_cv_lib_termcap_tgoto" >&5 +echo "$as_me:14434: result: $ac_cv_lib_termcap_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6 if test $ac_cv_lib_termcap_tgoto = yes; then LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap @@ -14436,7 +14442,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "$cf_cv_termlib" = none; then - { echo "$as_me:14439: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 + { echo "$as_me:14445: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;} fi @@ -14466,7 +14472,7 @@ cf_cv_termlib=none cat >conftest.$ac_ext <<_ACEOF -#line 14469 "configure" +#line 14475 "configure" #include "confdefs.h" int @@ -14478,19 +14484,19 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14481: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14487: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14484: \$? = $ac_status" >&5 + echo "$as_me:14490: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14487: \"$ac_try\"") >&5 + { (eval echo "$as_me:14493: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14490: \$? = $ac_status" >&5 + echo "$as_me:14496: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >conftest.$ac_ext <<_ACEOF -#line 14493 "configure" +#line 14499 "configure" #include "confdefs.h" int @@ -14502,16 +14508,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14505: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14511: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14508: \$? = $ac_status" >&5 + echo "$as_me:14514: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14511: \"$ac_try\"") >&5 + { (eval echo "$as_me:14517: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14514: \$? = $ac_status" >&5 + echo "$as_me:14520: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_termlib=terminfo else @@ -14535,10 +14541,10 @@ LIBS="-l$cf_lib $cf_save_LIBS" for cf_func in tigetstr tgetstr do - echo "$as_me:14538: checking for $cf_func in -l$cf_lib" >&5 + echo "$as_me:14544: checking for $cf_func in -l$cf_lib" >&5 echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 14541 "configure" +#line 14547 "configure" #include "confdefs.h" int @@ -14550,16 +14556,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14553: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14559: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14556: \$? = $ac_status" >&5 + echo "$as_me:14562: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14559: \"$ac_try\"") >&5 + { (eval echo "$as_me:14565: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14562: \$? = $ac_status" >&5 + echo "$as_me:14568: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -14568,7 +14574,7 @@ cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:14571: result: $cf_result" >&5 + echo "$as_me:14577: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then if test "$cf_func" = tigetstr ; then @@ -14585,7 +14591,7 @@ fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. - echo "$as_me:14588: checking for initscr in -lcurses" >&5 + echo "$as_me:14594: checking for initscr in -lcurses" >&5 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6 if test "${ac_cv_lib_curses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14593,7 +14599,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14596 "configure" +#line 14602 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14612,16 +14618,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14615: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14621: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14618: \$? = $ac_status" >&5 + echo "$as_me:14624: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14621: \"$ac_try\"") >&5 + { (eval echo "$as_me:14627: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14624: \$? = $ac_status" >&5 + echo "$as_me:14630: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_curses_initscr=yes else @@ -14632,13 +14638,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14635: result: $ac_cv_lib_curses_initscr" >&5 +echo "$as_me:14641: result: $ac_cv_lib_curses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6 if test $ac_cv_lib_curses_initscr = yes; then LIBS="$LIBS -lcurses" cf_cv_termlib=termcap fi - echo "$as_me:14641: checking for tgoto in -ltermcap" >&5 + echo "$as_me:14647: checking for tgoto in -ltermcap" >&5 echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6 if test "${ac_cv_lib_termcap_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14646,7 +14652,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ltermcap $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14649 "configure" +#line 14655 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14665,16 +14671,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14668: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14674: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14671: \$? = $ac_status" >&5 + echo "$as_me:14677: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14674: \"$ac_try\"") >&5 + { (eval echo "$as_me:14680: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14677: \$? = $ac_status" >&5 + echo "$as_me:14683: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_termcap_tgoto=yes else @@ -14685,7 +14691,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14688: result: $ac_cv_lib_termcap_tgoto" >&5 +echo "$as_me:14694: result: $ac_cv_lib_termcap_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6 if test $ac_cv_lib_termcap_tgoto = yes; then LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap @@ -14696,7 +14702,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "$cf_cv_termlib" = none; then - { echo "$as_me:14699: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 + { echo "$as_me:14705: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;} fi @@ -14718,7 +14724,7 @@ elif test ".$cf_cv_termlib" = .termcap ; then # BSD 'tputs()' may need 'PC' to be set. cat >conftest.$ac_ext <<_ACEOF -#line 14721 "configure" +#line 14727 "configure" #include "confdefs.h" int @@ -14730,16 +14736,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14733: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14739: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14736: \$? = $ac_status" >&5 + echo "$as_me:14742: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14739: \"$ac_try\"") >&5 + { (eval echo "$as_me:14745: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14742: \$? = $ac_status" >&5 + echo "$as_me:14748: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\EOF #define HAVE_EXTERN_TCAP_PC 1 @@ -14758,14 +14764,14 @@ LIBS="$LIBS $X_EXTRA_LIBS" -echo "$as_me:14761: checking for /dev/tty" >&5 +echo "$as_me:14767: checking for /dev/tty" >&5 echo $ECHO_N "checking for /dev/tty... $ECHO_C" >&6 if test -c /dev/tty ; then cf_result=yes else cf_result=no fi -echo "$as_me:14768: result: $cf_result" >&5 +echo "$as_me:14774: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_result=`echo /dev/tty | sed -e s%/%_%g` @@ -14778,7 +14784,7 @@ fi -echo "$as_me:14781: checking for crypt function" >&5 +echo "$as_me:14787: checking for crypt function" >&5 echo $ECHO_N "checking for crypt function... $ECHO_C" >&6 if test "${cf_cv_crypt_func+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14786,7 +14792,7 @@ cf_cv_crypt_func= cat >conftest.$ac_ext <<_ACEOF -#line 14789 "configure" +#line 14795 "configure" #include "confdefs.h" int @@ -14798,16 +14804,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14801: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14807: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14804: \$? = $ac_status" >&5 + echo "$as_me:14810: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14807: \"$ac_try\"") >&5 + { (eval echo "$as_me:14813: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14810: \$? = $ac_status" >&5 + echo "$as_me:14816: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_crypt_func=yes @@ -14818,7 +14824,7 @@ cf_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14821 "configure" +#line 14827 "configure" #include "confdefs.h" int @@ -14830,16 +14836,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14833: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14839: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14836: \$? = $ac_status" >&5 + echo "$as_me:14842: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14839: \"$ac_try\"") >&5 + { (eval echo "$as_me:14845: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14842: \$? = $ac_status" >&5 + echo "$as_me:14848: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_crypt_func="-lcrypt" @@ -14856,12 +14862,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14859: result: $cf_cv_crypt_func" >&5 +echo "$as_me:14865: result: $cf_cv_crypt_func" >&5 echo "${ECHO_T}$cf_cv_crypt_func" >&6 if test "$cf_cv_crypt_func" != no ; then cf_save_LIBS="$LIBS" test "$cf_cv_crypt_func" != yes && LIBS="$cf_cv_crypt_func $LIBS" -echo "$as_me:14864: checking if crypt works" >&5 +echo "$as_me:14870: checking if crypt works" >&5 echo $ECHO_N "checking if crypt works... $ECHO_C" >&6 if test "${cf_cv_crypt_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14872,7 +14878,7 @@ cf_cv_crypt_works=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 14875 "configure" +#line 14881 "configure" #include "confdefs.h" #include <string.h> @@ -14884,15 +14890,15 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14887: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14893: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14890: \$? = $ac_status" >&5 + echo "$as_me:14896: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14892: \"$ac_try\"") >&5 + { (eval echo "$as_me:14898: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14895: \$? = $ac_status" >&5 + echo "$as_me:14901: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_crypt_works=yes @@ -14907,7 +14913,7 @@ fi LIBS="$cf_save_LIBS" fi -echo "$as_me:14910: result: $cf_cv_crypt_works" >&5 +echo "$as_me:14916: result: $cf_cv_crypt_works" >&5 echo "${ECHO_T}$cf_cv_crypt_works" >&6 if test "$cf_cv_crypt_works" != no ; then cat >>confdefs.h <<\EOF @@ -14920,14 +14926,14 @@ fi fi -echo "$as_me:14923: checking for declaration of fd_set" >&5 +echo "$as_me:14929: checking for declaration of fd_set" >&5 echo $ECHO_N "checking for declaration of fd_set... $ECHO_C" >&6 if test "${cf_cv_type_fd_set+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else echo "trying sys/types alone" 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 14930 "configure" +#line 14936 "configure" #include "confdefs.h" #include <sys/types.h> @@ -14940,16 +14946,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14943: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14949: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14946: \$? = $ac_status" >&5 + echo "$as_me:14952: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14949: \"$ac_try\"") >&5 + { (eval echo "$as_me:14955: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14952: \$? = $ac_status" >&5 + echo "$as_me:14958: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_fd_set=sys/types.h else @@ -14957,7 +14963,7 @@ cat conftest.$ac_ext >&5 echo "trying X11/Xpoll.h" 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 14960 "configure" +#line 14966 "configure" #include "confdefs.h" #ifdef HAVE_X11_XPOLL_H @@ -14972,16 +14978,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14975: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14981: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14978: \$? = $ac_status" >&5 + echo "$as_me:14984: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14981: \"$ac_try\"") >&5 + { (eval echo "$as_me:14987: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14984: \$? = $ac_status" >&5 + echo "$as_me:14990: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_fd_set=X11/Xpoll.h else @@ -14989,7 +14995,7 @@ cat conftest.$ac_ext >&5 echo "trying sys/select.h" 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 14992 "configure" +#line 14998 "configure" #include "confdefs.h" #include <sys/types.h> @@ -15003,16 +15009,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15006: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15012: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15009: \$? = $ac_status" >&5 + echo "$as_me:15015: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15012: \"$ac_try\"") >&5 + { (eval echo "$as_me:15018: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15015: \$? = $ac_status" >&5 + echo "$as_me:15021: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_fd_set=sys/select.h else @@ -15026,7 +15032,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15029: result: $cf_cv_type_fd_set" >&5 +echo "$as_me:15035: result: $cf_cv_type_fd_set" >&5 echo "${ECHO_T}$cf_cv_type_fd_set" >&6 if test $cf_cv_type_fd_set = sys/select.h ; then cat >>confdefs.h <<\EOF @@ -15035,14 +15041,14 @@ fi -echo "$as_me:15038: checking for fd_set macros" >&5 +echo "$as_me:15044: checking for fd_set macros" >&5 echo $ECHO_N "checking for fd_set macros... $ECHO_C" >&6 if test "${cf_cv_macros_fd_set+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15045 "configure" +#line 15051 "configure" #include "confdefs.h" #include <sys/types.h> @@ -15071,16 +15077,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15074: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15080: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15077: \$? = $ac_status" >&5 + echo "$as_me:15083: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15080: \"$ac_try\"") >&5 + { (eval echo "$as_me:15086: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15083: \$? = $ac_status" >&5 + echo "$as_me:15089: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_macros_fd_set=yes else @@ -15090,13 +15096,14 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15093: result: $cf_cv_macros_fd_set" >&5 +echo "$as_me:15099: result: $cf_cv_macros_fd_set" >&5 echo "${ECHO_T}$cf_cv_macros_fd_set" >&6 test $cf_cv_macros_fd_set = yes && cat >>confdefs.h <<\EOF #define HAVE_TYPE_FD_SET 1 EOF for ac_func in \ +_nc_freeall \ access \ alarm \ crypt \ @@ -15137,13 +15144,13 @@ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:15140: checking for $ac_func" >&5 +echo "$as_me:15147: 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 15146 "configure" +#line 15153 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -15174,16 +15181,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15177: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15184: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15180: \$? = $ac_status" >&5 + echo "$as_me:15187: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15183: \"$ac_try\"") >&5 + { (eval echo "$as_me:15190: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15186: \$? = $ac_status" >&5 + echo "$as_me:15193: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -15193,7 +15200,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15196: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:15203: 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 <<EOF @@ -15203,14 +15210,14 @@ fi done -echo "$as_me:15206: checking for standard qsort" >&5 +echo "$as_me:15213: checking for standard qsort" >&5 echo $ECHO_N "checking for standard qsort... $ECHO_C" >&6 if test "${cf_cv_ansi_qsort+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15213 "configure" +#line 15220 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -15228,16 +15235,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15231: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15238: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15234: \$? = $ac_status" >&5 + echo "$as_me:15241: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15237: \"$ac_try\"") >&5 + { (eval echo "$as_me:15244: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15240: \$? = $ac_status" >&5 + echo "$as_me:15247: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ansi_qsort=yes else @@ -15248,7 +15255,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15251: result: $cf_cv_ansi_qsort" >&5 +echo "$as_me:15258: result: $cf_cv_ansi_qsort" >&5 echo "${ECHO_T}$cf_cv_ansi_qsort" >&6 if test $cf_cv_ansi_qsort = yes; then @@ -15263,7 +15270,7 @@ fi -echo "$as_me:15266: checking for working mkstemp" >&5 +echo "$as_me:15273: 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 @@ -15271,13 +15278,13 @@ rm -f conftest* if test "$cross_compiling" = yes; then - echo "$as_me:15274: checking for mkstemp" >&5 + echo "$as_me:15281: 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 15280 "configure" +#line 15287 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mkstemp (); below. */ @@ -15308,16 +15315,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15311: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15318: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15314: \$? = $ac_status" >&5 + echo "$as_me:15321: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15317: \"$ac_try\"") >&5 + { (eval echo "$as_me:15324: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15320: \$? = $ac_status" >&5 + echo "$as_me:15327: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -15327,12 +15334,12 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15330: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:15337: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15335 "configure" +#line 15342 "configure" #include "confdefs.h" #include <sys/types.h> @@ -15365,20 +15372,20 @@ if (result == 0 && !strcmp(name[0], name[1])) result = 1; - exit(result); + ${cf_cv_main_return:-return}(result); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15373: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15380: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15376: \$? = $ac_status" >&5 + echo "$as_me:15383: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15378: \"$ac_try\"") >&5 + { (eval echo "$as_me:15385: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15381: \$? = $ac_status" >&5 + echo "$as_me:15388: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -15393,7 +15400,7 @@ fi fi -echo "$as_me:15396: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:15403: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "$cf_cv_func_mkstemp" = yes ; then cat >>confdefs.h <<\EOF @@ -15411,7 +15418,7 @@ cf_save_cppflags="${CPPFLAGS}" cf_save_ldflags="${LDFLAGS}" -echo "$as_me:15414: checking if you want to use the Xpm library for colored icon" >&5 +echo "$as_me:15421: checking if you want to use the Xpm library for colored icon" >&5 echo $ECHO_N "checking if you want to use the Xpm library for colored icon... $ECHO_C" >&6 # Check whether --with-xpm or --without-xpm was given. @@ -15421,7 +15428,7 @@ else cf_Xpm_library=no fi; -echo "$as_me:15424: result: $cf_Xpm_library" >&5 +echo "$as_me:15431: result: $cf_Xpm_library" >&5 echo "${ECHO_T}$cf_Xpm_library" >&6 if test "$cf_Xpm_library" != no ; then @@ -15429,23 +15436,23 @@ CPPFLAGS="$CPPFLAGS -I$withval/include" LDFLAGS="$LDFLAGS -L$withval/lib" fi - echo "$as_me:15432: checking for X11/xpm.h" >&5 + echo "$as_me:15439: checking for X11/xpm.h" >&5 echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6 if test "${ac_cv_header_X11_xpm_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15438 "configure" +#line 15445 "configure" #include "confdefs.h" #include <X11/xpm.h> _ACEOF -if { (eval echo "$as_me:15442: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15449: \"$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:15448: \$? = $ac_status" >&5 + echo "$as_me:15455: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15464,11 +15471,11 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:15467: result: $ac_cv_header_X11_xpm_h" >&5 +echo "$as_me:15474: result: $ac_cv_header_X11_xpm_h" >&5 echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6 if test $ac_cv_header_X11_xpm_h = yes; then - echo "$as_me:15471: checking for XpmCreatePixmapFromData in -lXpm" >&5 + echo "$as_me:15478: checking for XpmCreatePixmapFromData in -lXpm" >&5 echo $ECHO_N "checking for XpmCreatePixmapFromData in -lXpm... $ECHO_C" >&6 if test "${ac_cv_lib_Xpm_XpmCreatePixmapFromData+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15476,7 +15483,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXpm -lX11 $X_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15479 "configure" +#line 15486 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15495,16 +15502,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15498: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15505: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15501: \$? = $ac_status" >&5 + echo "$as_me:15508: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15504: \"$ac_try\"") >&5 + { (eval echo "$as_me:15511: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15507: \$? = $ac_status" >&5 + echo "$as_me:15514: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes else @@ -15515,7 +15522,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15518: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5 +echo "$as_me:15525: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5 echo "${ECHO_T}$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6 if test $ac_cv_lib_Xpm_XpmCreatePixmapFromData = yes; then @@ -15536,7 +15543,7 @@ fi if test -n "$cf_x_athena" ; then - echo "$as_me:15539: checking if you want to use Xaw scrollbars rather than our own" >&5 + echo "$as_me:15546: checking if you want to use Xaw scrollbars rather than our own" >&5 echo $ECHO_N "checking if you want to use Xaw scrollbars rather than our own... $ECHO_C" >&6 # Check whether --with-Xaw-scrollbars or --without-Xaw-scrollbars was given. @@ -15546,7 +15553,7 @@ else cf_Xaw_scrollbars=no fi; - echo "$as_me:15549: result: $cf_Xaw_scrollbars" >&5 + echo "$as_me:15556: result: $cf_Xaw_scrollbars" >&5 echo "${ECHO_T}$cf_Xaw_scrollbars" >&6 if test "$cf_Xaw_scrollbars" = no ; then @@ -15563,7 +15570,7 @@ #define OPT_XAW_SCROLLBARS 1 EOF - echo "$as_me:15566: checking if you want to use the drag/scrolling extension with Xaw" >&5 + echo "$as_me:15573: checking if you want to use the drag/scrolling extension with Xaw" >&5 echo $ECHO_N "checking if you want to use the drag/scrolling extension with Xaw... $ECHO_C" >&6 # Check whether --with-drag-extension or --without-drag-extension was given. @@ -15573,7 +15580,7 @@ else cf_drag_extension=no fi; - echo "$as_me:15576: result: $cf_drag_extension" >&5 + echo "$as_me:15583: result: $cf_drag_extension" >&5 echo "${ECHO_T}$cf_drag_extension" >&6 if test "$cf_drag_extension" != "no" ; then cat >>confdefs.h <<\EOF @@ -15586,7 +15593,7 @@ fi -echo "$as_me:15589: checking if you want to change the number of exec-macros" >&5 +echo "$as_me:15596: checking if you want to change the number of exec-macros" >&5 echo $ECHO_N "checking if you want to change the number of exec-macros... $ECHO_C" >&6 # Check whether --with-exec-macros or --without-exec-macros was given. @@ -15596,7 +15603,7 @@ else cf_exec_macros=no fi; -echo "$as_me:15599: result: $cf_exec_macros" >&5 +echo "$as_me:15606: result: $cf_exec_macros" >&5 echo "${ECHO_T}$cf_exec_macros" >&6 test "$cf_exec_macros" != no && cat >>confdefs.h <<EOF #define OPT_EXEC_MACROS $cf_exec_macros @@ -15609,7 +15616,7 @@ fi; if test "$enable_largefile" != no; then - echo "$as_me:15612: checking for special C compiler options needed for large files" >&5 + echo "$as_me:15619: 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 @@ -15621,7 +15628,7 @@ # 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 15624 "configure" +#line 15631 "configure" #include "confdefs.h" #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -15641,16 +15648,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15644: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15651: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15647: \$? = $ac_status" >&5 + echo "$as_me:15654: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15650: \"$ac_try\"") >&5 + { (eval echo "$as_me:15657: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15653: \$? = $ac_status" >&5 + echo "$as_me:15660: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -15660,16 +15667,16 @@ rm -f conftest.$ac_objext CC="$CC -n32" rm -f conftest.$ac_objext -if { (eval echo "$as_me:15663: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15670: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15666: \$? = $ac_status" >&5 + echo "$as_me:15673: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15669: \"$ac_try\"") >&5 + { (eval echo "$as_me:15676: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15672: \$? = $ac_status" >&5 + echo "$as_me:15679: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -15683,13 +15690,13 @@ rm -f conftest.$ac_ext fi fi -echo "$as_me:15686: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:15693: 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:15692: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:15699: 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 @@ -15697,7 +15704,7 @@ while :; do ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF -#line 15700 "configure" +#line 15707 "configure" #include "confdefs.h" #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -15717,16 +15724,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15720: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15727: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15723: \$? = $ac_status" >&5 + echo "$as_me:15730: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15726: \"$ac_try\"") >&5 + { (eval echo "$as_me:15733: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15729: \$? = $ac_status" >&5 + echo "$as_me:15736: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -15735,7 +15742,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 15738 "configure" +#line 15745 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include <sys/types.h> @@ -15756,16 +15763,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15759: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15766: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15762: \$? = $ac_status" >&5 + echo "$as_me:15769: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15765: \"$ac_try\"") >&5 + { (eval echo "$as_me:15772: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15768: \$? = $ac_status" >&5 + echo "$as_me:15775: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -15776,7 +15783,7 @@ break done fi -echo "$as_me:15779: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:15786: 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 @@ -15786,7 +15793,7 @@ fi rm -f conftest* - echo "$as_me:15789: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:15796: 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 @@ -15794,7 +15801,7 @@ while :; do ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF -#line 15797 "configure" +#line 15804 "configure" #include "confdefs.h" #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -15814,16 +15821,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15817: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15824: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15820: \$? = $ac_status" >&5 + echo "$as_me:15827: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15823: \"$ac_try\"") >&5 + { (eval echo "$as_me:15830: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15826: \$? = $ac_status" >&5 + echo "$as_me:15833: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -15832,7 +15839,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 15835 "configure" +#line 15842 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include <sys/types.h> @@ -15853,16 +15860,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15856: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15863: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15859: \$? = $ac_status" >&5 + echo "$as_me:15866: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15862: \"$ac_try\"") >&5 + { (eval echo "$as_me:15869: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15865: \$? = $ac_status" >&5 + echo "$as_me:15872: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_large_files=1; break else @@ -15873,7 +15880,7 @@ break done fi -echo "$as_me:15876: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:15883: 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 @@ -15886,7 +15893,7 @@ fi if test "$enable_largefile" != no ; then - echo "$as_me:15889: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:15896: 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 @@ -15894,7 +15901,7 @@ while :; do ac_cv_sys_largefile_source=no cat >conftest.$ac_ext <<_ACEOF -#line 15897 "configure" +#line 15904 "configure" #include "confdefs.h" #include <stdio.h> int @@ -15906,16 +15913,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15909: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15916: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15912: \$? = $ac_status" >&5 + echo "$as_me:15919: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15915: \"$ac_try\"") >&5 + { (eval echo "$as_me:15922: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15918: \$? = $ac_status" >&5 + echo "$as_me:15925: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -15924,7 +15931,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 15927 "configure" +#line 15934 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include <stdio.h> @@ -15937,16 +15944,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15940: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15947: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15943: \$? = $ac_status" >&5 + echo "$as_me:15950: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15946: \"$ac_try\"") >&5 + { (eval echo "$as_me:15953: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15949: \$? = $ac_status" >&5 + echo "$as_me:15956: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_source=1; break else @@ -15957,7 +15964,7 @@ break done fi -echo "$as_me:15960: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:15967: 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 @@ -15971,13 +15978,13 @@ # 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:15974: checking for fseeko" >&5 +echo "$as_me:15981: 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 15980 "configure" +#line 15987 "configure" #include "confdefs.h" #include <stdio.h> int @@ -15989,16 +15996,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15992: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15999: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15995: \$? = $ac_status" >&5 + echo "$as_me:16002: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15998: \"$ac_try\"") >&5 + { (eval echo "$as_me:16005: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16001: \$? = $ac_status" >&5 + echo "$as_me:16008: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fseeko=yes else @@ -16008,7 +16015,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16011: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:16018: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -16028,14 +16035,14 @@ test "$ac_cv_sys_large_files" != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES " test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " - echo "$as_me:16031: checking whether to use struct dirent64" >&5 + echo "$as_me:16038: 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 16038 "configure" +#line 16045 "configure" #include "confdefs.h" #include <sys/types.h> @@ -16056,16 +16063,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16059: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16066: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16062: \$? = $ac_status" >&5 + echo "$as_me:16069: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16065: \"$ac_try\"") >&5 + { (eval echo "$as_me:16072: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16068: \$? = $ac_status" >&5 + echo "$as_me:16075: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_struct_dirent64=yes else @@ -16076,7 +16083,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:16079: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:16086: 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 @@ -16087,14 +16094,14 @@ # I don't know of a reliable test for working locale, but we can at least check # that it is available before offering it as an option. -echo "$as_me:16090: checking for setlocale()" >&5 +echo "$as_me:16097: checking for setlocale()" >&5 echo $ECHO_N "checking for setlocale()... $ECHO_C" >&6 if test "${cf_cv_locale+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16097 "configure" +#line 16104 "configure" #include "confdefs.h" #include <locale.h> int @@ -16106,16 +16113,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16109: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16116: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16112: \$? = $ac_status" >&5 + echo "$as_me:16119: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16115: \"$ac_try\"") >&5 + { (eval echo "$as_me:16122: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16118: \$? = $ac_status" >&5 + echo "$as_me:16125: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_locale=yes else @@ -16127,7 +16134,7 @@ fi -echo "$as_me:16130: result: $cf_cv_locale" >&5 +echo "$as_me:16137: result: $cf_cv_locale" >&5 echo "${ECHO_T}$cf_cv_locale" >&6 test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF #define LOCALE 1 @@ -16135,7 +16142,7 @@ } if test $cf_cv_locale = yes ; then -echo "$as_me:16138: checking if you want to use i18n locale support" >&5 +echo "$as_me:16145: checking if you want to use i18n locale support" >&5 echo $ECHO_N "checking if you want to use i18n locale support... $ECHO_C" >&6 # Check whether --with-locale or --without-locale was given. @@ -16145,7 +16152,7 @@ else cf_locale=yes fi; -echo "$as_me:16148: result: $cf_locale" >&5 +echo "$as_me:16155: result: $cf_locale" >&5 echo "${ECHO_T}$cf_locale" >&6 if test "$cf_locale" != no ; then cat >>confdefs.h <<\EOF @@ -16154,13 +16161,13 @@ eval 'cf_cv_have_lib_'iconv'=no' cf_libdir="" - echo "$as_me:16157: checking for iconv" >&5 + echo "$as_me:16164: checking for iconv" >&5 echo $ECHO_N "checking for iconv... $ECHO_C" >&6 if test "${ac_cv_func_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16163 "configure" +#line 16170 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char iconv (); below. */ @@ -16191,16 +16198,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16194: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16201: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16197: \$? = $ac_status" >&5 + echo "$as_me:16204: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16200: \"$ac_try\"") >&5 + { (eval echo "$as_me:16207: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16203: \$? = $ac_status" >&5 + echo "$as_me:16210: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_iconv=yes else @@ -16210,18 +16217,18 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16213: result: $ac_cv_func_iconv" >&5 +echo "$as_me:16220: result: $ac_cv_func_iconv" >&5 echo "${ECHO_T}$ac_cv_func_iconv" >&6 if test $ac_cv_func_iconv = yes; then eval 'cf_cv_have_lib_'iconv'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:16220: checking for iconv in -liconv" >&5 + echo "$as_me:16227: checking for iconv in -liconv" >&5 echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6 LIBS="-liconv $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16224 "configure" +#line 16231 "configure" #include "confdefs.h" #include <iconv.h> int @@ -16233,25 +16240,25 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16236: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16243: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16239: \$? = $ac_status" >&5 + echo "$as_me:16246: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16242: \"$ac_try\"") >&5 + { (eval echo "$as_me:16249: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16245: \$? = $ac_status" >&5 + echo "$as_me:16252: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:16247: result: yes" >&5 + echo "$as_me:16254: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'iconv'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:16254: result: no" >&5 +echo "$as_me:16261: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search="" @@ -16311,11 +16318,11 @@ for cf_libdir in $cf_search do - echo "$as_me:16314: checking for -liconv in $cf_libdir" >&5 + echo "$as_me:16321: checking for -liconv in $cf_libdir" >&5 echo $ECHO_N "checking for -liconv in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -liconv $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16318 "configure" +#line 16325 "configure" #include "confdefs.h" #include <iconv.h> int @@ -16327,25 +16334,25 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16330: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16337: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16333: \$? = $ac_status" >&5 + echo "$as_me:16340: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16336: \"$ac_try\"") >&5 + { (eval echo "$as_me:16343: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16339: \$? = $ac_status" >&5 + echo "$as_me:16346: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:16341: result: yes" >&5 + echo "$as_me:16348: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'iconv'=yes' break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:16348: result: no" >&5 +echo "$as_me:16355: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -16359,7 +16366,7 @@ eval 'cf_found_library=$cf_cv_have_lib_'iconv -echo "$as_me:16362: checking for iconv function library" >&5 +echo "$as_me:16369: checking for iconv function library" >&5 echo $ECHO_N "checking for iconv function library... $ECHO_C" >&6 if test "${cf_cv_func_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16372,11 +16379,11 @@ fi fi -echo "$as_me:16375: result: $cf_cv_func_iconv" >&5 +echo "$as_me:16382: result: $cf_cv_func_iconv" >&5 echo "${ECHO_T}$cf_cv_func_iconv" >&6 if test "$cf_cv_func_iconv" != no ; then -echo "$as_me:16379: checking if you want to use iconv() for locale support" >&5 +echo "$as_me:16386: checking if you want to use iconv() for locale support" >&5 echo $ECHO_N "checking if you want to use iconv() for locale support... $ECHO_C" >&6 # Check whether --with-iconv or --without-iconv was given. @@ -16386,7 +16393,7 @@ else cf_func_iconv=yes fi; -echo "$as_me:16389: result: $cf_func_iconv" >&5 +echo "$as_me:16396: result: $cf_func_iconv" >&5 echo "${ECHO_T}$cf_func_iconv" >&6 if test "$cf_func_iconv" = yes ; then cat >>confdefs.h <<\EOF @@ -16401,36 +16408,123 @@ ### Debugging/development options -echo "$as_me:16404: checking if you want to link with dbmalloc for testing" >&5 -echo $ECHO_N "checking if you want to link with dbmalloc for testing... $ECHO_C" >&6 +echo "$as_me:16411: 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-dbmalloc or --without-dbmalloc was given. -if test "${with_dbmalloc+set}" = set; then - withval="$with_dbmalloc" - with_dbmalloc=$withval +# Check whether --with-dmalloc or --without-dmalloc was given. +if test "${with_dmalloc+set}" = set; then + withval="$with_dmalloc" + cat >>confdefs.h <<\EOF +#define USE_DMALLOC 1 +EOF + + : ${with_cflags:=-g} + : ${with_no_leaks:=yes} + with_dmalloc=yes else - with_dbmalloc=no + with_dmalloc= fi; -echo "$as_me:16414: result: $with_dbmalloc" >&5 -echo "${ECHO_T}$with_dbmalloc" >&6 -if test "$with_dbmalloc" = yes ; then - echo "$as_me:16417: 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 "$as_me:16427: result: ${with_dmalloc:-no}" >&5 +echo "${ECHO_T}${with_dmalloc:-no}" >&6 + +case .$with_cflags in #(vi +.*-g*) + case .$CFLAGS in #(vi + .*-g*) #(vi + ;; + *) + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in -g +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$cf_new_cppflags $CPPFLAGS" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + + ;; + esac + ;; +esac + +if test "$with_dmalloc" = yes ; then + echo "$as_me:16511: 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 16423 "configure" +#line 16517 "configure" #include "confdefs.h" -#include <dbmalloc.h> +#include <dmalloc.h> _ACEOF -if { (eval echo "$as_me:16427: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16521: \"$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:16433: \$? = $ac_status" >&5 + echo "$as_me:16527: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16441,27 +16535,27 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - ac_cv_header_dbmalloc_h=yes + ac_cv_header_dmalloc_h=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_header_dbmalloc_h=no + ac_cv_header_dmalloc_h=no fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:16452: 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:16546: 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:16456: 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 "$as_me:16550: 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 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ldbmalloc $LIBS" +LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16464 "configure" +#line 16558 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16470,44 +16564,44 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char debug_malloc (); +char dmalloc_debug (); int main () { -debug_malloc (); +dmalloc_debug (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16483: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16577: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16486: \$? = $ac_status" >&5 + echo "$as_me:16580: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16489: \"$ac_try\"") >&5 + { (eval echo "$as_me:16583: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16492: \$? = $ac_status" >&5 + echo "$as_me:16586: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_dbmalloc_debug_malloc=yes + ac_cv_lib_dmalloc_dmalloc_debug=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_dbmalloc_debug_malloc=no +ac_cv_lib_dmalloc_dmalloc_debug=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16503: 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 +echo "$as_me:16597: 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 <<EOF -#define HAVE_LIBDBMALLOC 1 +#define HAVE_LIBDMALLOC 1 EOF - LIBS="-ldbmalloc $LIBS" + LIBS="-ldmalloc $LIBS" fi @@ -16515,36 +16609,123 @@ fi -echo "$as_me:16518: checking if you want to link with dmalloc for testing" >&5 -echo $ECHO_N "checking if you want to link with dmalloc for testing... $ECHO_C" >&6 +echo "$as_me:16612: 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-dmalloc or --without-dmalloc was given. -if test "${with_dmalloc+set}" = set; then - withval="$with_dmalloc" - with_dmalloc=$withval +# Check whether --with-dbmalloc or --without-dbmalloc was given. +if test "${with_dbmalloc+set}" = set; then + withval="$with_dbmalloc" + cat >>confdefs.h <<\EOF +#define USE_DBMALLOC 1 +EOF + + : ${with_cflags:=-g} + : ${with_no_leaks:=yes} + with_dbmalloc=yes else - with_dmalloc=no + with_dbmalloc= fi; -echo "$as_me:16528: result: $with_dmalloc" >&5 -echo "${ECHO_T}$with_dmalloc" >&6 -if test "$with_dmalloc" = yes ; then - echo "$as_me:16531: 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 "$as_me:16628: result: ${with_dbmalloc:-no}" >&5 +echo "${ECHO_T}${with_dbmalloc:-no}" >&6 + +case .$with_cflags in #(vi +.*-g*) + case .$CFLAGS in #(vi + .*-g*) #(vi + ;; + *) + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in -g +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$cf_new_cppflags $CPPFLAGS" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + + ;; + esac + ;; +esac + +if test "$with_dbmalloc" = yes ; then + echo "$as_me:16712: 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 16537 "configure" +#line 16718 "configure" #include "confdefs.h" -#include <dmalloc.h> +#include <dbmalloc.h> _ACEOF -if { (eval echo "$as_me:16541: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16722: \"$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:16547: \$? = $ac_status" >&5 + echo "$as_me:16728: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16555,27 +16736,27 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - ac_cv_header_dmalloc_h=yes + ac_cv_header_dbmalloc_h=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_header_dmalloc_h=no + ac_cv_header_dbmalloc_h=no fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:16566: 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:16747: 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:16570: 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 "$as_me:16751: 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 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ldmalloc $LIBS" +LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16578 "configure" +#line 16759 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16584,44 +16765,44 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dmalloc_debug (); +char debug_malloc (); int main () { -dmalloc_debug (); +debug_malloc (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16597: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16778: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16600: \$? = $ac_status" >&5 + echo "$as_me:16781: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16603: \"$ac_try\"") >&5 + { (eval echo "$as_me:16784: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16606: \$? = $ac_status" >&5 + echo "$as_me:16787: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_dmalloc_dmalloc_debug=yes + ac_cv_lib_dbmalloc_debug_malloc=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_dmalloc_dmalloc_debug=no +ac_cv_lib_dbmalloc_debug_malloc=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16617: 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 +echo "$as_me:16798: 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 <<EOF -#define HAVE_LIBDMALLOC 1 +#define HAVE_LIBDBMALLOC 1 EOF - LIBS="-ldmalloc $LIBS" + LIBS="-ldbmalloc $LIBS" fi @@ -16629,6 +16810,9 @@ fi +echo "$as_me:16813: checking if you want to use purify for testing" >&5 +echo $ECHO_N "checking if you want to use purify for testing... $ECHO_C" >&6 + # Check whether --with-purify or --without-purify was given. if test "${with_purify+set}" = set; then withval="$with_purify" @@ -16636,21 +16820,196 @@ #define USE_PURIFY 1 EOF - LINK_PREFIX="$LINK_PREFIX purify" + : ${with_cflags:=-g} + : ${with_no_leaks:=yes} with_purify=yes else with_purify= fi; +echo "$as_me:16829: result: ${with_purify:-no}" >&5 +echo "${ECHO_T}${with_purify:-no}" >&6 -# Check whether --with-fakevms or --without-fakevms was given. -if test "${with_fakevms+set}" = set; then - withval="$with_fakevms" +case .$with_cflags in #(vi +.*-g*) + case .$CFLAGS in #(vi + .*-g*) #(vi + ;; + *) + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in -g +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$cf_new_cppflags $CPPFLAGS" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + + ;; + esac + ;; +esac + +echo "$as_me:16912: 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. +if test "${with_valgrind+set}" = set; then + withval="$with_valgrind" cat >>confdefs.h <<\EOF -#define OPT_VMS_PATH 1 +#define USE_VALGRIND 1 EOF - EXTRAOBJS="$EXTRAOBJS fakevms\$o vms2unix\$o" + : ${with_cflags:=-g} + : ${with_no_leaks:=yes} + with_valgrind=yes +else + with_valgrind= fi; +echo "$as_me:16928: result: ${with_valgrind:-no}" >&5 +echo "${ECHO_T}${with_valgrind:-no}" >&6 + +case .$with_cflags in #(vi +.*-g*) + case .$CFLAGS in #(vi + .*-g*) #(vi + ;; + *) + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in -g +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$cf_new_cppflags $CPPFLAGS" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + + ;; + esac + ;; +esac + +echo "$as_me:17011: 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 --with-no-leaks or --without-no-leaks was given. if test "${with_no_leaks+set}" = set; then @@ -16659,7 +17018,7 @@ #define NO_LEAKS 1 EOF - cf_doalloc=".${with_dmalloc}${with_dbmalloc}${with_purify}" + cf_doalloc=".${with_dmalloc}${with_dbmalloc}${with_purify}${with_valgrind}" case ${cf_doalloc} in #(vi *yes*) ;; *) cat >>confdefs.h <<\EOF @@ -16671,6 +17030,18 @@ else with_no_leaks= fi; +echo "$as_me:17033: result: $with_no_leaks" >&5 +echo "${ECHO_T}$with_no_leaks" >&6 + +# Check whether --with-fakevms or --without-fakevms was given. +if test "${with_fakevms+set}" = set; then + withval="$with_fakevms" + cat >>confdefs.h <<\EOF +#define OPT_VMS_PATH 1 +EOF + + EXTRAOBJS="$EXTRAOBJS fakevms\$o vms2unix\$o" +fi; # Check whether --with-trace or --without-trace was given. if test "${with_trace+set}" = set; then @@ -16688,17 +17059,17 @@ GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:16691: checking version of $CC" >&5 + echo "$as_me:17062: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 GCC_VERSION="`${CC} --version| 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:16695: result: $GCC_VERSION" >&5 + echo "$as_me:17066: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi if ( test "$GCC" = yes || test "$GXX" = yes ) then -echo "$as_me:16701: checking if you want to check for gcc warnings" >&5 +echo "$as_me:17072: checking if you want to check for gcc warnings" >&5 echo $ECHO_N "checking if you want to check for gcc warnings... $ECHO_C" >&6 # Check whether --with-warnings or --without-warnings was given. @@ -16708,7 +17079,7 @@ else cf_opt_with_warnings=no fi; -echo "$as_me:16711: result: $cf_opt_with_warnings" >&5 +echo "$as_me:17082: result: $cf_opt_with_warnings" >&5 echo "${ECHO_T}$cf_opt_with_warnings" >&6 if test "$cf_opt_with_warnings" != no ; then @@ -16730,10 +17101,10 @@ EOF if test "$GCC" = yes then - { echo "$as_me:16733: checking for $CC __attribute__ directives..." >&5 + { echo "$as_me:17104: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > conftest.$ac_ext <<EOF -#line 16736 "configure" +#line 17107 "configure" #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -16771,12 +17142,12 @@ EOF ;; esac - if { (eval echo "$as_me:16774: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17145: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16777: \$? = $ac_status" >&5 + echo "$as_me:17148: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:16779: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:17150: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h fi @@ -16792,12 +17163,12 @@ if test "$GCC" = yes ; then case $host_os in linux*|gnu*) - echo "$as_me:16795: checking if this is really Intel C compiler" >&5 + echo "$as_me:17166: 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 16800 "configure" +#line 17171 "configure" #include "confdefs.h" int @@ -16814,16 +17185,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:16817: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17188: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16820: \$? = $ac_status" >&5 + echo "$as_me:17191: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16823: \"$ac_try\"") >&5 + { (eval echo "$as_me:17194: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16826: \$? = $ac_status" >&5 + echo "$as_me:17197: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -16834,14 +17205,14 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:16837: result: $INTEL_COMPILER" >&5 + echo "$as_me:17208: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac fi cat > conftest.$ac_ext <<EOF -#line 16844 "configure" +#line 17215 "configure" int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } EOF @@ -16859,7 +17230,7 @@ # remark #981: operands are evaluated in unspecified order # warning #269: invalid format string conversion - { echo "$as_me:16862: checking for $CC warning options..." >&5 + { echo "$as_me:17233: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -16876,12 +17247,12 @@ wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:16879: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17250: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16882: \$? = $ac_status" >&5 + echo "$as_me:17253: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:16884: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:17255: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -16890,7 +17261,7 @@ elif test "$GCC" = yes then - { echo "$as_me:16893: checking for $CC warning options..." >&5 + { echo "$as_me:17264: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" @@ -16910,12 +17281,12 @@ Wundef $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:16913: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17284: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16916: \$? = $ac_status" >&5 + echo "$as_me:17287: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:16918: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:17289: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -16965,7 +17336,7 @@ ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -echo "$as_me:16968: checking for missing \"${ac_func}\" extern" >&5 +echo "$as_me:17339: checking for missing \"${ac_func}\" extern" >&5 echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16974,7 +17345,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG" cat >conftest.$ac_ext <<_ACEOF -#line 16977 "configure" +#line 17348 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -16996,16 +17367,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16999: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17370: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17002: \$? = $ac_status" >&5 + echo "$as_me:17373: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17005: \"$ac_try\"") >&5 + { (eval echo "$as_me:17376: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17008: \$? = $ac_status" >&5 + echo "$as_me:17379: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval 'cf_cv_func_'${ac_func}'=yes' else @@ -17019,7 +17390,7 @@ fi eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$as_me:17022: result: $cf_result" >&5 +echo "$as_me:17393: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test $cf_result = yes && cat >>confdefs.h <<EOF #define MISSING_EXTERN_${ac_tr_func} 1 @@ -17033,7 +17404,7 @@ #include <tcap.h> " -echo "$as_me:17036: checking for term.h" >&5 +echo "$as_me:17407: checking for term.h" >&5 echo $ECHO_N "checking for term.h... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17046,7 +17417,7 @@ term.h do cat >conftest.$ac_ext <<_ACEOF -#line 17049 "configure" +#line 17420 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -17060,16 +17431,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17063: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17434: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17066: \$? = $ac_status" >&5 + echo "$as_me:17437: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17069: \"$ac_try\"") >&5 + { (eval echo "$as_me:17440: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17072: \$? = $ac_status" >&5 + echo "$as_me:17443: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header=$cf_header break @@ -17082,7 +17453,7 @@ done fi -echo "$as_me:17085: result: $cf_cv_term_header" >&5 +echo "$as_me:17456: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 case $cf_cv_term_header in #(vi @@ -17106,7 +17477,7 @@ ;; esac -echo "$as_me:17109: checking if we should include curses.h or termcap.h" >&5 +echo "$as_me:17480: checking if we should include curses.h or termcap.h" >&5 echo $ECHO_N "checking if we should include curses.h or termcap.h... $ECHO_C" >&6 if test "${cf_cv_need_curses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17125,7 +17496,7 @@ test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts" cat >conftest.$ac_ext <<_ACEOF -#line 17128 "configure" +#line 17499 "configure" #include "confdefs.h" /* $cf_c_opts $cf_t_opts */ $CHECK_DECL_HDRS @@ -17138,16 +17509,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17141: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17512: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17144: \$? = $ac_status" >&5 + echo "$as_me:17515: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17147: \"$ac_try\"") >&5 + { (eval echo "$as_me:17518: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17150: \$? = $ac_status" >&5 + echo "$as_me:17521: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test "$cf_cv_need_curses_h" = no && { cf_cv_need_curses_h=maybe @@ -17159,7 +17530,7 @@ cat conftest.$ac_ext >&5 echo "Recompiling with corrected call (C:$cf_c_opts, T:$cf_t_opts)" >&5 cat >conftest.$ac_ext <<_ACEOF -#line 17162 "configure" +#line 17533 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -17172,16 +17543,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17175: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17546: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17178: \$? = $ac_status" >&5 + echo "$as_me:17549: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17181: \"$ac_try\"") >&5 + { (eval echo "$as_me:17552: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17184: \$? = $ac_status" >&5 + echo "$as_me:17555: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_curses_h=yes cf_ok_c_opts=$cf_c_opts @@ -17218,7 +17589,7 @@ fi fi -echo "$as_me:17221: result: $cf_cv_need_curses_h" >&5 +echo "$as_me:17592: result: $cf_cv_need_curses_h" >&5 echo "${ECHO_T}$cf_cv_need_curses_h" >&6 case $cf_cv_need_curses_h in @@ -17252,7 +17623,7 @@ ;; esac -echo "$as_me:17255: checking declaration of tputs 3rd param" >&5 +echo "$as_me:17626: checking declaration of tputs 3rd param" >&5 echo $ECHO_N "checking declaration of tputs 3rd param... $ECHO_C" >&6 if test "${cf_cv_type_outchar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17268,10 +17639,10 @@ for R in int char; do for S in "" const; do -echo "(line 17271) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 +echo "(line 17642) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 17274 "configure" +#line 17645 "configure" #include "confdefs.h" $CHECK_DECL_HDRS int @@ -17285,16 +17656,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17288: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17659: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17291: \$? = $ac_status" >&5 + echo "$as_me:17662: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17294: \"$ac_try\"") >&5 + { (eval echo "$as_me:17665: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17297: \$? = $ac_status" >&5 + echo "$as_me:17668: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_outchar="$Q OutChar($R)" cf_cv_found=yes @@ -17313,7 +17684,7 @@ done fi -echo "$as_me:17316: result: $cf_cv_type_outchar" >&5 +echo "$as_me:17687: result: $cf_cv_type_outchar" >&5 echo "${ECHO_T}$cf_cv_type_outchar" >&6 case $cf_cv_type_outchar in @@ -17345,7 +17716,7 @@ ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -echo "$as_me:17348: checking for missing \"${ac_func}\" extern" >&5 +echo "$as_me:17719: checking for missing \"${ac_func}\" extern" >&5 echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17354,7 +17725,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG" cat >conftest.$ac_ext <<_ACEOF -#line 17357 "configure" +#line 17728 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -17376,16 +17747,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17379: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17750: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17382: \$? = $ac_status" >&5 + echo "$as_me:17753: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17385: \"$ac_try\"") >&5 + { (eval echo "$as_me:17756: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17388: \$? = $ac_status" >&5 + echo "$as_me:17759: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval 'cf_cv_func_'${ac_func}'=yes' else @@ -17399,7 +17770,7 @@ fi eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$as_me:17402: result: $cf_result" >&5 +echo "$as_me:17773: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test $cf_result = yes && cat >>confdefs.h <<EOF #define MISSING_EXTERN_${ac_tr_func} 1 @@ -17414,6 +17785,7 @@ then CHECK_DECL_HDRS="$VILE_CHECK_HDRS" for ac_func in \ +_nc_freeall \ access \ alarm \ atoi \ @@ -17475,7 +17847,7 @@ ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -echo "$as_me:17478: checking for missing \"${ac_func}\" extern" >&5 +echo "$as_me:17850: checking for missing \"${ac_func}\" extern" >&5 echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17484,7 +17856,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG" cat >conftest.$ac_ext <<_ACEOF -#line 17487 "configure" +#line 17859 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -17506,16 +17878,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17509: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17881: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17512: \$? = $ac_status" >&5 + echo "$as_me:17884: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17515: \"$ac_try\"") >&5 + { (eval echo "$as_me:17887: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17518: \$? = $ac_status" >&5 + echo "$as_me:17890: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval 'cf_cv_func_'${ac_func}'=yes' else @@ -17529,7 +17901,7 @@ fi eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$as_me:17532: result: $cf_result" >&5 +echo "$as_me:17904: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test $cf_result = yes && cat >>confdefs.h <<EOF #define MISSING_EXTERN_${ac_tr_func} 1 @@ -17549,7 +17921,7 @@ ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -echo "$as_me:17552: checking for missing \"${ac_func}\" extern" >&5 +echo "$as_me:17924: checking for missing \"${ac_func}\" extern" >&5 echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17558,7 +17930,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG" cat >conftest.$ac_ext <<_ACEOF -#line 17561 "configure" +#line 17933 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -17580,16 +17952,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17583: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17955: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17586: \$? = $ac_status" >&5 + echo "$as_me:17958: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17589: \"$ac_try\"") >&5 + { (eval echo "$as_me:17961: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17592: \$? = $ac_status" >&5 + echo "$as_me:17964: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval 'cf_cv_func_'${ac_func}'=yes' else @@ -17603,7 +17975,7 @@ fi eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$as_me:17606: result: $cf_result" >&5 +echo "$as_me:17978: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test $cf_result = yes && cat >>confdefs.h <<EOF #define MISSING_EXTERN_${ac_tr_func} 1 @@ -17660,13 +18032,13 @@ if test "$cf_need_libdl" = yes ; then cf_have_dlsym=no -echo "$as_me:17663: checking for dlsym" >&5 +echo "$as_me:18035: 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 17669 "configure" +#line 18041 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlsym (); below. */ @@ -17697,16 +18069,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17700: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18072: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17703: \$? = $ac_status" >&5 + echo "$as_me:18075: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17706: \"$ac_try\"") >&5 + { (eval echo "$as_me:18078: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17709: \$? = $ac_status" >&5 + echo "$as_me:18081: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_dlsym=yes else @@ -17716,14 +18088,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17719: result: $ac_cv_func_dlsym" >&5 +echo "$as_me:18091: 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:17726: checking for dlsym in -ldl" >&5 +echo "$as_me:18098: 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 @@ -17731,7 +18103,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 17734 "configure" +#line 18106 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17750,16 +18122,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17753: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18125: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17756: \$? = $ac_status" >&5 + echo "$as_me:18128: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17759: \"$ac_try\"") >&5 + { (eval echo "$as_me:18131: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17762: \$? = $ac_status" >&5 + echo "$as_me:18134: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dl_dlsym=yes else @@ -17770,7 +18142,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17773: result: $ac_cv_lib_dl_dlsym" >&5 +echo "$as_me:18145: 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 @@ -17783,10 +18155,10 @@ if test "$cf_have_dlsym" = yes ; then test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS" - echo "$as_me:17786: checking whether able to link to dl*() functions" >&5 + echo "$as_me:18158: 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 17789 "configure" +#line 18161 "configure" #include "confdefs.h" #include <dlfcn.h> int @@ -17804,16 +18176,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17807: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18179: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17810: \$? = $ac_status" >&5 + echo "$as_me:18182: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17813: \"$ac_try\"") >&5 + { (eval echo "$as_me:18185: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17816: \$? = $ac_status" >&5 + echo "$as_me:18188: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\EOF @@ -17824,15 +18196,15 @@ echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - { { echo "$as_me:17827: error: Cannot link test program for libdl" >&5 + { { echo "$as_me:18199: 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:17832: result: ok" >&5 + echo "$as_me:18204: result: ok" >&5 echo "${ECHO_T}ok" >&6 else - { { echo "$as_me:17835: error: Cannot find dlsym function" >&5 + { { echo "$as_me:18207: error: Cannot find dlsym function" >&5 echo "$as_me: error: Cannot find dlsym function" >&2;} { (exit 1); exit 1; }; } fi @@ -17847,10 +18219,10 @@ cf_opt_rdynamic=no cf_save_CFLAGS="$CFLAGS" CFLAGS="-Wall -rdynamic $CFLAGS" - echo "$as_me:17850: checking if gcc has -rdynamic option" >&5 + echo "$as_me:18222: checking if gcc has -rdynamic option" >&5 echo $ECHO_N "checking if gcc has -rdynamic option... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 17853 "configure" +#line 18225 "configure" #include "confdefs.h" #include <stdio.h> int @@ -17862,16 +18234,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17865: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18237: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17868: \$? = $ac_status" >&5 + echo "$as_me:18240: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17871: \"$ac_try\"") >&5 + { (eval echo "$as_me:18243: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17874: \$? = $ac_status" >&5 + echo "$as_me:18246: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_opt_rdynamic=yes else @@ -17880,7 +18252,7 @@ cf_opt_rdynamic=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:17883: result: $cf_opt_rdynamic" >&5 + echo "$as_me:18255: result: $cf_opt_rdynamic" >&5 echo "${ECHO_T}$cf_opt_rdynamic" >&6 test "$cf_opt_rdynamic" = no && CFLAGS="$cf_save_CFLAGS" @@ -17897,7 +18269,7 @@ 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:17900: checking for $ac_word" >&5 +echo "$as_me:18272: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_SPELL_PROG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17912,7 +18284,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_SPELL_PROG="$ac_prog" -echo "$as_me:17915: found $ac_dir/$ac_word" >&5 +echo "$as_me:18287: found $ac_dir/$ac_word" >&5 break done @@ -17920,10 +18292,10 @@ fi SPELL_PROG=$ac_cv_prog_SPELL_PROG if test -n "$SPELL_PROG"; then - echo "$as_me:17923: result: $SPELL_PROG" >&5 + echo "$as_me:18295: result: $SPELL_PROG" >&5 echo "${ECHO_T}$SPELL_PROG" >&6 else - echo "$as_me:17926: result: no" >&5 + echo "$as_me:18298: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -18035,7 +18407,7 @@ : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:18038: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:18410: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -18167,7 +18539,7 @@ cat >>$CONFIG_STATUS <<EOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52.20030208, +configured by $0, generated by GNU Autoconf 2.52.20061216, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -18211,7 +18583,7 @@ echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:18214: error: ambiguous option: $1 + { { echo "$as_me:18586: 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;} @@ -18230,7 +18602,7 @@ ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:18233: error: unrecognized option: $1 + -*) { { echo "$as_me:18605: 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;} @@ -18249,7 +18621,7 @@ ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20030208, executed with +This file was extended by $as_me 2.52.20061216, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -18288,7 +18660,7 @@ "filters/makefile.tmp" ) CONFIG_FILES="$CONFIG_FILES filters/makefile.tmp:filters/makefile.2nd" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config_h.in" ;; - *) { { echo "$as_me:18291: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:18663: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -18558,7 +18930,7 @@ esac if test x"$ac_file" != x-; then - { echo "$as_me:18561: creating $ac_file" >&5 + { echo "$as_me:18933: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -18576,7 +18948,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:18579: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:18951: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -18589,7 +18961,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:18592: error: cannot find input file: $f" >&5 + { { echo "$as_me:18964: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -18655,7 +19027,7 @@ * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:18658: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:19030: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -18666,7 +19038,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:18669: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:19041: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -18679,7 +19051,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:18682: error: cannot find input file: $f" >&5 + { { echo "$as_me:19054: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -18704,7 +19076,7 @@ do # Write chunks of a limited-size here document to conftest.frag. echo ' cat >> conftest.frag <<CEOF' >> $CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.vals | sed -e 's/#ifdef.*/#if 0/' >> $CONFIG_STATUS echo 'CEOF' >> $CONFIG_STATUS sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail rm -f conftest.vals @@ -18737,7 +19109,7 @@ 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:18740: $ac_file is unchanged" >&5 + { echo "$as_me:19112: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ Index: configure.in Prereq: 1.225 --- vile-9.5m+/configure.in 2006-10-28 17:46:42.000000000 +0000 +++ vile-9.5n/configure.in 2006-12-14 23:37:27.000000000 +0000 @@ -1,12 +1,12 @@ dnl Process this file with autoconf to produce a configure script. -AC_REVISION($Revision: 1.225 $) +AC_REVISION($Revision: 1.227 $) AC_PREREQ(2.13.20030927) rm -f config.cache ### Use "configure -with-screen" to override the default configuration, which is ### termcap-based on unix systems. -dnl $Header: /usr/build/vile/vile/RCS/configure.in,v 1.225 2006/10/28 17:46:42 tom Exp $ +dnl $Header: /usr/build/vile/vile/RCS/configure.in,v 1.227 2006/12/14 23:37:27 tom Exp $ define(MAKELIST, sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak) @@ -561,6 +561,7 @@ CF_CHECK_FD_SET AC_HAVE_FUNCS( \ +_nc_freeall \ access \ alarm \ crypt \ @@ -702,32 +703,13 @@ fi # test $cf_cv_locale = yes ### Debugging/development options -CF_WITH_DBMALLOC -CF_WITH_DMALLOC - -AC_ARG_WITH(purify, - [ --with-purify test: use Purify], - [AC_DEFINE(USE_PURIFY) - LINK_PREFIX="$LINK_PREFIX purify" - with_purify=yes], - [with_purify=]) +CF_WITH_NO_LEAKS AC_ARG_WITH(fakevms, [ --with-fakevms test: use fake VMS I/O module], [AC_DEFINE(OPT_VMS_PATH) EXTRAOBJS="$EXTRAOBJS fakevms\$o vms2unix\$o"]) -AC_ARG_WITH(no-leaks, - [ --with-no-leaks test: free permanent memory, analyze leaks], - [AC_DEFINE(NO_LEAKS) - cf_doalloc=".${with_dmalloc}${with_dbmalloc}${with_purify}" - case ${cf_doalloc} in #(vi - *yes*) ;; - *) AC_DEFINE(DOALLOC,10000) ;; - esac - with_no_leaks=yes], - [with_no_leaks=]) - AC_ARG_WITH(trace, [ --with-trace test: turn on debug-tracing], [AC_DEFINE(OPT_TRACE) @@ -779,6 +761,7 @@ then CHECK_DECL_HDRS="$VILE_CHECK_HDRS" CF_MISSING_EXTERN( \ +_nc_freeall \ access \ alarm \ atoi \ Index: edef.h Prereq: 1.327 --- vile-9.5m+/edef.h 2006-12-03 15:32:29.000000000 +0000 +++ vile-9.5n/edef.h 2006-12-15 22:47:32.000000000 +0000 @@ -6,7 +6,7 @@ */ /* - * $Header: /usr/build/vile/vile/RCS/edef.h,v 1.327 2006/12/03 15:32:29 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/edef.h,v 1.328 2006/12/15 22:47:32 tom Exp $ */ #ifndef VILE_EDEF_H @@ -48,7 +48,7 @@ #endif /* PROGRAM_NAME */ decl_init( char prognam[], PROGRAM_NAME ); -decl_init( char version[], "version " VILE_VERSION ); +decl_init( char version[], "version " VILE_RELEASE "." VILE_VERSION ); #ifdef SYSTEM_NAME decl_init( char opersys[], SYSTEM_NAME ); Index: eval.c Prereq: 1.356 --- vile-9.5m+/eval.c 2006-11-24 20:13:47.000000000 +0000 +++ vile-9.5n/eval.c 2006-12-14 21:10:34.000000000 +0000 @@ -2,7 +2,7 @@ * eval.c -- function and variable evaluation * original by Daniel Lawrence * - * $Header: /usr/build/vile/vile/RCS/eval.c,v 1.356 2006/11/24 20:13:47 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/eval.c,v 1.357 2006/12/14 21:10:34 tom Exp $ * */ @@ -682,6 +682,7 @@ args.global = &mode; args.local = args.global; tb_scopy(result, string_mode_val(&args)); + free_val(args.names, &mode); break; } } Index: filters/iss-filt.l Prereq: 1.6 --- vile-9.5m+/filters/iss-filt.l 2006-05-21 19:50:19.000000000 +0000 +++ vile-9.5n/filters/iss-filt.l 2006-12-23 17:58:32.000000000 +0000 @@ -1,14 +1,15 @@ -%x SETUP FLAGS VALUE OTHER COMMENT CODE CMT_STANDARD CMT_TURBOC +%x SETUP FLAGS VALUE OTHER COMMENT CODE PREPRO CMT_STANDARD CMT_TURBOC %{ /* - * $Header: /usr/build/vile/vile/filters/RCS/iss-filt.l,v 1.6 2006/05/21 19:50:19 tom Exp $ + * $Header: /usr/build/vile/vile/filters/RCS/iss-filt.l,v 1.8 2006/12/23 17:58:32 tom Exp $ * * Filter to add vile "attribution" sequences to selected bits of Inno Setup * input text. */ #include <filters.h> +#include <fltstack.h> DefineFilter("iss"); @@ -16,15 +17,20 @@ static char *Comment_attr; static char *Ident2_attr; static char *Number_attr; +static char *Prepro_attr; static char *String_attr; +static char *save_table; + %} BLANK [ \t] IDENT [[:alpha:]_][[:alnum:]_]* -STRING \'([^'\r\n]|(''))*\' +SSTRING \'([^'\r\n]|(''))*\' +DSTRING \"([^"\r\n]|(""))*\" +STRING {SSTRING}|{DSTRING} HEXADECIMAL \$[[:xdigit:]_]+ UNSIGNED [[:digit:]]+ @@ -37,35 +43,50 @@ %% +<SETUP,FLAGS,CODE>^"#"{IDENT} { WriteToken3(Prepro_attr, 1); + save_table = get_symbol_table(); + push_state(PREPRO); + set_symbol_table("iss_cpp"); + WriteToken2(ci_keyword_attr(yytext+1), 1); + } +<PREPRO>{STRING} { WriteToken(String_attr); } +<PREPRO>{NUMBER} { WriteToken(Number_attr); } +<PREPRO>{BLANK} { ECHO; } +<PREPRO>[\r\n] { ECHO; + pop_state(); + set_symbol_table(save_table); + } +<PREPRO>. { ECHO; } + <SETUP,FLAGS,CODE>^"["[^]\n]*"]" { WriteToken(Action_attr); if (!strcmp(yytext, "[Code]")) { - BEGIN(CODE); + begin_state(CODE); set_symbol_table("pas"); } else { if (!strcmp(yytext, "[Setup]")) { - BEGIN(SETUP); + begin_state(SETUP); } else { - BEGIN(FLAGS); + begin_state(FLAGS); } set_symbol_table(filter_def.filter_name); } } <SETUP,FLAGS,CODE>{IDENT} { WriteToken(ci_keyword_attr(yytext)); } -<SETUP>"=" { ECHO; BEGIN(VALUE); } -<SETUP,VALUE>{STRING} { WriteToken(String_attr); } +<SETUP>"=" { ECHO; begin_state(VALUE); } +<SETUP,VALUE>{SSTRING} { WriteToken(String_attr); } <SETUP,VALUE>{NUMBER} { WriteToken(Number_attr); } -<VALUE>[\n] { ECHO; BEGIN(SETUP); } +<VALUE>[\n] { ECHO; begin_state(SETUP); } <SETUP,FLAGS>"//"[^\r\n]* { WriteToken(Comment_attr); } <SETUP,FLAGS>^";"[^\r\n]* { WriteToken(Comment_attr); } -<FLAGS>":"{BLANK}* { ECHO; BEGIN(OTHER); } +<FLAGS>":"{BLANK}* { ECHO; begin_state(OTHER); } <OTHER>[^;\r\n]+ { WriteToken(String_attr); } -<OTHER>";" { ECHO; BEGIN(FLAGS); } -<OTHER>[\n] { ECHO; BEGIN(FLAGS); } +<OTHER>";" { ECHO; begin_state(FLAGS); } +<OTHER>[\n] { ECHO; begin_state(FLAGS); } -<CODE>{STRING} { WriteToken(String_attr); } +<CODE>{SSTRING} { WriteToken(String_attr); } <CODE>{CHARACTER} | <CODE>{NUMBER} { WriteToken(Number_attr); } @@ -100,9 +121,11 @@ Comment_attr = class_attr(NAME_COMMENT); Ident2_attr = class_attr(NAME_IDENT2); Number_attr = class_attr(NAME_NUMBER); + Prepro_attr = class_attr(NAME_PREPROC); String_attr = class_attr(NAME_LITERAL); - BEGIN(FLAGS); + begin_state(FLAGS); while (yylex() > 0) { } + end_state(); } Index: filters/iss.key Prereq: 1.4 --- vile-9.5m+/filters/iss.key 2005-05-12 00:03:33.000000000 +0000 +++ vile-9.5n/filters/iss.key 2006-12-23 18:00:15.000000000 +0000 @@ -1,4 +1,4 @@ -: $Id: iss.key,v 1.4 2005/05/12 00:03:33 tom Exp $ +: $Id: iss.key,v 1.5 2006/12/23 18:00:15 tom Exp $ : Inno Setup : Keywords are matched ignoring case, which means that the data here is in @@ -258,3 +258,20 @@ string .include pas + +: TODO: add runtime functions + +: Preprocessor +.table iss_cpp +.default Preproc +emit +define +elif +else +endif +if +ifdef +ifndef +include +undef +.default Index: filters/m4-filt.c Prereq: 1.27 --- vile-9.5m+/filters/m4-filt.c 2006-05-21 19:47:35.000000000 +0000 +++ vile-9.5n/filters/m4-filt.c 2006-12-15 00:18:40.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Header: /usr/build/vile/vile/filters/RCS/m4-filt.c,v 1.27 2006/05/21 19:47:35 tom Exp $ + * $Header: /usr/build/vile/vile/filters/RCS/m4-filt.c,v 1.28 2006/12/15 00:18:40 tom Exp $ * * Filter to add vile "attribution" sequences to selected bits of m4 * input text. This is in C rather than LEX because M4's quoting delimiters @@ -60,6 +60,18 @@ return (src); } +#if NO_LEAKS +static void +free_quote(Quote * q) +{ + if (q->text != 0) { + free(q->text); + q->used = 0; + q->text = 0; + } +} +#endif + static void new_quote(Quote * q, const char *s) { @@ -275,6 +287,11 @@ flt_puts(show, s - show, Ident_attr); } s = parse_directive(name, s, args, parens); +#if NO_LEAKS + free(name); + name = 0; + have = 0; +#endif } return s; } @@ -377,6 +394,13 @@ flt_puts(buffer, used, Error_attr); used = 0; } +#if NO_LEAKS + if (used == 0 && have != 0 && buffer != 0) { + free(buffer); + buffer = 0; + have = 0; + } +#endif return result; } @@ -477,4 +501,10 @@ flt_error("missing right-quote"); (void) write_literal(0, &literal); } +#if NO_LEAKS + free_quote(&leftquote); + free_quote(&rightquote); + free_quote(&leftcmt); + free_quote(&rightcmt); +#endif } Index: filters/sh-filt.l Prereq: 1.67 --- vile-9.5m+/filters/sh-filt.l 2006-05-21 19:50:19.000000000 +0000 +++ vile-9.5n/filters/sh-filt.l 2007-01-07 22:57:42.000000000 +0000 @@ -5,7 +5,7 @@ %{ /* - * $Header: /usr/build/vile/vile/filters/RCS/sh-filt.l,v 1.67 2006/05/21 19:50:19 tom Exp $ + * $Header: /usr/build/vile/vile/filters/RCS/sh-filt.l,v 1.68 2007/01/07 22:57:42 tom Exp $ * * Filter to add vile "attribution" sequences to selected bits of Shell script. */ @@ -163,11 +163,12 @@ <QUOTED>[\n$] { flt_bfr_append(yytext, yyleng); } <QUOTED>\" { FinishQuote(NORMAL); pop_stk(); } +<SUBST>{SSTRING} { flt_bfr_embed(yytext, yyleng, String_attr); } <SUBST>{BACKTIC} { handle_backtic(yytext, yyleng); } <SUBST>{IDENT2R} { flt_bfr_embed(yytext, yyleng, Ident_attr); pop_stk(); } <SUBST>\\\" { flt_bfr_embed(yytext, yyleng, String_attr); } <SUBST>\" { push_stk(QUOTED); BeginQuote(QUOTED, String_attr); } -<SUBST>[^"}\\]+ { flt_bfr_embed(yytext, yyleng, ""); } +<SUBST>[^"}\\] { flt_bfr_embed(yytext, yyleng, ""); } %% Index: input.c Prereq: 1.304 --- vile-9.5m+/input.c 2006-12-11 01:29:54.000000000 +0000 +++ vile-9.5n/input.c 2007-01-08 01:18:05.000000000 +0000 @@ -44,7 +44,7 @@ * tgetc_avail() true if a key is avail from tgetc() or below. * keystroke_avail() true if a key is avail from keystroke() or below. * - * $Header: /usr/build/vile/vile/RCS/input.c,v 1.304 2006/12/11 01:29:54 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/input.c,v 1.306 2007/01/08 01:18:05 tom Exp $ * */ @@ -654,7 +654,8 @@ #if OPT_CURTOKENS if (b_val(curbp, VAL_CURSOR_TOKENS) == CT_REGEX) { - return FALSE; + if (!(b_is_directory(curbp) && whole_line)) + return FALSE; } #endif @@ -678,7 +679,7 @@ int rc = FALSE; size_t len; - if (b_val(curbp, VAL_CURSOR_TOKENS) != CT_CCLASS) { + if (b_val(curbp, VAL_CURSOR_TOKENS) != CT_CCLASS && rexp != 0) { TRACE((T_CALLED "read_by_regex(incl=%s)\n", rexp->pat)); *buf = EOS; @@ -700,6 +701,10 @@ /* * Obtain a buffer (or file) name from the screen. * It may contain wildcards that we can glob-expand. + * + * If it is not a directory-buffer, we provide a choice between regular + * expressions and character classes. Directory-buffers are guaranteed + * to have one filename per line. */ int screen_to_bname(char *buf, size_t bufn) @@ -709,8 +714,13 @@ int whole_line = adjust_chartype(&mask); TRACE((T_CALLED "screen_to_bname\n")); - rc = read_by_regex(buf, bufn, curbp->buf_fname_expr.vp->r, whole_line); +#if OPT_CURTOKENS + if (b_is_directory(curbp)) + rc = FALSE; + else + rc = read_by_regex(buf, bufn, get_buf_fname_expr(curbp), whole_line); if (rc == FALSE) +#endif rc = read_by_ctype(buf, bufn, mask, whole_line); returnCode(rc); } Index: macros/modes.rc Prereq: 1.51 --- vile-9.5m+/macros/modes.rc 2006-11-25 20:41:56.000000000 +0000 +++ vile-9.5n/macros/modes.rc 2006-12-23 16:26:21.000000000 +0000 @@ -1,4 +1,4 @@ -; $Id: modes.rc,v 1.51 2006/11/25 20:41:56 tom Exp $ +; $Id: modes.rc,v 1.52 2006/12/23 16:26:21 tom Exp $ ; majormodes in this file are ordered alphabetically for convenience - the ; precedence used by vile is strictly alphabetic, counting case. Use the ; before and after qualifiers to override the precedence. @@ -369,11 +369,16 @@ pre '^\s*\(XCOMM\>\|\/\*\*\/#\)' ~endwith +; Inno Setup scripts have semicolon comments except in the Pascal scripting +; area, where it changes to "//" C++ comments, or "{...}" Pascal comments. +; The syntax highlighter knows about that, but format-til is not that smart. define-mode iss ~with define-submode iss suffixes '\.\(iss\)$' ignorecase dos + comment-prefix '^\s*\(;\|//\)' + comments '^\s*\(;\|//\)\s+*$' ~endwith define-mode java Index: macros/vileinit.rc Prereq: 1.34 --- vile-9.5m+/macros/vileinit.rc 2006-11-23 13:59:05.000000000 +0000 +++ vile-9.5n/macros/vileinit.rc 2007-01-08 20:58:36.000000000 +0000 @@ -1,4 +1,4 @@ -; $Header: /usr/build/vile/vile/macros/RCS/vileinit.rc,v 1.34 2006/11/23 13:59:05 tom Exp $ +; $Header: /usr/build/vile/vile/macros/RCS/vileinit.rc,v 1.35 2007/01/08 20:58:36 tom Exp $ ; This is a sample which may be installed as .vilerc (or vile.rc for non-Unix ; systems), or source'd as-is to provide quick initialization of some useful ; macros and settings. @@ -54,6 +54,12 @@ setv $xshell="xterm -e xshell.sh" setv $xshell-flags="" ~elseif &seq $progname winvile + bind-key backward-row Shift+#A + bind-key forward-row Shift+#B + bind-key right-arrow Shift+#C + bind-key left-arrow Shift+#D + ; ...and of course back-tab: + bind-key previous-window Shift+^I ~elseif &or &sin $cfgopts "terminfo" \ &or &sin $cfgopts "termcap" \ &sin $cfgopts "curses" Index: main.c Prereq: 1.586 --- vile-9.5m+/main.c 2006-12-13 01:29:48.000000000 +0000 +++ vile-9.5n/main.c 2006-12-22 21:08:49.000000000 +0000 @@ -22,7 +22,7 @@ */ /* - * $Header: /usr/build/vile/vile/RCS/main.c,v 1.586 2006/12/13 01:29:48 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/main.c,v 1.588 2006/12/22 21:08:49 tom Exp $ */ #define realdef /* Make global definitions not external */ @@ -1017,6 +1017,44 @@ exec_pathname = strmalloc(lengthen_path(strcpy(temp, s))); } free(s); +#elif SYS_WINNT + static HKEY rootkeys[] = + {HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE}; + + int j; + HKEY hkey; + DWORD dwSzBuffer; + char buffer[256]; + + for (j = 0; j < TABLESIZE(rootkeys); ++j) { + if (RegOpenKeyEx(rootkeys[j], + VILE_SUBKEY, + 0, + KEY_READ, + &hkey) == ERROR_SUCCESS) { + dwSzBuffer = sizeof(buffer); + if (RegQueryValueEx(hkey, + "", + NULL, + NULL, + (LPBYTE) buffer, + &dwSzBuffer) == ERROR_SUCCESS + && dwSzBuffer != 0) { + + buffer[dwSzBuffer - 1] = 0; + /* + * If the (Default) key has a value, use it for $exec-path + * We need $exec-path to make "winvile -Or" work, since an + * install is not guaranteed to put winvile.exe in %PATH%. + */ + exec_pathname = strmalloc(buffer); + (void) RegCloseKey(hkey); + break; + } + + (void) RegCloseKey(hkey); + } + } #endif } @@ -1036,6 +1074,11 @@ #if SYS_UNIX setup_handler(SIGHUP, SIG_IGN); #endif +#if NO_LEAKS +#ifdef HAVE__NC_FREEALL + _nc_freeall(); +#endif +#endif ExitProgram(code); } @@ -2218,6 +2261,9 @@ && strcmp(exec_pathname, ".")) FreeAndNull(exec_pathname); #endif +#if OPT_CURTOKENS + free_regexval(buf_fname_expr.v.r); +#endif #if OPT_FILTER flt_leaks(); filters_leaks(); Index: modes.c Prereq: 1.326 --- vile-9.5m+/modes.c 2006-12-06 23:42:43.000000000 +0000 +++ vile-9.5n/modes.c 2007-01-08 00:35:17.000000000 +0000 @@ -7,7 +7,7 @@ * Major extensions for vile by Paul Fox, 1991 * Majormode extensions for vile by T.E.Dickey, 1997 * - * $Header: /usr/build/vile/vile/RCS/modes.c,v 1.326 2006/12/06 23:42:43 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/modes.c,v 1.328 2007/01/08 00:35:17 tom Exp $ * */ @@ -635,7 +635,7 @@ /* * Release storage of a VAL struct */ -static void +void free_val(const struct VALNAMES *names, struct VAL *values) { switch (names->type) { @@ -2085,6 +2085,17 @@ tb_free(&combined); } +REGEXVAL * +get_buf_fname_expr(BUFFER *bp) +{ + REGEXVAL *result = 0; + if (bp->buf_fname_expr.vp != 0) + result = bp->buf_fname_expr.vp->r; + else + result = buf_fname_expr.vp->r; + return result; +} + int chgd_curtokens(BUFFER *bp, VALARGS * args GCC_UNUSED, Index: package/winvile.iss Prereq: 1.5 --- vile-9.5m+/package/winvile.iss 2005-05-09 23:41:08.000000000 +0000 +++ vile-9.5n/package/winvile.iss 2006-12-23 02:00:28.000000000 +0000 @@ -1,32 +1,55 @@ -; $Header: /usr/build/vile/vile/package/RCS/winvile.iss,v 1.5 2005/05/09 23:41:08 tom Exp $ -; Script generated by the Inno Setup Script Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! +; $Header: /usr/build/vile/vile/package/RCS/winvile.iss,v 1.8 2006/12/23 02:00:28 tom Exp $ +; vile:ts=2 sw=2 +; +; This installs winvile as "winvile-ole.exe", since that is the name I use when building the OLE flavor +; among several for winvile/vile on the win32 platform. The build script sets $progname to "winvile-ole" +; to help winvile's "-Or" option to find the proper executable. So this install script uses the same +; name for the executable. +; +; The shortcuts and context-menu entry add the version - to distinguish the install from hand-installed +; copies of the same program. Note that they all share the same registry key, and the $exec-path variable +; is set from that. It is used in finding the proper executable for the OLE interface. ; ; TODO: +; ; make this able to change the type of settings (user-environment to/from application settings). ; ; components' disablenouninstallwarning could be used to implement selective uninstall, but looks clumsy ; ; the skipifdoesntexist flag on the [Run] does not appear to work. ; -; optional task: add a "Send To" task for winvile +; context-menu should require admin privilege to set? ; -; optional task: register winvile as an OLE server (RegisterServer function). Do this via a shortcut. -; optional task: unregister winvile as an OLE server +; install link to extra-docs ; -; install wvwrap and visvile (separate install, or component to add-on) +; install visvile (separate install, or component to add-on) ; install vile.exe (separate install) ; ; can I use GetPreviousData to obtain results from previous install? (that would help with CurUninstallStep). +; This packager supports only #define's with strings (no C comments) +#include "..\patchlev.h" + +#define myVer VILE_RELEASE + '.' + VILE_VERSION + VILE_PATCHLEVEL +#define myAppVer 'WinVile ' + myVer +#define mySendTo '{sendto}\' + myAppVer + '.lnk' + +#define NUM_PATCHLEVEL Pos(VILE_PATCHLEVEL, "@abcdefghijklmnopqrstuvwxyz") + [Setup] AppName=WinVile -AppVerName=WinVile 9.5 +#emit 'VersionInfoVersion=' + VILE_RELEASE + '.' + VILE_VERSION + '.' + Str(NUM_PATCHLEVEL) +VersionInfoDescription=Setup for "WinVile - VI Like Emacs" +#emit 'AppVersion=' + myVer +#emit 'AppVerName=' + myAppVer AppPublisher=Thomas E. Dickey +AppCopyright=© 1997-2005,2006, Thomas E. Dickey AppPublisherURL=http://invisible-island.net/vile/ AppSupportURL=http://invisible-island.net/vile/ AppUpdatesURL=http://invisible-island.net/vile/ DefaultDirName={pf}\VI Like Emacs +OutputDir=iss-output +#emit 'OutputBaseFilename=WinVile-setup-' + VILE_RELEASE + '_' + VILE_VERSION + VILE_PATCHLEVEL DefaultGroupName=WinVile AllowNoIcons=yes LicenseFile=..\COPYING @@ -39,45 +62,56 @@ Name: help; Description: Vile's help-file; types: full custom compact Name: docs; Description: Extra documentation; types: full custom Name: macros; Description: Useful macros; types: full custom compact +Name: explorer; Description: Windows Explorer integration; types: full custom Name: filters; Description: External filter executables (WinVile has most of these built-in); types: full custom [Tasks] -Name: for_all_users; Description: Install for all users on this machine; GroupDescription: Configuration Settings; Components: filters macros; Check: isGuru; Flags: unchecked +Name: for_all_users; Description: Install for all users on this machine; GroupDescription: Configuration Settings; Components: explorer filters macros; Check: isGuru; Flags: unchecked Name: register_vars; Description: Use registry for environment variables; GroupDescription: Configuration Settings; Components: filters macros; Flags: unchecked +Name: use_wvwrap; Description: Add Context Menu Entry; GroupDescription: Windows Explorer; Components: explorer; Flags: unchecked +Name: use_sendto; Description: Add Send To Entry; GroupDescription: Windows Explorer; Components: explorer; Flags: unchecked Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Components: main; Flags: unchecked Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Components: main; Flags: unchecked [Dirs] -Name: {app}\bin; Components: main +Name: {app}\bin; Components: main explorer Name: {app}\doc; Components: docs Name: {app}\macros; Components: macros Name: {app}\filters; Components: filters [Files] -Source: ..\bin\winvile-ole.exe; DestDir: {app}\bin; DestName: winvile.exe; Components: main; Flags: ignoreversion +Source: ..\bin\winvile-ole.exe; DestDir: {app}\bin; DestName: winvile-ole.exe; Components: main; AfterInstall: myPostExecutable; Flags: ignoreversion +Source: ..\bin\wvwrap.exe; DestDir: {app}\bin; DestName: wvwrap.exe; Components: explorer; AfterInstall: myPostExplorer; Flags: ignoreversion Source: ..\vile.hlp; DestDir: {app}\bin; Components: docs help; AfterInstall: myPostHelpfile; Flags: ignoreversion Source: ..\README; DestDir: {app}; DestName: README.txt; Components: docs main; Flags: isreadme Source: ..\doc\*.doc; Destdir: {app}\doc; Components: docs; Flags: ignoreversion Source: ..\macros\*.rc; DestDir: {app}\macros; Components: macros; AfterInstall: myPostMacros; Flags: ignoreversion recursesubdirs Source: ..\filters\*.rc; DestDir: {app}\macros; Components: macros; AfterInstall: myPostMacros; Flags: ignoreversion +Source: c:\vile\*.keywords; DestDir: {app}\macros; Components: macros; Flags: ignoreversion Source: c:\vile\*.exe; DestDir: {app}\filters; Components: filters; AfterInstall: myPostFilters; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] -Name: {group}\WinVile; Filename: {app}\bin\winvile.exe; Components: main; Flags: createonlyiffileexists +Name: {group}\WinVile; Filename: {app}\bin\winvile-ole.exe; Components: main; Flags: createonlyiffileexists Name: {group}\{cm:UninstallProgram,WinVile}; Filename: {uninstallexe} -Name: {userdesktop}\WinVile; Filename: {app}\bin\winvile.exe; Components: main; Tasks: desktopicon; Flags: createonlyiffileexists -Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\WinVile; Filename: {app}\bin\winvile.exe; Components: main; Tasks: quicklaunchicon; Flags: createonlyiffileexists +Name: {userdesktop}\WinVile; Filename: {app}\bin\winvile-ole.exe; Components: main; Tasks: desktopicon; Flags: createonlyiffileexists +Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\WinVile; Filename: {app}\bin\winvile-ole.exe; Components: main; Tasks: quicklaunchicon; Flags: createonlyiffileexists [Run] -Filename: {app}\bin\winvile.exe; Description: {cm:LaunchProgram,WinVile}; Flags: nowait postinstall skipifsilent skipifdoesntexist +Filename: {app}\bin\winvile-ole.exe; Description: {cm:LaunchProgram,WinVile}; Flags: nowait postinstall skipifsilent skipifdoesntexist [UninstallDelete] Type: files; Name: {app}\macros\vile.rc Type: dirifempty; Name: {app}\macros Type: dirifempty; Name: {app} +#emit 'Type: files; Name: ' + mySendTo [Code] +#emit 'const MY_CONTEXT_MENU = ''Edit with ' + myAppVer + ''';' +const MY_EDITOR_APP = '{app}\bin\winvile-ole.exe'; +const MY_REGISTER_OLE = 'Register OLE Server'; +const MY_UNREGISTER_OLE = 'Unregister OLE Server'; + function isGuru(): Boolean; begin Result := isAdminLoggedOn(); @@ -88,9 +122,9 @@ Result := HKEY_CURRENT_USER; end; -function appSubKey(): string; +function appKey(): string; begin - Result := 'Software\VI Like Emacs\Environment'; + Result := 'Software\VI Like Emacs'; end; function envSubKey(): string; @@ -98,6 +132,11 @@ Result := 'Environment'; end; +function appSubKey(): string; +begin + Result := appKey() + '\' + envSubKey(); +end; + function envSysKey(): string; begin Result := 'System\CurrentControlSet\Control\Session Manager\Environment'; @@ -261,8 +300,8 @@ procedure removeAnyDirVar(const ValueName, NewValue: String); begin removeDirFromEnv(HKEY_CURRENT_USER, envSubKey(), ValueName, NewValue); - removeDirFromEnv(HKEY_CURRENT_USER, appSubKey(), ValueName, NewValue); - removeDirFromEnv(HKEY_LOCAL_MACHINE, appSubKey(), ValueName, NewValue); + removeDirFromEnv(HKEY_CURRENT_USER, appSubKey(), ValueName, NewValue); + removeDirFromEnv(HKEY_LOCAL_MACHINE, appSubKey(), ValueName, NewValue); removeDirFromEnv(HKEY_LOCAL_MACHINE, envSysKey(), ValueName, NewValue); end; @@ -270,11 +309,34 @@ procedure removeAnyVariable(const ValueName: String); begin removeVarFromEnv(HKEY_CURRENT_USER, envSubKey(), ValueName); - removeVarFromEnv(HKEY_CURRENT_USER, appSubKey(), ValueName); - removeVarFromEnv(HKEY_LOCAL_MACHINE, appSubKey(), ValueName); + removeVarFromEnv(HKEY_CURRENT_USER, appSubKey(), ValueName); + removeVarFromEnv(HKEY_LOCAL_MACHINE, appSubKey(), ValueName); removeVarFromEnv(HKEY_LOCAL_MACHINE, envSysKey(), ValueName); end; +procedure AddShellCommand(const Description, Command: String); +begin + RegWriteStringValue(HKEY_CLASSES_ROOT, '*\shell\' + Description + '\command', '', ExpandConstant(command)); +end; + +procedure removeShellCommand(const Description: String); +begin + RegDeleteKeyIncludingSubkeys(HKEY_CLASSES_ROOT, '*\shell\' + Description); +end; + +// This is called after installing the executable. +procedure myPostExecutable(); +var + Keypath : String; + Value : String; +begin + Keypath := appKey(); + Value := ExpandConstant('{app}\bin'); + Log('Setting registry key "' + Keypath + '" to "' + Value + '"'); + if not RegWriteStringValue(selectedVarsRootKey(), Keypath, '', value) then + Log('Failed to set key'); +end; + // This is called once per installed-file. procedure myPostFilters(); begin @@ -305,21 +367,185 @@ end; end; +// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/programmersguide/shell_basics/shell_basics_extending/context.asp +procedure AddContextMenu(); +begin + AddShellCommand(MY_CONTEXT_MENU, '{app}\bin\wvwrap.exe "%L"'); +end; + +// http://www.delphidabbler.com/articles?article=12 +procedure AddSendTo(); +begin + CreateShellLink( +#emit 'ExpandConstant(''' + mySendTo + '''),' +#emit '''SendTo link for ' + myAppVer + ''',' + ExpandConstant(MY_EDITOR_APP), // program + '', // no params + '', // no target directory + '', // no icon filename + -1, // no icon index + SW_SHOWNORMAL); +end; + +function myToolsDir(): String; +begin + Result := ExpandConstant('{group}\Tools'); +end; + +function myToolsLink(const Description: String): String; +begin + Result := myToolsDir() + '\' + Description + '.lnk'; +end; + +// use shortcuts for invoking registering so we will "see" the right path. +procedure AddToolLink(const Description, Params: String); +begin + CreateShellLink( + ExpandConstant(myToolsLink(Description)), + Description, + ExpandConstant(MY_EDITOR_APP), // program + Params, // + ExpandConstant('{app}\bin'), // target directory contains executable + '', // no icon filename + -1, // no icon index + SW_HIDE); +end; + +procedure RemoveToolLink(const Description: String); +var + ToRemove : String; +begin + ToRemove := myToolsLink(Description); + if FileExists(ToRemove) then + begin + Log('Deleting link: ' + ToRemove); + if not DeleteFile(ToRemove) then + Log('Failed to remove ' + ToRemove); + end; +end; + +function CleanupMyKey(const theRootKey: Integer): Boolean; +var + Path : String; + Value : String; +begin + Result := False; + if RegQueryStringValue(theRootKey, appKey(), '', Value) then + begin + if Value <> '' then + begin + Result := True; + Log('Deleting value of "' + appKey() + '" = "' + Value + '"'); + if not RegDeleteValue(theRootKey, appKey(), '') then + Log('Failed to delete value'); + + Path := appKey() + '\Environment'; + Log('Checking for subkey "' + Path + '"'); + if RegValueExists(theRootKey, Path, '') then + begin + if RegDeleteKeyIncludingSubkeys(theRootKey, Path) then + Log('Deleted key "' + Path + '"') + else + Log('Failed to delete key "' + Path + '"'); + end; + + if RegDeleteKeyIfEmpty(theRootKey, appKey()) then + Log('Deleted key "' + appKey() + '"') + else + Log('Failed to delete key "' + appKey() + '"'); + end + end +end; + +procedure RegisterMyOLE(); +var + Filename : String; + ResultCode: Integer; +begin + Filename := ExpandConstant(MY_EDITOR_APP); + Log('Registering OLE server ' + Filename); + if not Exec(Filename, '-Or', '', SW_HIDE, + ewWaitUntilTerminated, ResultCode) then + begin + // handle failure if necessary; ResultCode contains the error code + Log('** FAILED!'); + end; +end; + +procedure UnregisterMyOLE(); +var + Filename : String; + ResultCode: Integer; +begin + Filename := ExpandConstant(MY_EDITOR_APP); + Log('Unregistering OLE server ' + Filename); + if not Exec(Filename, '-Ou', '', SW_HIDE, + ewWaitUntilTerminated, ResultCode) then + begin + // handle failure if necessary; ResultCode contains the error code + Log('** FAILED!'); + end; +end; + +procedure myPostExplorer(); +begin + if isTaskSelected('use_wvwrap') then + begin + if ForceDirectories(myToolsDir()) then + begin + AddToolLink(MY_REGISTER_OLE, '-Or'); + AddToolLink(MY_UNREGISTER_OLE, '-Ou'); + end + else + MsgBox('Cannot create:' #13#13 ' ' + myToolsDir(), mbInformation, MB_OK); + RegisterMyOLE(); + AddContextMenu(); + end; + if isTaskSelected('use_sendto') then + begin + AddSendTo(); + end; +end; + // On uninstall, we do not know which registry setting was selected during install, so we remove all. procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep); begin case CurUninstallStep of - usUninstall: + usUninstall: + begin + // MsgBox('CurUninstallStepChanged:' #13#13 'Uninstall is about to start.', mbInformation, MB_OK) + // ...insert code to perform pre-uninstall tasks here... + UnregisterMyOLE(); + end; + usPostUninstall: + begin + removeAnyVariable('VILE_HELP_FILE'); + removeAnyDirVar('VILE_LIBDIR_PATH', '{app}\filters'); + removeAnyDirVar('VILE_STARTUP_PATH', '{app}\macros'); + removeShellCommand(MY_CONTEXT_MENU); + + if DirExists(myToolsDir()) then + begin + Log('Removing ' + myToolsDir()); + removeToolLink(MY_REGISTER_OLE); + removeToolLink(MY_UNREGISTER_OLE); + RemoveDir(myToolsDir()); + RemoveDir(ExpandConstant('{group}')); // since this happens after the start-menu is removed + end; + + { + If we don't find the $exec-path in the current user, try the local machine. + The setup program cannot pass the all-users flag to the uninstaller, so we + have to try both. + } + Log('Checking current-user registry key'); + if not CleanupMyKey(HKEY_CURRENT_USER) then begin - // MsgBox('CurUninstallStepChanged:' #13#13 'Uninstall is about to start.', mbInformation, MB_OK) - // ...insert code to perform pre-uninstall tasks here... + Log('Checking local-machine registry key'); + CleanupMyKey(HKEY_LOCAL_MACHINE); end; - usPostUninstall: - begin - removeAnyVariable('VILE_HELP_FILE'); - removeAnyDirVar('VILE_LIBDIR_PATH', '{app}\filters'); - removeAnyDirVar('VILE_STARTUP_PATH', '{app}\macros'); + // MsgBox('CurUninstallStepChanged:' #13#13 'Uninstall just finished.', mbInformation, MB_OK); - end; + end; end; end; Index: patchlev.h --- vile-9.5m+/patchlev.h 2006-11-23 14:25:11.000000000 +0000 +++ vile-9.5n/patchlev.h 2006-12-15 21:56:07.000000000 +0000 @@ -1,3 +1,3 @@ -#define VILE_VERSION "9.5" -/* set to "" for no patches */ -#define VILE_PATCHLEVEL "m" +#define VILE_RELEASE "9" +#define VILE_VERSION "5" +#define VILE_PATCHLEVEL "n" Index: path.c Prereq: 1.152 --- vile-9.5m+/path.c 2006-12-13 22:31:30.000000000 +0000 +++ vile-9.5n/path.c 2007-01-08 23:24:37.000000000 +0000 @@ -2,7 +2,7 @@ * The routines in this file handle the conversion of pathname * strings. * - * $Header: /usr/build/vile/vile/RCS/path.c,v 1.152 2006/12/13 22:31:30 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/path.c,v 1.153 2007/01/08 23:24:37 tom Exp $ * * */ @@ -966,7 +966,9 @@ } } - /* Canonicalize each pathname prefix. */ + /* Canonicalize each pathname prefix. Among other things, this discards + * characters that cannot appear in a valid pathname, such as '<' and '>'. + */ end = skip_string(old_file); while (current < end) { next = strchr(current, SLASHC); Index: proto.h Prereq: 1.584 --- vile-9.5m+/proto.h 2006-12-02 14:34:07.000000000 +0000 +++ vile-9.5n/proto.h 2007-01-08 00:35:51.000000000 +0000 @@ -4,7 +4,7 @@ * * Created: Thu May 14 15:44:40 1992 * - * $Header: /usr/build/vile/vile/RCS/proto.h,v 1.584 2006/12/02 14:34:07 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/proto.h,v 1.587 2007/01/08 00:35:51 tom Exp $ * */ @@ -751,6 +751,7 @@ #endif /* modes.c */ +REGEXVAL * get_buf_fname_expr (BUFFER *bp); extern REGEXVAL * free_regexval (REGEXVAL *rp); extern REGEXVAL * new_regexval (const char *pattern, int magic); extern const FSM_CHOICES * name_to_choices (const char *name); @@ -769,6 +770,7 @@ extern int string_to_number (const char *from, int *np); extern void copy_mvals (int maximum, struct VAL *dst, struct VAL *src); extern void free_local_vals (const struct VALNAMES *names, struct VAL *gbl, struct VAL *val); +extern void free_val (const struct VALNAMES *names, struct VAL *values); extern void set_buf_fname_expr (BUFFER *bp); extern void set_record_sep (BUFFER *bp, RECORD_SEP value); extern void set_winflags (int glob_vals, USHORT flags); @@ -1640,6 +1642,9 @@ #ifdef MISSING_EXTERN_WRITE extern int write (int fd, const char *buffer, int size); #endif +#ifdef MISSING_EXTERN__NC_FREEALL +extern void _nc_freeall (void); +#endif #endif #ifdef __cplusplus Index: random.c Prereq: 1.297 --- vile-9.5m+/random.c 2006-11-08 01:40:23.000000000 +0000 +++ vile-9.5n/random.c 2007-01-08 22:09:07.000000000 +0000 @@ -2,7 +2,7 @@ * This file contains the command processing functions for a number of random * commands. There is no functional grouping here, for sure. * - * $Header: /usr/build/vile/vile/RCS/random.c,v 1.297 2006/11/08 01:40:23 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/random.c,v 1.298 2007/01/08 22:09:07 tom Exp $ * */ @@ -1507,11 +1507,14 @@ int run_a_hook(HOOK * hook) { + int status = FALSE; + if (!hook->latch && hook->proc[0]) { - int status; MARK save_pre_op_dot; /* ugly hack */ int save_dotcmdactive; /* another ugly hack */ + TRACE((T_CALLED "run_a_hook(%s)\n", name_of_hook(hook))); + save_dotcmdactive = dotcmdactive; save_pre_op_dot = pre_op_dot; @@ -1523,7 +1526,7 @@ pre_op_dot = save_pre_op_dot; dotcmdactive = save_dotcmdactive; - return status; + returnCode(status); } return FALSE; } Index: revlist --- vile-9.5m+/revlist 2006-12-14 01:05:19.000000000 +0000 +++ vile-9.5n/revlist 2007-01-09 01:04:33.000000000 +0000 @@ -1,6 +1,6 @@ -revlist for vile, version v9_5m +revlist for vile, version v9_5n -------------------------------------------------------------------------------- -CHANGES 1.967 +CHANGES 1.974 CHANGES.R3 1.1 CHANGES.R4 1.1 CHANGES.R5 1.1 @@ -13,7 +13,7 @@ README 1.96 README.PC 1.33 README.VMS 1.5 -aclocal.m4 1.167 +aclocal.m4 1.169 ansi.c 1.48 api.c 1.38 api.h 1.13 @@ -22,7 +22,7 @@ borland.c 1.36 btree.c 1.23 btree.h 1.5 -buffer.c 1.312 +buffer.c 1.313 buglist 1.405 builtflt.c 1.47 chgdfunc.h 1.20 @@ -30,8 +30,8 @@ config.guess 1.5 config.sub 1.6 config_h.in 1.2 -configure 1.9 -configure.in 1.225 +configure 1.10 +configure.in 1.227 csrch.c 1.34 curses.c 1.27 descrip.mms 1.48 @@ -39,9 +39,9 @@ display.c 1.423 djhandl.c 1.6 dumbterm.c 1.21 -edef.h 1.327 +edef.h 1.328 estruct.h 1.604 -eval.c 1.356 +eval.c 1.357 exec.c 1.308 externs.c 1.10 fences.c 1.84 @@ -53,14 +53,14 @@ globals.c 1.49 gppconio.c 1.2 history.c 1.85 -input.c 1.304 +input.c 1.306 insert.c 1.148 install.sh 1.7 isearch.c 1.60 itbuff.c 1.25 lckfiles.c 1.11 line.c 1.177 -main.c 1.586 +main.c 1.588 makefile.blc 1.20 makefile.djg 1.35 makefile.icc 1.16 @@ -71,7 +71,7 @@ mkdirs.sh 1.6 mkprlenv.wnt 1.9 mktbls.c 1.136 -modes.c 1.326 +modes.c 1.328 modetbl 1.250 msgs.c 1.28 npopen.c 1.94 @@ -83,23 +83,23 @@ os2keys.h 1.2 os2pipe.c 1.5 os2vio.c 1.35 -patchlev.h 1.349 -path.c 1.152 +patchlev.h 1.351 +path.c 1.153 perl.xs 1.104 plugin.c 1.1 plugin.h 1.1 -proto.h 1.584 +proto.h 1.587 pscreen.h 1.2 ptypemap 1.7 -random.c 1.297 +random.c 1.298 regexp.c 1.136 region.c 1.133 -revlist v9_5m +revlist v9_5n search.c 1.143 select.c 1.162 sinstall.sh 1.1 spawn.c 1.191 -statevar.c 1.110 +statevar.c 1.112 tags.c 1.135 tbuff.c 1.66 tcap.c 1.170 @@ -111,8 +111,8 @@ ucrypt.c 1.15 undo.c 1.91 version.c 1.61 -vile-9.5.spec 1.14 -vile.1 1.36 +vile-9.5.spec 1.15 +vile.1 1.37 vile.hlp 1.626 vile.wmconfig 1.1 vl_alloc.h 1.1 @@ -130,11 +130,11 @@ w32ole.rc 1.2 w32oo.cpp 1.7 w32pipe.c 1.33 -w32reg.c 1.10 +w32reg.c 1.11 w32reg.h 1.1 w32vile.h 1.4 watch.c 1.5 -window.c 1.107 +window.c 1.108 winvile.h 1.11 winvile.odl 1.6 winvile.rc 1.11 @@ -219,8 +219,8 @@ filters/infofilt.l 1.8 filters/ini-filt.l 1.6 filters/ini.key 1.1 -filters/iss-filt.l 1.6 -filters/iss.key 1.4 +filters/iss-filt.l 1.8 +filters/iss.key 1.5 filters/java.key 1.3 filters/js.key 1.4 filters/key-filt.c 1.20 @@ -232,7 +232,7 @@ filters/lispfilt.l 1.13 filters/lua-filt.l 1.6 filters/lua.key 1.2 -filters/m4-filt.c 1.27 +filters/m4-filt.c 1.28 filters/m4.key 1.3 filters/mail.key 1.3 filters/mailfilt.l 1.20 @@ -290,7 +290,7 @@ filters/sccs.key 1.1 filters/sccsfilt.l 1.14 filters/sed-filt.c 1.22 -filters/sh-filt.l 1.67 +filters/sh-filt.l 1.68 filters/sh.key 1.4 filters/sml-filt.l 1.6 filters/sml.key 1.1 @@ -347,18 +347,18 @@ macros/gnugpg.rc 1.3 macros/loaderrs.rc 1.1 macros/manpage.rc 1.22 -macros/modes.rc 1.51 +macros/modes.rc 1.52 macros/palettes.rc 1.7 macros/pictmode.rc 1.4 macros/search.rc 1.3 macros/shifts.rc 1.4 macros/showeach.rc 1.5 macros/vile-pager 1.5 -macros/vileinit.rc 1.34 +macros/vileinit.rc 1.35 macros/vilemenu.rc 1.3 macros/vileperl.rc 1.7 macros/which.rc 1.15 -package/winvile.iss 1.5 +package/winvile.iss 1.8 package/winvile.nsi 1.3 perl/Breadcrumbs.pm 1.4 perl/CaptHook.pm 1.1 Index: statevar.c Prereq: 1.110 --- vile-9.5m+/statevar.c 2006-12-03 14:21:53.000000000 +0000 +++ vile-9.5n/statevar.c 2007-01-08 00:34:20.000000000 +0000 @@ -3,7 +3,7 @@ * for getting and setting the values of the vile state variables, * plus helper utility functions. * - * $Header: /usr/build/vile/vile/RCS/statevar.c,v 1.110 2006/12/03 14:21:53 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/statevar.c,v 1.112 2007/01/08 00:34:20 tom Exp $ */ #include "estruct.h" @@ -53,11 +53,13 @@ char *newvalue; beginDisplay(); - if ((newvalue = strmalloc(value)) != 0) { + if (*namep == 0 || strcmp(*namep, value)) { + if ((newvalue = strmalloc(value)) != 0) { #if OPT_EVAL && OPT_SHELL - FreeIfNeeded(*namep); + FreeIfNeeded(*namep); #endif - *namep = newvalue; + *namep = newvalue; + } } endofDisplay(); } @@ -547,7 +549,7 @@ int var_BUF_FNAME_EXPR(TBUFF **rp, const char *vp) { - return any_ro_STR(rp, vp, curbp->buf_fname_expr.vp->r->pat); + return any_ro_STR(rp, vp, get_buf_fname_expr(curbp)->pat); } int Index: vile-9.5.spec Prereq: 1.14 --- vile-9.5m+/vile-9.5.spec 2006-11-23 14:25:04.000000000 +0000 +++ vile-9.5n/vile-9.5.spec 2006-12-14 23:11:57.000000000 +0000 @@ -1,7 +1,7 @@ Summary: VILE VI Like Emacs editor -# $Header: /usr/build/vile/vile/RCS/vile-9.5.spec,v 1.14 2006/11/23 14:25:04 tom Exp $ +# $Header: /usr/build/vile/vile/RCS/vile-9.5.spec,v 1.15 2006/12/14 23:11:57 tom Exp $ Name: vile -Version: 9.5m +Version: 9.5n # each patch should update the version Release: 1 Copyright: GPL @@ -21,6 +21,7 @@ Patch11: vile-9.5k.patch.gz Patch12: vile-9.5l.patch.gz Patch13: vile-9.5m.patch.gz +Patch14: vile-9.5n.patch.gz # each patch should add itself to this list Packager: Thomas Dickey <dickey@invisible-island.net> BuildRoot: %{_tmppath}/%{name}-root @@ -46,6 +47,7 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 # each patch should add itself to this list %build @@ -98,6 +100,9 @@ %changelog # each patch should add its ChangeLog entries here +* Thu Dev 15 2006 Thomas Dickey +- added patch for 9.5n + * Thu Nov 23 2006 Thomas Dickey - added patch for 9.5m Index: vile.1 Prereq: 1.36 --- vile-9.5m+/vile.1 2006-11-06 01:18:30.000000000 +0000 +++ vile-9.5n/vile.1 2007-01-08 23:29:41.000000000 +0000 @@ -1,5 +1,5 @@ .\" obligatory man page for vile -.\" $Header: /usr/build/vile/vile/RCS/vile.1,v 1.36 2006/11/06 01:18:30 tom Exp $ +.\" $Header: /usr/build/vile/vile/RCS/vile.1,v 1.37 2007/01/08 23:29:41 tom Exp $ .TH VILE 1 .SH NAME vile, xvile \- \fBVI L\fRike \fBE\fRmacs @@ -38,9 +38,7 @@ The former is executed before reading the first file into a buffer. The latter is executed after reading the first file into a buffer. Each is removed after executing (unless an error is detected). -. .SS COMMON OPTIONS -. .IP "-c\fIcommand\fR" .I vile will begin the session on the first file invoking the given command. @@ -83,7 +81,6 @@ to put the cursor on column 10 of line 123. The "*" (or ":") separates the repeat count (used by \fIgoto-col\fP) from the line- or range-specification used by line-oriented commands. -. .IP @\fIcmdfile\fR .I vile will run the specified file as its startup @@ -179,7 +176,6 @@ .I vile will begin the session on the first file jumping to the given line number \fINNN\fP. -. .SH "INVOCATION" vile will edit the files specified on the command line. If no files are specified, and standard input is not connected to a terminal, then Index: w32reg.c Prereq: 1.10 --- vile-9.5m+/w32reg.c 2006-04-19 22:51:01.000000000 +0000 +++ vile-9.5n/w32reg.c 2006-12-22 20:55:40.000000000 +0000 @@ -2,7 +2,7 @@ * w32reg.c: Winvile OLE registration code (currently only used for OLE * automation). * - * $Header: /usr/build/vile/vile/RCS/w32reg.c,v 1.10 2006/04/19 22:51:01 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/w32reg.c,v 1.11 2006/12/22 20:55:40 tom Exp $ */ #include "estruct.h" @@ -597,13 +597,12 @@ make_editor_path(char *path /* must be at least NFILEN chars long */) { char temp[NFILEN], name[128], *s; + UINT which = FL_PATH|FL_EXECABLE; - /* - * Can't use "exec_pathname" in this routine because that global var - * is always initialized to "." on a win32 host (bummer). - */ + if (strcmp(exec_pathname, ".")) + which |= FL_EXECDIR; sprintf(name, "%s.exe", prognam); - if ((s = cfg_locate(name, FL_PATH|FL_EXECABLE)) != 0) + if ((s = cfg_locate(name, which)) != 0) { if (! (s[0] == '.' && s[1] == '\\')) { Index: window.c Prereq: 1.107 --- vile-9.5m+/window.c 2006-11-02 01:49:42.000000000 +0000 +++ vile-9.5n/window.c 2007-01-08 00:40:21.000000000 +0000 @@ -2,7 +2,7 @@ * Window management. Some of the functions are internal, and some are * attached to keys that the user actually types. * - * $Header: /usr/build/vile/vile/RCS/window.c,v 1.107 2006/11/02 01:49:42 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/window.c,v 1.108 2007/01/08 00:40:21 tom Exp $ * */ @@ -1179,7 +1179,7 @@ WINDOW *oldwp = 0; WINDOW *wp; - if (valid_buffer(bp)) { + if (valid_buffer(bp) && wheadp != 0) { if ((wp = alloc_WINDOW()) != NULL) { oldwp = curwp; curwp = wp;