diff options
37 files changed, 1839 insertions, 1503 deletions
diff --git a/CHANGES b/CHANGES index 14a2dce1..403693fc 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,29 @@ Changes since Lynx 2.8 release =============================================================================== +2004-01-28 (2.8.5pre.4) +* workaround to build with ncurses 4.2 -TD +* fixes from Thorsten Glaser: + + use ${GNUSYSTEM_AUX_DIR}/mkinstalldirs if it exists. + + use $ac_config_sub variable in CF_CHECK_CACHE macro. + + add case in CF_XOPEN_SOURCE macro to prevent defining _XOPEN_SOURCE + + use $(MKINSTALLDIRS) variable in generated makefile. + + correct comment in lynx.cfg for the default value of FTP_PASSIVE + + increase pattern length for mkdtemp() call. +* add command-line & menu option/config variables to replace the compile-time + UNDERLINE_LINKS definition (suggested by BL) -TD +* correct ownership of installed lynx_doc directory (report by FLWM, PG) -TD +* modify configure check for tar to test several common variants including + star, modify makefile.in to use the configured 'tar' program (request by + FLWM) -TD +* compiler ifdef-fixes -BL +* documentation updates for DJGPP and OpenSSL -DK +* fixes/updates for DJGPP makefiles -DK +* modify po/makefile.inn to substitute the PACKAGE and VERSION strings into + lynx.pot automatically, and to remove the unused boilerplate header comment + (suggested by LP) -TD +* fixes for substituted project-version in configure script -TD + 2004-01-24 (2.8.5pre.3) * update documentation's version numbers for release -TD * modify configure check for libbz2 to allow for older headers which do not @@ -11,8 +34,8 @@ Changes since Lynx 2.8 release the user to set it via lynx.cfg or the options menu (discussion with Andreas Metzler) -TD * remove intl subdirectory (gettext-0.10.35), since some of the ".po" files - have been modified to rely upon gettext 0.11.x. Modified configure script - macro to report this properly -TD + have been modified to rely upon newer features of gettext. Modified + configure script macro to report this properly -TD * add SSL_CERT_DIR, SSL_CERT_FILE to lynx.man (suggested by Stef Caunter) -TD * documentation updates for DJGPP -DK, LP, FLWM * update address for Free Software Foundation in COPYHEADER and COPYING diff --git a/INSTALLATION b/INSTALLATION index a5e8f924..62a61522 100644 --- a/INSTALLATION +++ b/INSTALLATION @@ -864,64 +864,64 @@ V. Compile instructions -- 386 DOS + CFLAGS = -c -O2 -Wall LDFLAGS = endif - + -CPPFLAGS = -I$(PDCURSES_HOME) -I$(CCINCDIR) -D_NAIVE_DOS_REGS +CPPFLAGS = -I$(PDCURSES_HOME) -I$(CCINCDIR) -D_NAIVE_DOS_REGS -DHAVE_STRING_H - + CCFLAGS = $(CFLAGS) $(CPPFLAGS) - + @@ -64,10 +64,10 @@ all: $(PDCLIBS) $(DEMOS) - + clean: -del *.o - -del curses.lib - -del panel.lib + -del pdcurses.a + -del panel.a - + demos: $(DEMOS) - + @@ -287,33 +287,27 @@ #------------------------------------------------------------------------ - + firework.exe: firework.o $(LIBCURSES) - $(LINK) $(LDFLAGS) -o firework firework.o $(LIBCURSES) - $(COFF2EXE) firework + $(LINK) $(LDFLAGS) -o firework.exe firework.o $(LIBCURSES) strip $@ - + newdemo.exe: newdemo.o $(LIBCURSES) - $(LINK) $(LDFLAGS) -o newdemo newdemo.o $(LIBCURSES) - $(COFF2EXE) newdemo + $(LINK) $(LDFLAGS) -o newdemo.exe newdemo.o $(LIBCURSES) strip $@ - + ptest.exe: ptest.o $(LIBCURSES) $(LIBPANEL) - $(LINK) $(LDFLAGS) -o ptest ptest.o $(LIBCURSES) $(LIBPANEL) - $(COFF2EXE) ptest + $(LINK) $(LDFLAGS) -o ptest.exe ptest.o $(LIBCURSES) $(LIBPANEL) strip $@ - + testcurs.exe: testcurs.o $(LIBCURSES) - $(LINK) $(LDFLAGS) -o testcurs testcurs.o $(LIBCURSES) - $(COFF2EXE) testcurs + $(LINK) $(LDFLAGS) -o testcurs.exe testcurs.o $(LIBCURSES) strip $@ - + tuidemo.exe: tuidemo.o tui.o $(LIBCURSES) - $(LINK) $(LDFLAGS) -o tuidemo tuidemo.o tui.o $(LIBCURSES) - $(COFF2EXE) tuidemo + $(LINK) $(LDFLAGS) -o tuidemo.exe tuidemo.o tui.o $(LIBCURSES) strip $@ - + xmas.exe: xmas.o $(LIBCURSES) - $(LINK) $(LDFLAGS) -o xmas xmas.o $(LIBCURSES) - $(COFF2EXE) xmas + $(LINK) $(LDFLAGS) -o xmas.exe xmas.o $(LIBCURSES) strip $@ - - + + --- dos/pdckbd.c.ori 2002-09-01 00:13:30.000000000 -0800 +++ dos/pdckbd.c 2004-01-19 20:30:02.000000000 -0800 @@ -362,7 +362,7 @@ @@ -947,7 +947,7 @@ V. Compile instructions -- 386 DOS @@ -27,6 +27,10 @@ #include <memory.h> #endif - + +#ifdef HAVE_STRING_H +#include <string.h> +#endif @@ -960,18 +960,18 @@ V. Compile instructions -- 386 DOS @@ -49,7 +49,7 @@ # include <limits.h> #endif - + -#ifdef STDC_HEADERS +#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) # include <string.h> #endif - + --- pdcurses/pdcwin.c.ori 2002-05-25 17:13:32.000000000 -0800 +++ pdcurses/pdcwin.c 2003-12-13 21:26:02.000000000 -0800 @@ -27,6 +27,10 @@ # include <memory.h> #endif - + +#ifdef HAVE_STRING_H +#include <string.h> +#endif @@ -980,11 +980,11 @@ V. Compile instructions -- 386 DOS # define memmove PDC_memmove #endif - If you wish to compile with SSL enabled, you need to get and - compile OpenSSL. The DJGPP port has been successfully compiled with - the 0.9.7 stable series of OpenSSL. DJGPP can compile OpenSSL from - the standard source distribution (http://www.openssl.org/). See the file "INSTALL.DJGPP" in - the OpenSSL distribution. + If you wish to compile with SSL enabled, you need to get and compile + OpenSSL. The DJGPP port has been successfully compiled with the + 0.9.7 stable series of OpenSSL. DJGPP can compile OpenSSL from the + standard source distribution (http://www.openssl.org/). See the file + "INSTALL.DJGPP" in the OpenSSL distribution. If you have trouble applying the patches, try using the "patch" program, diff --git a/WWW/Library/Implementation/HTString.c b/WWW/Library/Implementation/HTString.c index 1e67d478..2177a108 100644 --- a/WWW/Library/Implementation/HTString.c +++ b/WWW/Library/Implementation/HTString.c @@ -1001,34 +1001,30 @@ PUBLIC void HTAddXpand ARGS4( #endif /* USE_QUOTED_PARAMETER */ /* - * Append string-parameter to a system command that we are constructing. The - * string is a complete parameter (which is a necessary assumption so we can - * quote it properly). We're given the index of the newest parameter we're - * processing. Zero indicates none, so a value of '1' indicates that we copy - * from the beginning of the command string up to the first parameter, - * substitute the quoted parameter and return the result. + * Append string to a system command that we are constructing, without quoting. + * We're given the index of the newest parameter we're processing. Zero + * indicates none, so a value of '1' indicates that we copy from the beginning + * of the command string up to the first parameter, substitute the quoted + * parameter and return the result. * * Parameters are substituted at "%s" tokens, like printf. Other printf-style * tokens are not substituted; they are passed through without change. */ -PUBLIC void HTAddParam ARGS4( +PUBLIC void HTAddToCmd ARGS4( char **, result, CONST char *, command, int, number, - CONST char *, parameter) + CONST char *, string) { if (number > 0) { CONST char *last = HTAfterCommandArg(command, number - 1); CONST char *next = last; -#if USE_QUOTED_PARAMETER - char *quoted; -#endif if (number <= 1) { FREE(*result); } - if (parameter == 0) - parameter = ""; + if (string == 0) + string = ""; while (next[0] != 0) { if (HTIsParam(next)) { if (next != last) { @@ -1037,13 +1033,7 @@ PUBLIC void HTAddParam ARGS4( HTSACat(result, last); (*result)[len] = 0; } -#if USE_QUOTED_PARAMETER - quoted = HTQuoteParameter(parameter); - HTSACat(result, quoted); - FREE(quoted); -#else - HTSACat(result, parameter); -#endif + HTSACat(result, string); CTRACE((tfp, "PARAM-ADD:%s\n", *result)); return; } @@ -1053,6 +1043,28 @@ PUBLIC void HTAddParam ARGS4( } /* + * Append string-parameter to a system command that we are constructing. The + * string is a complete parameter (which is a necessary assumption so we can + * quote it properly). + */ +PUBLIC void HTAddParam ARGS4( + char **, result, + CONST char *, command, + int, number, + CONST char *, parameter) +{ + if (number > 0) { +#if USE_QUOTED_PARAMETER + char *quoted = HTQuoteParameter(parameter); + HTAddToCmd(result, command, number, quoted); + FREE(quoted); +#else + HTAddToCmd(result, command, number, parameter); +#endif + } +} + +/* * Append the remaining command-string to a system command (compare with * HTAddParam). Any remaining "%s" tokens are copied as empty strings. */ diff --git a/WWW/Library/Implementation/HTString.h b/WWW/Library/Implementation/HTString.h index a93f4a7e..af994c86 100644 --- a/WWW/Library/Implementation/HTString.h +++ b/WWW/Library/Implementation/HTString.h @@ -111,6 +111,7 @@ extern void HTAddXpand PARAMS((char ** result, CONST char * command, int number, #endif extern int HTCountCommandArgs PARAMS((CONST char * command)); +extern void HTAddToCmd PARAMS((char ** result, CONST char * command, int number, CONST char * string)); extern void HTAddParam PARAMS((char ** result, CONST char * command, int number, CONST char * parameter)); extern void HTEndParam PARAMS((char ** result, CONST char * command, int number)); diff --git a/WWW/Library/Implementation/www_tcp.h b/WWW/Library/Implementation/www_tcp.h index 94db09ee..4cd4b76b 100644 --- a/WWW/Library/Implementation/www_tcp.h +++ b/WWW/Library/Implementation/www_tcp.h @@ -686,7 +686,7 @@ typedef unsigned short mode_t; #include <libgettext.h> #endif -#define N_(s) (s) +#define N_(s) s #ifndef HAVE_GETTEXT #define gettext(s) s diff --git a/WWW/Library/djgpp/CommonMakefile b/WWW/Library/djgpp/CommonMakefile index 99dc1f6a..87a9306f 100644 --- a/WWW/Library/djgpp/CommonMakefile +++ b/WWW/Library/djgpp/CommonMakefile @@ -69,7 +69,7 @@ include $(ABS)$(WWW)/Library/Implementation/Version.make # XMOsAIC hack is only for server to cope with xmosaic kludge for mmedia # # add -DNEW_GATEWAY here for the new gateway config stuff -CFLAGS2 = $(CFLAGS) $(LYFLAGS) $(WAISCFLAGS) -I$(CMN) -DXMOSAIC_HACK -DACCESS_AUTH +CFLAGS2 = $(CFLAGS) $(LYFLAGS) $(WAISCFLAGS) -I$(CMN) -DACCESS_AUTH CERNLIBBIN = $(WWW)/bin diff --git a/WWW/Library/djgpp/makefile b/WWW/Library/djgpp/makefile index 893f6cdb..f46ad1fc 100644 --- a/WWW/Library/djgpp/makefile +++ b/WWW/Library/djgpp/makefile @@ -8,10 +8,7 @@ WWW_MACH = djgpp #ASIS_MACH = hardware/os # Use this option to enable optional and *experimental* color style. -#ENABLE_COLOR_STYLE = \ - -DUSE_COLOR_STYLE \ - -DUSE_HASH \ - -DLINKEDSTYLES +#ENABLE_COLOR_STYLE = -DUSE_COLOR_STYLE # comment this line to suppress DIRED support DIRED_DEFS = -DDIRED_SUPPORT @@ -23,18 +20,16 @@ MCFLAGS = \ $(ENABLE_COLOR_STYLE) \ -DDISP_PARTIAL \ -DDOSPATH \ - -DEXP_FILE_UPLOAD \ + -DUSE_FILE_UPLOAD \ -DNOUSERS \ - -DSOURCE_CACHE \ + -DUSE_SOURCE_CACHE \ -DUSE_PRETTYSRC \ -DUSE_ZLIB \ - -DWATT32 \ -I../Implementation \ -I../../../src \ -I../../.. \ - -I/djgpp/pdcur24 \ - -I/djgpp/watt32/inc \ - -I/djgpp/watt32/inc/sys + -I/djgpp/pdcur26 \ + -I/djgpp/watt32/inc LFLAGS = CC = gcc @@ -44,7 +39,7 @@ CC = gcc # Uncomment the following to enable SSL. #SSLFLAGS = -DUSE_SSL -#SSLINC = -I/djgpp/include/openssl +#SSLINC = -I/dev/env/DJDIR/include/openssl # Directory for installed binary: !BINDIR = /usr/local/bin diff --git a/WWW/Library/djgpp/makefile.sla b/WWW/Library/djgpp/makefile.sla index 540f9a33..79e87b88 100644 --- a/WWW/Library/djgpp/makefile.sla +++ b/WWW/Library/djgpp/makefile.sla @@ -7,17 +7,21 @@ WWW_MACH = djgpp # The ASIS repository's name for the machine we are on #ASIS_MACH = hardware/os -CFLAGS = -O1 -DUSE_SLANG -DUSE_ZLIB -DDOSPATH -DNOUSERS -DDISP_PARTIAL \ --DDIRED_SUPPORT -DSOURCE_CACHE -DUSE_PRETTYSRC \ --DWATT32 \ +CFLAGS = -O2 -DUSE_SLANG -DUSE_ZLIB -DDOSPATH -DNOUSERS -DDISP_PARTIAL \ +-DDIRED_SUPPORT -DUSE_SOURCE_CACHE -DUSE_PRETTYSRC \ -I../Implementation \ --I../../../djgpp/watt32/inc -I../../../djgpp/watt32/inc/sys \ +-I/dev/env/DJDIR/watt32/inc \ -I../../../src \ --I../../.. $(SLANGINC) $(INTLFLAGS) +-I../../.. $(SLANGINC) $(INTLFLAGS) $(SSLFLAGS) $(SSLINC) + LFLAGS = CC = gcc #INTLFLAGS = -DHAVE_GETTEXT -DHAVE_LIBINTL_H +# Uncomment the following to enable SSL. +#SSLFLAGS = -DUSE_SSL +#SSLINC = -I/dev/env/DJDIR/include/openssl + # Directory for installed binary: !BINDIR = /usr/local/bin diff --git a/aclocal.m4 b/aclocal.m4 index a4861831..0d9f34f1 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -4,7 +4,7 @@ dnl and Jim Spath <jspath@mail.bcpl.lib.md.us> dnl and Philippe De Muyter <phdm@macqel.be> dnl dnl Created: 1997/1/28 -dnl Updated: 2004/1/24 +dnl Updated: 2004/1/26 dnl dnl The autoconf used in Lynx development is GNU autoconf 2.13, patched dnl by Tom Dickey. See your local GNU archives, and this URL: @@ -12,7 +12,7 @@ dnl http://invisible-island.net/autoconf/autoconf.html dnl dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- -dnl AM_GNU_GETTEXT version: 10 updated: 2002/11/17 17:25:28 +dnl AM_GNU_GETTEXT version: 11 updated: 2004/01/26 20:58:40 dnl -------------- dnl Usage: Just like AM_WITH_NLS, which see. AC_DEFUN([AM_GNU_GETTEXT], @@ -77,6 +77,7 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) dnl find the mkinstalldirs script in another subdir but ($top_srcdir). dnl Try to locate it. dnl changed mkinstalldirs to mkdirs.sh for Lynx /je spath 1998-Aug-21 + dnl added check for separate locations of scripts -mirabile 2004-Jan-18 MKINSTALLDIRS= if test -n "$ac_aux_dir"; then MKINSTALLDIRS="$ac_aux_dir/mkdirs.sh" @@ -84,6 +85,11 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) if test -z "$MKINSTALLDIRS"; then MKINSTALLDIRS="\$(top_srcdir)/mkdirs.sh" fi + if test -n "$GNUSYSTEM_AUX_DIR" ; then + if test -e "${GNUSYSTEM_AUX_DIR}/mkinstalldirs"; then + MKINSTALLDIRS="${GNUSYSTEM_AUX_DIR}/mkinstalldirs" + fi + fi AC_SUBST(MKINSTALLDIRS) dnl Enable libtool support if the surrounding package wishes it. @@ -910,7 +916,7 @@ if test "$USE_INCLUDED_LIBINTL" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_CACHE version: 7 updated: 2001/12/19 00:50:10 +dnl CF_CHECK_CACHE version: 8 updated: 2004/01/26 20:58:40 dnl -------------- dnl Check if we're accidentally using a cache from a different machine. dnl Derive the system name, as a check for reusing the autoconf cache. @@ -921,7 +927,7 @@ dnl an extra parameter that we may override, e.g., for AC_CANONICAL_SYSTEM dnl which is useful in cross-compiles. AC_DEFUN([CF_CHECK_CACHE], [ -if test -f $srcdir/config.guess ; then +if test -f $ac_config_sub ; then ifelse([$1],,[AC_CANONICAL_HOST],[$1]) system_name="$host_os" else @@ -2754,11 +2760,12 @@ ifelse($1,,,[$1=$PATHSEP]) AC_SUBST(PATHSEP) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PATH_PROG version: 5 updated: 2001/11/18 20:52:38 +dnl CF_PATH_PROG version: 6 updated: 2004/01/26 20:58:41 dnl ------------ dnl Check for a given program, defining corresponding symbol. dnl $1 = environment variable, which is suffixed by "_PATH" in the #define. dnl $2 = program name to find. +dnl $3 = optional list of additional program names to test. dnl dnl If there is more than one token in the result, #define the remaining tokens dnl to $1_ARGS. We need this for 'install' in particular. @@ -2767,7 +2774,7 @@ dnl FIXME: we should allow this to be overridden by environment variables dnl AC_DEFUN([CF_PATH_PROG],[ test -z "[$]$1" && $1=$2 -AC_PATH_PROG($1,$2,[$]$1) +AC_PATH_PROGS($1,[$]$1 $2 $3,[$]$1) cf_path_prog="" cf_path_args="" @@ -3566,6 +3573,40 @@ AC_DEFUN([CF_SYS_ERRLIST], CF_CHECK_ERRNO(sys_errlist) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_TAR_OPTIONS version: 1 updated: 2004/01/26 20:58:41 +dnl -------------- +dnl This is just a list of the most common tar options, allowing for variants +dnl that can operate with the "-" standard input/output option. +AC_DEFUN([CF_TAR_OPTIONS], +[ +case ifelse($1,,tar,$1) in +*pax) + TAR_UP_OPTIONS="-w" + TAR_DOWN_OPTIONS="-r" + TAR_PIPE_OPTIONS="" + TAR_FILE_OPTIONS="-f" + ;; +*star) + TAR_UP_OPTIONS="-c -f" + TAR_DOWN_OPTIONS="-x -U -f" + TAR_PIPE_OPTIONS="-" + TAR_FILE_OPTIONS="" + ;; +*tar) + # FIXME: some versions of tar require, some don't allow the "-" + TAR_UP_OPTIONS="-cf" + TAR_DOWN_OPTIONS="-xf" + TAR_PIPE_OPTIONS="-" + TAR_FILE_OPTIONS="" + ;; +esac + +AC_SUBST(TAR_UP_OPTIONS) +AC_SUBST(TAR_DOWN_OPTIONS) +AC_SUBST(TAR_FILE_OPTIONS) +AC_SUBST(TAR_PIPE_OPTIONS) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_TERMCAP_LIBS version: 10 updated: 2001/10/18 20:42:39 dnl --------------- dnl Look for termcap libraries, or the equivalent in terminfo. @@ -4176,7 +4217,7 @@ AC_TRY_LINK([ test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 9 updated: 2004/01/12 20:45:17 +dnl CF_XOPEN_SOURCE version: 11 updated: 2004/01/26 20:58:41 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl or adapt to the vendor's definitions to get equivalent functionality. @@ -4194,6 +4235,9 @@ irix6.*) #(vi linux*) #(vi CF_GNU_SOURCE ;; +mirbsd*) #(vi + # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h> + ;; netbsd*) #(vi # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ;; @@ -4203,6 +4247,9 @@ openbsd*) #(vi osf[[45]]*) #(vi CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE" ;; +sco*) #(vi + # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer + ;; solaris*) #(vi CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" ;; diff --git a/config.hin b/config.hin index dd820666..faac6ace 100644 --- a/config.hin +++ b/config.hin @@ -202,7 +202,11 @@ #undef SYSTEM_MAIL /* CF_DEFINE_PROG */ #undef SYSTEM_MAIL_FLAGS /* CF_SYSTEM_MAIL_FLAGS */ #undef SYSTEM_NAME /* CF_CHECK_CACHE */ +#undef TAR_DOWN_OPTIONS /* CF_TAR_OPTIONS */ +#undef TAR_FILE_OPTIONS /* CF_TAR_OPTIONS */ #undef TAR_PATH /* CF_PATH_PROG(tar) */ +#undef TAR_PIPE_OPTIONS /* CF_TAR_OPTIONS */ +#undef TAR_UP_OPTIONS /* CF_TAR_OPTIONS */ #undef TELNET_PATH /* CF_PATH_PROG(telnet) */ #undef TERMIO_AND_CURSES /* CF_TERMIO_AND_CURSES workaround */ #undef TERMIO_AND_TERMIOS /* CF_TERMIO_AND_TERMIOS workaround */ diff --git a/configure b/configure index c3a86cca..93e6c114 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in none +# From configure.in 2.8.5pre.3 # Save the original $CFLAGS so we can distinguish whether the user set those # in the environment, or whether autoconf added -O and -g options: @@ -666,7 +666,7 @@ ac_config_sub=$ac_aux_dir/config.sub ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. -if test -f $srcdir/config.guess ; then +if test -f $ac_config_sub ; then # Make sure we can run config.sub. if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : @@ -722,8 +722,8 @@ fi PACKAGE=lynx -VERSION=2.8.5 - +# $Format: "VERSION=$ProjectVersion$"$ +VERSION=2.8.5pre.4 @@ -2183,12 +2183,12 @@ linux*) ;; msdosdjgpp*) LIBS="$LIBS -lwatt" - TRY_CFLAGS="$TRY_CFLAGS -DDOSPATH -DNOUSERS -DWATT32" + TRY_CFLAGS="$TRY_CFLAGS -DDOSPATH -DNOUSERS" ;; next*) TRY_CFLAGS="$TRY_CFLAGS -DNEXT" ;; -openbsd*) +openbsd* | ekkobsd* | mirbsd*) LIBS="$LIBS -lcompat" ;; osf4*) @@ -4186,13 +4186,18 @@ echo "configure:4163: checking for catalogs to be installed" >&5 fi fi - MKINSTALLDIRS= + MKINSTALLDIRS= if test -n "$ac_aux_dir"; then MKINSTALLDIRS="$ac_aux_dir/mkdirs.sh" fi if test -z "$MKINSTALLDIRS"; then MKINSTALLDIRS="\$(top_srcdir)/mkdirs.sh" fi + if test -n "$GNUSYSTEM_AUX_DIR" ; then + if test -e "${GNUSYSTEM_AUX_DIR}/mkinstalldirs"; then + MKINSTALLDIRS="${GNUSYSTEM_AUX_DIR}/mkinstalldirs" + fi + fi INTL_LIBTOOL_SUFFIX_PREFIX= @@ -4210,7 +4215,7 @@ use_our_messages=no if test "$USE_NLS" = yes ; then if test -d $srcdir/po ; then echo $ac_n "checking if we should use included message-library""... $ac_c" 1>&6 -echo "configure:4214: checking if we should use included message-library" >&5 +echo "configure:4219: checking if we should use included message-library" >&5 # Check whether --enable-included-msgs or --disable-included-msgs was given. if test "${enable_included_msgs+set}" = set; then @@ -4265,17 +4270,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4269: checking for $ac_hdr" >&5 +echo "configure:4274: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4274 "configure" +#line 4279 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4386,7 +4391,7 @@ eval NLS_DATADIR="$withval" echo $ac_n "checking if you want full utility pathnames""... $ac_c" 1>&6 -echo "configure:4390: checking if you want full utility pathnames" >&5 +echo "configure:4395: checking if you want full utility pathnames" >&5 # Check whether --enable-full-paths or --disable-full-paths was given. if test "${enable_full_paths+set}" = set; then @@ -4411,7 +4416,7 @@ EOF echo $ac_n "checking for system mailer""... $ac_c" 1>&6 -echo "configure:4415: checking for system mailer" >&5 +echo "configure:4420: checking for system mailer" >&5 if eval "test \"`echo '$''{'cf_cv_SYSTEM_MAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4438,7 +4443,7 @@ EOF echo $ac_n "checking system mail flags""... $ac_c" 1>&6 -echo "configure:4442: checking system mail flags" >&5 +echo "configure:4447: checking system mail flags" >&5 if eval "test \"`echo '$''{'cf_cv_system_mail_flags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4479,13 +4484,13 @@ irix6.*) #(vi linux*) #(vi echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6 -echo "configure:4483: checking if we must define _GNU_SOURCE" >&5 +echo "configure:4488: checking if we must define _GNU_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4489 "configure" +#line 4494 "configure" #include "confdefs.h" #include <sys/types.h> int main() { @@ -4495,7 +4500,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:4499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -4505,7 +4510,7 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat > conftest.$ac_ext <<EOF -#line 4509 "configure" +#line 4514 "configure" #include "confdefs.h" #include <sys/types.h> int main() { @@ -4515,7 +4520,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:4519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -4536,6 +4541,9 @@ echo "$ac_t""$cf_cv_gnu_source" 1>&6 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" ;; +mirbsd*) #(vi + # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h> + ;; netbsd*) #(vi # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ;; @@ -4545,18 +4553,21 @@ openbsd*) #(vi osf[45]*) #(vi CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE" ;; +sco*) #(vi + # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer + ;; solaris*) #(vi CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" ;; *) echo $ac_n "checking if we should define _XOPEN_SOURCE""... $ac_c" 1>&6 -echo "configure:4554: checking if we should define _XOPEN_SOURCE" >&5 +echo "configure:4565: checking if we should define _XOPEN_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4560 "configure" +#line 4571 "configure" #include "confdefs.h" #include <sys/types.h> int main() { @@ -4566,7 +4577,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:4570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_xopen_source=no else @@ -4576,7 +4587,7 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500" cat > conftest.$ac_ext <<EOF -#line 4580 "configure" +#line 4591 "configure" #include "confdefs.h" #include <sys/types.h> int main() { @@ -4586,7 +4597,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:4590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_xopen_source=no else @@ -4608,13 +4619,13 @@ test "$cf_cv_xopen_source" = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500" # FreeBSD 5.x headers demand this... echo $ac_n "checking if we should define _POSIX_C_SOURCE""... $ac_c" 1>&6 -echo "configure:4612: checking if we should define _POSIX_C_SOURCE" >&5 +echo "configure:4623: checking if we should define _POSIX_C_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4618 "configure" +#line 4629 "configure" #include "confdefs.h" #include <sys/types.h> int main() { @@ -4624,7 +4635,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:4628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_xopen_source=no else @@ -4634,7 +4645,7 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE" cat > conftest.$ac_ext <<EOF -#line 4638 "configure" +#line 4649 "configure" #include "confdefs.h" #include <sys/types.h> int main() { @@ -4644,7 +4655,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:4648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_xopen_source=no else @@ -4709,14 +4720,14 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext <<EOF -#line 4713 "configure" +#line 4724 "configure" #include "confdefs.h" #include <stdio.h> int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:4720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -4739,7 +4750,7 @@ fi ### Look for network libraries first, since some functions (such as gethostname) ### are used in a lot of places. echo $ac_n "checking if you want ssl library""... $ac_c" 1>&6 -echo "configure:4743: checking if you want ssl library" >&5 +echo "configure:4754: checking if you want ssl library" >&5 if eval "test \"`echo '$''{'cf_cv_use_libssl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4760,7 +4771,7 @@ echo "$ac_t""$cf_cv_use_libssl" 1>&6 if test "x$cf_cv_use_libssl" = "xno" ; then echo $ac_n "checking if you want experimental gnutls support""... $ac_c" 1>&6 -echo "configure:4764: checking if you want experimental gnutls support" >&5 +echo "configure:4775: checking if you want experimental gnutls support" >&5 if eval "test \"`echo '$''{'cf_cv_use_libgnutls'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4781,7 +4792,7 @@ echo "$ac_t""$cf_cv_use_libgnutls" 1>&6 fi echo $ac_n "checking if you want socks library""... $ac_c" 1>&6 -echo "configure:4785: checking if you want socks library" >&5 +echo "configure:4796: checking if you want socks library" >&5 if eval "test \"`echo '$''{'cf_cv_use_libsocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4801,7 +4812,7 @@ fi echo "$ac_t""$cf_cv_use_libsocks" 1>&6 echo $ac_n "checking if you want socks5 library""... $ac_c" 1>&6 -echo "configure:4805: checking if you want socks5 library" >&5 +echo "configure:4816: checking if you want socks5 library" >&5 if eval "test \"`echo '$''{'cf_cv_use_libsocks5'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4877,7 +4888,7 @@ cat >> confdefs.h <<\EOF EOF cat > conftest.$ac_ext <<EOF -#line 4881 "configure" +#line 4892 "configure" #include "confdefs.h" #include <stdio.h> @@ -4886,7 +4897,7 @@ int main() { accept((char *)0) ; return 0; } EOF -if { (eval echo configure:4890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -4925,10 +4936,10 @@ cat >> confdefs.h <<\EOF EOF echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6 -echo "configure:4929: checking if the socks library uses socks4 prefix" >&5 +echo "configure:4940: checking if the socks library uses socks4 prefix" >&5 cf_use_socks4=error cat > conftest.$ac_ext <<EOF -#line 4932 "configure" +#line 4943 "configure" #include "confdefs.h" #include <socks.h> @@ -4937,7 +4948,7 @@ int main() { Rinit((char *)0) ; return 0; } EOF -if { (eval echo configure:4941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define USE_SOCKS4_PREFIX 1 @@ -4949,14 +4960,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 4953 "configure" +#line 4964 "configure" #include "confdefs.h" #include <socks.h> int main() { SOCKSinit((char *)0) ; return 0; } EOF -if { (eval echo configure:4960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_use_socks4=no else @@ -5021,9 +5032,9 @@ EOF fi echo $ac_n "checking if socks5p.h is available""... $ac_c" 1>&6 -echo "configure:5025: checking if socks5p.h is available" >&5 +echo "configure:5036: checking if socks5p.h is available" >&5 cat > conftest.$ac_ext <<EOF -#line 5027 "configure" +#line 5038 "configure" #include "confdefs.h" #define INCLUDE_PROTOTYPES @@ -5033,7 +5044,7 @@ int main() { init((char *)0) ; return 0; } EOF -if { (eval echo configure:5037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_use_socks5p_h=yes else @@ -5053,7 +5064,7 @@ else cf_test_netlibs=no echo $ac_n "checking for network libraries""... $ac_c" 1>&6 -echo "configure:5057: checking for network libraries" >&5 +echo "configure:5068: checking for network libraries" >&5 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5064,12 +5075,12 @@ cf_test_netlibs=yes for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5068: checking for $ac_func" >&5 +echo "configure:5079: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5073 "configure" +#line 5084 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5092,7 +5103,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5115,7 +5126,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:5119: checking for gethostname in -lnsl" >&5 +echo "configure:5130: checking for gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5123,7 +5134,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 5127 "configure" +#line 5138 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5134,7 +5145,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:5138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5167,7 +5178,7 @@ else echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:5171: checking for gethostname in -lsocket" >&5 +echo "configure:5182: checking for gethostname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5175,7 +5186,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 5179 "configure" +#line 5190 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5186,7 +5197,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:5190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5231,7 +5242,7 @@ done # I don't know the entrypoints - 97/7/22 TD # AC_HAVE_LIBRARY(inet,cf_cv_netlibs="-linet $cf_cv_netlibs") echo $ac_n "checking for main in -linet""... $ac_c" 1>&6 -echo "configure:5235: checking for main in -linet" >&5 +echo "configure:5246: checking for main in -linet" >&5 ac_lib_var=`echo inet'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5239,14 +5250,14 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <<EOF -#line 5243 "configure" +#line 5254 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5271,12 +5282,12 @@ if test "$ac_cv_func_lsocket" != no ; then for ac_func in socket do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5275: checking for $ac_func" >&5 +echo "configure:5286: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5280 "configure" +#line 5291 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5299,7 +5310,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5322,7 +5333,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:5326: checking for socket in -lsocket" >&5 +echo "configure:5337: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5330,7 +5341,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 5334 "configure" +#line 5345 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5341,7 +5352,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:5345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5374,7 +5385,7 @@ else echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6 -echo "configure:5378: checking for socket in -lbsd" >&5 +echo "configure:5389: checking for socket in -lbsd" >&5 ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5382,7 +5393,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 5386 "configure" +#line 5397 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5393,7 +5404,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:5397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5438,12 +5449,12 @@ fi for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5442: checking for $ac_func" >&5 +echo "configure:5453: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5447 "configure" +#line 5458 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5466,7 +5477,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5489,7 +5500,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:5493: checking for gethostbyname in -lnsl" >&5 +echo "configure:5504: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5497,7 +5508,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 5501 "configure" +#line 5512 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5508,7 +5519,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:5512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5549,12 +5560,12 @@ done for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5553: checking for $ac_func" >&5 +echo "configure:5564: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5558 "configure" +#line 5569 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5577,7 +5588,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5600,7 +5611,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:5604: checking for strcasecmp in -lresolv" >&5 +echo "configure:5615: checking for strcasecmp in -lresolv" >&5 ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5608,7 +5619,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 5612 "configure" +#line 5623 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5619,7 +5630,7 @@ int main() { strcasecmp() ; return 0; } EOF -if { (eval echo configure:5623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5665,13 +5676,13 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6 fi echo $ac_n "checking for inet_aton function""... $ac_c" 1>&6 -echo "configure:5669: checking for inet_aton function" >&5 +echo "configure:5680: checking for inet_aton function" >&5 if eval "test \"`echo '$''{'cf_cv_have_inet_aton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5675 "configure" +#line 5686 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -5682,7 +5693,7 @@ int main() { inet_aton(0, (struct in_addr *)0) ; return 0; } EOF -if { (eval echo configure:5686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_inet_aton=yes else @@ -5702,13 +5713,13 @@ EOF else echo $ac_n "checking for inet_addr function""... $ac_c" 1>&6 -echo "configure:5706: checking for inet_addr function" >&5 +echo "configure:5717: checking for inet_addr function" >&5 if eval "test \"`echo '$''{'cf_cv_have_inet_addr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5712 "configure" +#line 5723 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -5719,7 +5730,7 @@ int main() { inet_addr(0) ; return 0; } EOF -if { (eval echo configure:5723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_inet_addr=yes else @@ -5734,7 +5745,7 @@ fi echo "$ac_t""$cf_cv_have_inet_addr" 1>&6 if test "$cf_cv_have_inet_addr" = no ; then echo $ac_n "checking for library with inet_addr""... $ac_c" 1>&6 -echo "configure:5738: checking for library with inet_addr" >&5 +echo "configure:5749: checking for library with inet_addr" >&5 if eval "test \"`echo '$''{'cf_cv_lib_inet_addr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5744,7 +5755,7 @@ else do LIBS="$cf_save_LIBS $cf_inetlib" cat > conftest.$ac_ext <<EOF -#line 5748 "configure" +#line 5759 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -5755,7 +5766,7 @@ int main() { inet_addr(0) ; return 0; } EOF -if { (eval echo configure:5759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_lib_inet_addr=$cf_inetlib else @@ -5788,7 +5799,7 @@ no) #(vi ;; yes) #(vi echo $ac_n "checking for SSL_get_version in -lssl""... $ac_c" 1>&6 -echo "configure:5792: checking for SSL_get_version in -lssl" >&5 +echo "configure:5803: checking for SSL_get_version in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_get_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5796,7 +5807,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl -lcrypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 5800 "configure" +#line 5811 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5807,7 +5818,7 @@ int main() { SSL_get_version() ; return 0; } EOF -if { (eval echo configure:5811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5862,9 +5873,9 @@ esac LIBS="$cf_ssl_library $LIBS" echo $ac_n "checking for openssl include directory""... $ac_c" 1>&6 -echo "configure:5866: checking for openssl include directory" >&5 +echo "configure:5877: checking for openssl include directory" >&5 cat > conftest.$ac_ext <<EOF -#line 5868 "configure" +#line 5879 "configure" #include "confdefs.h" #include <stdio.h> @@ -5873,7 +5884,7 @@ int main() { SSL_shutdown((SSL *)0) ; return 0; } EOF -if { (eval echo configure:5877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_openssl_incl=yes else @@ -5890,9 +5901,9 @@ EOF echo $ac_n "checking if we can link to ssl library""... $ac_c" 1>&6 -echo "configure:5894: checking if we can link to ssl library" >&5 +echo "configure:5905: checking if we can link to ssl library" >&5 cat > conftest.$ac_ext <<EOF -#line 5896 "configure" +#line 5907 "configure" #include "confdefs.h" #include <stdio.h> @@ -5906,7 +5917,7 @@ int main() { SSL_shutdown((SSL *)0) ; return 0; } EOF -if { (eval echo configure:5910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_ssl_library=yes else @@ -5938,7 +5949,7 @@ no) #(vi ;; yes) #(vi echo $ac_n "checking for SSL_connect in -lgnutls""... $ac_c" 1>&6 -echo "configure:5942: checking for SSL_connect in -lgnutls" >&5 +echo "configure:5953: checking for SSL_connect in -lgnutls" >&5 ac_lib_var=`echo gnutls'_'SSL_connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5946,7 +5957,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgnutls -lgnutls-extra -lgnutls -lcrypt $LIBS" cat > conftest.$ac_ext <<EOF -#line 5950 "configure" +#line 5961 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5957,7 +5968,7 @@ int main() { SSL_connect() ; return 0; } EOF -if { (eval echo configure:5961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6012,9 +6023,9 @@ esac LIBS="$cf_ssl_library $LIBS" echo $ac_n "checking for gnutls include directory""... $ac_c" 1>&6 -echo "configure:6016: checking for gnutls include directory" >&5 +echo "configure:6027: checking for gnutls include directory" >&5 cat > conftest.$ac_ext <<EOF -#line 6018 "configure" +#line 6029 "configure" #include "confdefs.h" #include <stdio.h> @@ -6023,7 +6034,7 @@ int main() { SSL_shutdown((SSL *)0) ; return 0; } EOF -if { (eval echo configure:6027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6038: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_openssl_incl=yes else @@ -6040,9 +6051,9 @@ EOF echo $ac_n "checking if we can link to gnutls library""... $ac_c" 1>&6 -echo "configure:6044: checking if we can link to gnutls library" >&5 +echo "configure:6055: checking if we can link to gnutls library" >&5 cat > conftest.$ac_ext <<EOF -#line 6046 "configure" +#line 6057 "configure" #include "confdefs.h" #include <stdio.h> @@ -6056,7 +6067,7 @@ int main() { SSL_shutdown((SSL *)0) ; return 0; } EOF -if { (eval echo configure:6060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_ssl_library=yes else @@ -6077,9 +6088,9 @@ else fi echo $ac_n "checking for X509 support""... $ac_c" 1>&6 -echo "configure:6081: checking for X509 support" >&5 +echo "configure:6092: checking for X509 support" >&5 cat > conftest.$ac_ext <<EOF -#line 6083 "configure" +#line 6094 "configure" #include "confdefs.h" #include <stdio.h> @@ -6094,7 +6105,7 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(X509_STORE_CTX *0)); cf_x509_support=yes ; return 0; } EOF -if { (eval echo configure:6098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_x509_support=no else @@ -6113,7 +6124,7 @@ fi fi echo $ac_n "checking for screen type""... $ac_c" 1>&6 -echo "configure:6117: checking for screen type" >&5 +echo "configure:6128: checking for screen type" >&5 if eval "test \"`echo '$''{'cf_cv_screen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6183,7 +6194,7 @@ curses) echo $ac_n "checking for extra include directories""... $ac_c" 1>&6 -echo "configure:6187: checking for extra include directories" >&5 +echo "configure:6198: checking for extra include directories" >&5 if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6207,7 +6218,7 @@ echo "$ac_t""$cf_cv_curses_incdir" 1>&6 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS" echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 -echo "configure:6211: checking if we have identified curses headers" >&5 +echo "configure:6222: checking if we have identified curses headers" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6220,14 +6231,14 @@ for cf_header in \ ncurses/ncurses.h do cat > conftest.$ac_ext <<EOF -#line 6224 "configure" +#line 6235 "configure" #include "confdefs.h" #include <${cf_header}> int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:6231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=$cf_header; break else @@ -6250,17 +6261,17 @@ for ac_hdr in $cf_cv_ncurses_header do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6254: checking for $ac_hdr" >&5 +echo "configure:6265: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6259 "configure" +#line 6270 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6290,7 +6301,7 @@ done echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:6294: checking for ncurses version" >&5 +echo "configure:6305: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6316,7 +6327,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:6320: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:6331: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -6325,7 +6336,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 6329 "configure" +#line 6340 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -6349,7 +6360,7 @@ int main() exit(0); } EOF -if { (eval echo configure:6353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -6373,16 +6384,16 @@ EOF echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6 -echo "configure:6377: checking if we have identified curses libraries" >&5 +echo "configure:6388: checking if we have identified curses libraries" >&5 cat > conftest.$ac_ext <<EOF -#line 6379 "configure" +#line 6390 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:6386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -6398,7 +6409,7 @@ if test "$cf_result" = no ; then case $host_os in #(vi freebsd*) #(vi echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:6402: checking for tgoto in -lmytinfo" >&5 +echo "configure:6413: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6406,7 +6417,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 6410 "configure" +#line 6421 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6417,7 +6428,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:6421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6440,7 +6451,7 @@ fi ;; hpux10.*|hpux11.*) #(vi echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 -echo "configure:6444: checking for initscr in -lcur_colr" >&5 +echo "configure:6455: checking for initscr in -lcur_colr" >&5 ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6448,7 +6459,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcur_colr $LIBS" cat > conftest.$ac_ext <<EOF -#line 6452 "configure" +#line 6463 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6459,7 +6470,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6482,7 +6493,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:6486: checking for initscr in -lHcurses" >&5 +echo "configure:6497: checking for initscr in -lHcurses" >&5 ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6490,7 +6501,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lHcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 6494 "configure" +#line 6505 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6501,7 +6512,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6554,12 +6565,12 @@ if test ".$ac_cv_func_initscr" != .yes ; then # Check for library containing tgoto. Do this before curses library # because it may be needed to link the test-case for initscr. echo $ac_n "checking for tgoto""... $ac_c" 1>&6 -echo "configure:6558: checking for tgoto" >&5 +echo "configure:6569: checking for tgoto" >&5 if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6563 "configure" +#line 6574 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char tgoto(); below. */ @@ -6582,7 +6593,7 @@ tgoto(); ; return 0; } EOF -if { (eval echo configure:6586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_tgoto=yes" else @@ -6603,7 +6614,7 @@ else for cf_term_lib in $cf_check_list termcap termlib unknown do echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 -echo "configure:6607: checking for tgoto in -l$cf_term_lib" >&5 +echo "configure:6618: checking for tgoto in -l$cf_term_lib" >&5 ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6611,7 +6622,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_term_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 6615 "configure" +#line 6626 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6622,7 +6633,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:6626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6652,7 +6663,7 @@ fi for cf_curs_lib in $cf_check_list xcurses jcurses unknown do echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 -echo "configure:6656: checking for initscr in -l$cf_curs_lib" >&5 +echo "configure:6667: checking for initscr in -l$cf_curs_lib" >&5 ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6660,7 +6671,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_curs_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 6664 "configure" +#line 6675 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6671,7 +6682,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6697,16 +6708,16 @@ fi LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown ; then echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6 -echo "configure:6701: checking if we can link with $cf_curs_lib library" >&5 +echo "configure:6712: checking if we can link with $cf_curs_lib library" >&5 cat > conftest.$ac_ext <<EOF -#line 6703 "configure" +#line 6714 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -6722,16 +6733,16 @@ rm -f conftest* : elif test "$cf_term_lib" != predefined ; then echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 -echo "configure:6726: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +echo "configure:6737: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 cat > conftest.$ac_ext <<EOF -#line 6728 "configure" +#line 6739 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr(); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:6735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=no else @@ -6741,14 +6752,14 @@ else LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 6745 "configure" +#line 6756 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -6769,14 +6780,14 @@ fi echo $ac_n "checking for curses performance tradeoff""... $ac_c" 1>&6 -echo "configure:6773: checking for curses performance tradeoff" >&5 +echo "configure:6784: checking for curses performance tradeoff" >&5 if eval "test \"`echo '$''{'cf_cv_curs_performance'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cf_cv_curs_performance=no cat > conftest.$ac_ext <<EOF -#line 6780 "configure" +#line 6791 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -6790,11 +6801,11 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 6798 "configure" +#line 6809 "configure" #include "confdefs.h" #define CURS_PERFORMANCE @@ -6809,7 +6820,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_curs_performance=yes else @@ -6832,13 +6843,13 @@ EOF echo $ac_n "checking for curses touchline function""... $ac_c" 1>&6 -echo "configure:6836: checking for curses touchline function" >&5 +echo "configure:6847: checking for curses touchline function" >&5 if eval "test \"`echo '$''{'cf_cv_curs_touchline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6842 "configure" +#line 6853 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -6846,7 +6857,7 @@ int main() { touchline(stdscr, 1,2,3); ; return 0; } EOF -if { (eval echo configure:6850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_curs_touchline=bsd else @@ -6854,7 +6865,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 6858 "configure" +#line 6869 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -6862,7 +6873,7 @@ int main() { touchline(stdscr, 1,2); ; return 0; } EOF -if { (eval echo configure:6866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_curs_touchline=sysv else @@ -6903,7 +6914,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 $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:6907: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:6918: checking for $cf_ncuhdr_root header in include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6914,7 +6925,7 @@ else do cat > conftest.$ac_ext <<EOF -#line 6918 "configure" +#line 6929 "configure" #include "confdefs.h" @@ -6935,7 +6946,7 @@ printf("old\n"); ; return 0; } EOF -if { (eval echo configure:6939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -6958,7 +6969,7 @@ if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 -echo "configure:6962: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:6973: checking for $cf_ncuhdr_root include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7053,14 +7064,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext <<EOF -#line 7057 "configure" +#line 7068 "configure" #include "confdefs.h" #include <stdio.h> int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:7064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -7087,7 +7098,7 @@ done do cat > conftest.$ac_ext <<EOF -#line 7091 "configure" +#line 7102 "configure" #include "confdefs.h" @@ -7108,7 +7119,7 @@ printf("old\n"); ; return 0; } EOF -if { (eval echo configure:7112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -7155,14 +7166,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext <<EOF -#line 7159 "configure" +#line 7170 "configure" #include "confdefs.h" #include <stdio.h> int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:7166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -7217,7 +7228,7 @@ esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:7221: checking for ncurses version" >&5 +echo "configure:7232: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7243,7 +7254,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:7247: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:7258: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -7252,7 +7263,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 7256 "configure" +#line 7267 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -7276,7 +7287,7 @@ int main() exit(0); } EOF -if { (eval echo configure:7280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -7307,7 +7318,7 @@ cf_nculib_root=ncurses cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:7311: checking for Gpm_Open in -lgpm" >&5 +echo "configure:7322: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7315,7 +7326,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 7319 "configure" +#line 7330 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7326,7 +7337,7 @@ int main() { Gpm_Open() ; return 0; } EOF -if { (eval echo configure:7330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7342,7 +7353,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:7346: checking for initscr in -lgpm" >&5 +echo "configure:7357: checking for initscr in -lgpm" >&5 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7350,7 +7361,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 7354 "configure" +#line 7365 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7361,7 +7372,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7392,7 +7403,7 @@ freebsd*) # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:7396: checking for tgoto in -lmytinfo" >&5 +echo "configure:7407: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7400,7 +7411,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 7404 "configure" +#line 7415 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7411,7 +7422,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:7415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7444,12 +7455,12 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:7448: checking for initscr" >&5 +echo "configure:7459: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7453 "configure" +#line 7464 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr(); below. */ @@ -7472,7 +7483,7 @@ initscr(); ; return 0; } EOF -if { (eval echo configure:7476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -7492,17 +7503,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:7496: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:7507: checking for initscr in -l$cf_nculib_root" >&5 LIBS="-l$cf_nculib_root $LIBS" cat > conftest.$ac_ext <<EOF -#line 7499 "configure" +#line 7510 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -7571,17 +7582,17 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 -echo "configure:7575: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:7586: checking for -l$cf_nculib_root in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 7578 "configure" +#line 7589 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -7612,7 +7623,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:7616: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:7627: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` @@ -7621,14 +7632,14 @@ echo "configure:7616: checking if we can link $cf_nculib_root without $cf_ncurse fi done cat > conftest.$ac_ext <<EOF -#line 7625 "configure" +#line 7636 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:7632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -7651,7 +7662,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:7655: checking for ncurses version" >&5 +echo "configure:7666: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7677,7 +7688,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:7681: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:7692: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -7686,7 +7697,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 7690 "configure" +#line 7701 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -7710,7 +7721,7 @@ int main() exit(0); } EOF -if { (eval echo configure:7714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -7735,14 +7746,14 @@ EOF ncursesw) echo $ac_n "checking for multibyte character support""... $ac_c" 1>&6 -echo "configure:7739: checking for multibyte character support" >&5 +echo "configure:7750: checking for multibyte character support" >&5 if eval "test \"`echo '$''{'cf_cv_utf8_lib'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cf_save_LIBS="$LIBS" cat > conftest.$ac_ext <<EOF -#line 7746 "configure" +#line 7757 "configure" #include "confdefs.h" #include <stdlib.h> @@ -7750,7 +7761,7 @@ int main() { putwc(0,0); ; return 0; } EOF -if { (eval echo configure:7754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_utf8_lib=yes else @@ -7759,7 +7770,7 @@ else rm -rf conftest* LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext <<EOF -#line 7763 "configure" +#line 7774 "configure" #include "confdefs.h" #include <libutf8.h> @@ -7767,7 +7778,7 @@ int main() { putwc(0,0); ; return 0; } EOF -if { (eval echo configure:7771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_utf8_lib=add-on else @@ -7804,7 +7815,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 $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:7808: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:7819: checking for $cf_ncuhdr_root header in include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7815,7 +7826,7 @@ else do cat > conftest.$ac_ext <<EOF -#line 7819 "configure" +#line 7830 "configure" #include "confdefs.h" @@ -7844,7 +7855,7 @@ printf("old\n"); ; return 0; } EOF -if { (eval echo configure:7848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -7867,7 +7878,7 @@ if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 -echo "configure:7871: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:7882: checking for $cf_ncuhdr_root include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7962,14 +7973,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext <<EOF -#line 7966 "configure" +#line 7977 "configure" #include "confdefs.h" #include <stdio.h> int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:7973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -7996,7 +8007,7 @@ done do cat > conftest.$ac_ext <<EOF -#line 8000 "configure" +#line 8011 "configure" #include "confdefs.h" @@ -8025,7 +8036,7 @@ printf("old\n"); ; return 0; } EOF -if { (eval echo configure:8029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -8072,14 +8083,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext <<EOF -#line 8076 "configure" +#line 8087 "configure" #include "confdefs.h" #include <stdio.h> int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:8083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -8134,7 +8145,7 @@ esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:8138: checking for ncurses version" >&5 +echo "configure:8149: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8160,7 +8171,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:8164: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:8175: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -8169,7 +8180,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 8173 "configure" +#line 8184 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -8193,7 +8204,7 @@ int main() exit(0); } EOF -if { (eval echo configure:8197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -8224,7 +8235,7 @@ cf_nculib_root=ncursesw cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:8228: checking for Gpm_Open in -lgpm" >&5 +echo "configure:8239: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8232,7 +8243,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 8236 "configure" +#line 8247 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8243,7 +8254,7 @@ int main() { Gpm_Open() ; return 0; } EOF -if { (eval echo configure:8247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8259,7 +8270,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:8263: checking for initscr in -lgpm" >&5 +echo "configure:8274: checking for initscr in -lgpm" >&5 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8267,7 +8278,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 8271 "configure" +#line 8282 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8278,7 +8289,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:8282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8309,7 +8320,7 @@ freebsd*) # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:8313: checking for tgoto in -lmytinfo" >&5 +echo "configure:8324: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8317,7 +8328,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 8321 "configure" +#line 8332 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8328,7 +8339,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:8332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8361,12 +8372,12 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:8365: checking for initscr" >&5 +echo "configure:8376: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8370 "configure" +#line 8381 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr(); below. */ @@ -8389,7 +8400,7 @@ initscr(); ; return 0; } EOF -if { (eval echo configure:8393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -8409,17 +8420,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:8413: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:8424: checking for initscr in -l$cf_nculib_root" >&5 LIBS="-l$cf_nculib_root $LIBS" cat > conftest.$ac_ext <<EOF -#line 8416 "configure" +#line 8427 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:8423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -8488,17 +8499,17 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 -echo "configure:8492: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:8503: checking for -l$cf_nculib_root in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 8495 "configure" +#line 8506 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:8502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -8529,7 +8540,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:8533: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:8544: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` @@ -8538,14 +8549,14 @@ echo "configure:8533: checking if we can link $cf_nculib_root without $cf_ncurse fi done cat > conftest.$ac_ext <<EOF -#line 8542 "configure" +#line 8553 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:8549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -8568,7 +8579,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:8572: checking for ncurses version" >&5 +echo "configure:8583: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8594,7 +8605,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:8598: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:8609: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -8603,7 +8614,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 8607 "configure" +#line 8618 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -8627,7 +8638,7 @@ int main() exit(0); } EOF -if { (eval echo configure:8631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -8656,20 +8667,20 @@ pdcurses) slang) echo $ac_n "checking for slang header file""... $ac_c" 1>&6 -echo "configure:8660: checking for slang header file" >&5 +echo "configure:8671: checking for slang header file" >&5 if eval "test \"`echo '$''{'cf_cv_slang_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8666 "configure" +#line 8677 "configure" #include "confdefs.h" #include <slang.h> int main() { printf("%s\n", SLANG_VERSION) ; return 0; } EOF -if { (eval echo configure:8673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_slang_header=predefined else @@ -8793,14 +8804,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext <<EOF -#line 8797 "configure" +#line 8808 "configure" #include "confdefs.h" #include <stdio.h> int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:8804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -8827,13 +8838,13 @@ esac # There's an unofficial set of patches for slang that gives it some limited # UTF8 capability. Unfortunately it won't compile unless one defines UTF8. echo $ac_n "checking if we must define UTF8""... $ac_c" 1>&6 -echo "configure:8831: checking if we must define UTF8" >&5 +echo "configure:8842: checking if we must define UTF8" >&5 if eval "test \"`echo '$''{'cf_cv_slang_utf8'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8837 "configure" +#line 8848 "configure" #include "confdefs.h" #include <slang.h> @@ -8841,7 +8852,7 @@ int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:8845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_slang_utf8=no else @@ -8850,7 +8861,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 8854 "configure" +#line 8865 "configure" #include "confdefs.h" #define UTF8 @@ -8859,7 +8870,7 @@ int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:8863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_slang_utf8=yes else @@ -8892,24 +8903,24 @@ else cf_cv_termlib=none cat > conftest.$ac_ext <<EOF -#line 8896 "configure" +#line 8907 "configure" #include "confdefs.h" int main() { char *x=(char*)tgoto("",0,0) ; return 0; } EOF -if { (eval echo configure:8903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 8906 "configure" +#line 8917 "configure" #include "confdefs.h" int main() { int x=tigetstr("") ; return 0; } EOF -if { (eval echo configure:8913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_termlib=terminfo else @@ -8938,16 +8949,16 @@ if test "$cf_cv_termlib" = none; then for cf_func in tigetstr tgetstr do echo $ac_n "checking for $cf_func in -l$cf_lib""... $ac_c" 1>&6 -echo "configure:8942: checking for $cf_func in -l$cf_lib" >&5 +echo "configure:8953: checking for $cf_func in -l$cf_lib" >&5 cat > conftest.$ac_ext <<EOF -#line 8944 "configure" +#line 8955 "configure" #include "confdefs.h" int main() { int x=$cf_func("") ; return 0; } EOF -if { (eval echo configure:8951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -8974,7 +8985,7 @@ fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 -echo "configure:8978: checking for initscr in -lcurses" >&5 +echo "configure:8989: checking for initscr in -lcurses" >&5 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8982,7 +8993,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 8986 "configure" +#line 8997 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8993,7 +9004,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:8997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9014,7 +9025,7 @@ else fi echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:9018: checking for tgoto in -ltermcap" >&5 +echo "configure:9029: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9022,7 +9033,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 9026 "configure" +#line 9037 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9033,7 +9044,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:9037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9065,12 +9076,12 @@ fi cf_slang_LIBS2="$LIBS" echo $ac_n "checking for acos""... $ac_c" 1>&6 -echo "configure:9069: checking for acos" >&5 +echo "configure:9080: checking for acos" >&5 if eval "test \"`echo '$''{'ac_cv_func_acos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9074 "configure" +#line 9085 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char acos(); below. */ @@ -9093,7 +9104,7 @@ acos(); ; return 0; } EOF -if { (eval echo configure:9097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_acos=yes" else @@ -9112,7 +9123,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for acos in -lm""... $ac_c" 1>&6 -echo "configure:9116: checking for acos in -lm" >&5 +echo "configure:9127: checking for acos in -lm" >&5 ac_lib_var=`echo m'_'acos | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9120,7 +9131,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 9124 "configure" +#line 9135 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9131,7 +9142,7 @@ int main() { acos() ; return 0; } EOF -if { (eval echo configure:9135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9173,12 +9184,12 @@ os2*) eval 'cf_cv_have_lib_'video'=no' cf_libdir="" echo $ac_n "checking for v_init""... $ac_c" 1>&6 -echo "configure:9177: checking for v_init" >&5 +echo "configure:9188: checking for v_init" >&5 if eval "test \"`echo '$''{'ac_cv_func_v_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9182 "configure" +#line 9193 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char v_init(); below. */ @@ -9201,7 +9212,7 @@ v_init(); ; return 0; } EOF -if { (eval echo configure:9205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_v_init=yes" else @@ -9221,17 +9232,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for v_init in -lvideo""... $ac_c" 1>&6 -echo "configure:9225: checking for v_init in -lvideo" >&5 +echo "configure:9236: checking for v_init in -lvideo" >&5 LIBS="-lvideo $LIBS" cat > conftest.$ac_ext <<EOF -#line 9228 "configure" +#line 9239 "configure" #include "confdefs.h" #include <sys/video.h> int main() { v_init() ; return 0; } EOF -if { (eval echo configure:9235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'video'=yes' @@ -9300,17 +9311,17 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -lvideo in $cf_libdir""... $ac_c" 1>&6 -echo "configure:9304: checking for -lvideo in $cf_libdir" >&5 +echo "configure:9315: checking for -lvideo in $cf_libdir" >&5 LIBS="-L$cf_libdir -lvideo $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 9307 "configure" +#line 9318 "configure" #include "confdefs.h" #include <sys/video.h> int main() { v_init() ; return 0; } EOF -if { (eval echo configure:9314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'video'=yes' @@ -9343,12 +9354,12 @@ esac eval 'cf_cv_have_lib_'slang'=no' cf_libdir="" echo $ac_n "checking for SLtt_get_screen_size""... $ac_c" 1>&6 -echo "configure:9347: checking for SLtt_get_screen_size" >&5 +echo "configure:9358: checking for SLtt_get_screen_size" >&5 if eval "test \"`echo '$''{'ac_cv_func_SLtt_get_screen_size'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9352 "configure" +#line 9363 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char SLtt_get_screen_size(); below. */ @@ -9371,7 +9382,7 @@ SLtt_get_screen_size(); ; return 0; } EOF -if { (eval echo configure:9375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_SLtt_get_screen_size=yes" else @@ -9391,17 +9402,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6 -echo "configure:9395: checking for SLtt_get_screen_size in -lslang" >&5 +echo "configure:9406: checking for SLtt_get_screen_size in -lslang" >&5 LIBS="-lslang $LIBS" cat > conftest.$ac_ext <<EOF -#line 9398 "configure" +#line 9409 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:9405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'slang'=yes' @@ -9470,17 +9481,17 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -lslang in $cf_libdir""... $ac_c" 1>&6 -echo "configure:9474: checking for -lslang in $cf_libdir" >&5 +echo "configure:9485: checking for -lslang in $cf_libdir" >&5 LIBS="-L$cf_libdir -lslang $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 9477 "configure" +#line 9488 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:9484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'slang'=yes' @@ -9509,7 +9520,7 @@ fi cf_slang_LIBS3="$LIBS" echo $ac_n "checking if we can link slang without termcap""... $ac_c" 1>&6 -echo "configure:9513: checking if we can link slang without termcap" >&5 +echo "configure:9524: checking if we can link slang without termcap" >&5 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'` else @@ -9517,14 +9528,14 @@ else fi LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'` cat > conftest.$ac_ext <<EOF -#line 9521 "configure" +#line 9532 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:9528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -9541,13 +9552,13 @@ test $cf_result = no && LIBS="$cf_slang_LIBS3" echo $ac_n "checking if we must tell slang this is UNIX""... $ac_c" 1>&6 -echo "configure:9545: checking if we must tell slang this is UNIX" >&5 +echo "configure:9556: checking if we must tell slang this is UNIX" >&5 if eval "test \"`echo '$''{'cf_cv_slang_unix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9551 "configure" +#line 9562 "configure" #include "confdefs.h" #include <slang.h> int main() { @@ -9561,7 +9572,7 @@ SLang_TT_Baud_Rate = 1 ; return 0; } EOF -if { (eval echo configure:9565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_slang_unix=yes else @@ -9587,7 +9598,7 @@ eval cf_libdir=$libdir cf_libdir=`echo $cf_libdir | sed -e s%'^NONE/'%$prefix/% -e s%'^NONE/'%$ac_default_prefix/%` echo $ac_n "checking for location of config-file""... $ac_c" 1>&6 -echo "configure:9591: checking for location of config-file" >&5 +echo "configure:9602: checking for location of config-file" >&5 LYNX_CFG_FILE=$cf_libdir/lynx.cfg cat >> confdefs.h <<EOF #define LYNX_CFG_FILE "$LYNX_CFG_FILE" @@ -9599,7 +9610,7 @@ CHARSET_DEFS= echo $ac_n "checking if you want only a few charsets""... $ac_c" 1>&6 -echo "configure:9603: checking if you want only a few charsets" >&5 +echo "configure:9614: checking if you want only a few charsets" >&5 # Check whether --with-charsets or --without-charsets was given. if test "${with_charsets+set}" = set; then @@ -9660,12 +9671,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:9664: checking for ANSI C header files" >&5 +echo "configure:9675: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9669 "configure" +#line 9680 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -9673,7 +9684,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9690,7 +9701,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 9694 "configure" +#line 9705 "configure" #include "confdefs.h" #include <string.h> EOF @@ -9708,7 +9719,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 9712 "configure" +#line 9723 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -9729,7 +9740,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 9733 "configure" +#line 9744 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -9740,7 +9751,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:9744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -9764,12 +9775,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:9768: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:9779: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9773 "configure" +#line 9784 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -9778,7 +9789,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:9782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -9803,12 +9814,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:9807: checking for $ac_hdr that defines DIR" >&5 +echo "configure:9818: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9812 "configure" +#line 9823 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -9816,7 +9827,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:9820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -9841,7 +9852,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 $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:9845: checking for opendir in -ldir" >&5 +echo "configure:9856: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9849,7 +9860,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 9853 "configure" +#line 9864 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9860,7 +9871,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:9864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9882,7 +9893,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:9886: checking for opendir in -lx" >&5 +echo "configure:9897: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9890,7 +9901,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 9894 "configure" +#line 9905 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9901,7 +9912,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:9905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9944,17 +9955,17 @@ for ac_hdr in \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9948: checking for $ac_hdr" >&5 +echo "configure:9959: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9953 "configure" +#line 9964 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9969: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9982,13 +9993,13 @@ done echo $ac_n "checking termio.h and termios.h""... $ac_c" 1>&6 -echo "configure:9986: checking termio.h and termios.h" >&5 +echo "configure:9997: checking termio.h and termios.h" >&5 if eval "test \"`echo '$''{'cf_cv_termio_and_termios'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9992 "configure" +#line 10003 "configure" #include "confdefs.h" #if HAVE_TERMIO_H @@ -10001,7 +10012,7 @@ int main() { putchar (0x0a) ; return 0; } EOF -if { (eval echo configure:10005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_termio_and_termios=yes else @@ -10021,13 +10032,13 @@ EOF echo $ac_n "checking for sigaction and structs""... $ac_c" 1>&6 -echo "configure:10025: checking for sigaction and structs" >&5 +echo "configure:10036: checking for sigaction and structs" >&5 if eval "test \"`echo '$''{'cf_cv_func_sigaction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10031 "configure" +#line 10042 "configure" #include "confdefs.h" #include <sys/types.h> @@ -10042,7 +10053,7 @@ struct sigaction act; ; return 0; } EOF -if { (eval echo configure:10046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_func_sigaction=yes else @@ -10066,17 +10077,17 @@ for ac_hdr in sys/wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10070: checking for $ac_hdr" >&5 +echo "configure:10081: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10075 "configure" +#line 10086 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10113,17 +10124,17 @@ for ac_hdr in wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10117: checking for $ac_hdr" >&5 +echo "configure:10128: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10122 "configure" +#line 10133 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10153,17 +10164,17 @@ for ac_hdr in waitstatus.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10157: checking for $ac_hdr" >&5 +echo "configure:10168: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10162 "configure" +#line 10173 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10204,13 +10215,13 @@ fi echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:10208: checking for union wait" >&5 +echo "configure:10219: checking for union wait" >&5 if eval "test \"`echo '$''{'cf_cv_type_unionwait'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10214 "configure" +#line 10225 "configure" #include "confdefs.h" $cf_wait_headers int main() { @@ -10221,7 +10232,7 @@ int x; ; return 0; } EOF -if { (eval echo configure:10225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_type_unionwait=no echo compiles ok w/o union wait 1>&5 @@ -10232,7 +10243,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 10236 "configure" +#line 10247 "configure" #include "confdefs.h" $cf_wait_headers int main() { @@ -10247,7 +10258,7 @@ union wait x; ; return 0; } EOF -if { (eval echo configure:10251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_type_unionwait=yes echo compiles ok with union wait and possibly macros too 1>&5 @@ -10274,20 +10285,20 @@ EOF if test $cf_cv_type_unionwait = yes; then echo $ac_n "checking if union wait can be used as wait-arg""... $ac_c" 1>&6 -echo "configure:10278: checking if union wait can be used as wait-arg" >&5 +echo "configure:10289: checking if union wait can be used as wait-arg" >&5 if eval "test \"`echo '$''{'cf_cv_arg_union_wait'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10284 "configure" +#line 10295 "configure" #include "confdefs.h" $cf_wait_headers int main() { union wait x; wait(&x) ; return 0; } EOF -if { (eval echo configure:10291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_arg_union_wait=yes else @@ -10307,20 +10318,20 @@ EOF echo $ac_n "checking if union wait can be used as waitpid-arg""... $ac_c" 1>&6 -echo "configure:10311: checking if union wait can be used as waitpid-arg" >&5 +echo "configure:10322: checking if union wait can be used as waitpid-arg" >&5 if eval "test \"`echo '$''{'cf_cv_arg_union_waitpid'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10317 "configure" +#line 10328 "configure" #include "confdefs.h" $cf_wait_headers int main() { union wait x; waitpid(0, &x, 0) ; return 0; } EOF -if { (eval echo configure:10324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_arg_union_waitpid=yes else @@ -10346,17 +10357,17 @@ for ac_hdr in stdarg.h varargs.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10350: checking for $ac_hdr" >&5 +echo "configure:10361: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10355 "configure" +#line 10366 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10383,13 +10394,13 @@ fi done echo $ac_n "checking for standard varargs""... $ac_c" 1>&6 -echo "configure:10387: checking for standard varargs" >&5 +echo "configure:10398: checking for standard varargs" >&5 if eval "test \"`echo '$''{'cf_cv_ansi_varargs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10393 "configure" +#line 10404 "configure" #include "confdefs.h" #if HAVE_STDARG_H @@ -10404,7 +10415,7 @@ int main() { return 0;} int foo(char *fmt,...){va_list args;va_start(args,fmt);va_end(args) ; return 0; } EOF -if { (eval echo configure:10408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_varargs=yes else @@ -10424,12 +10435,12 @@ EOF echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:10428: checking for uid_t in sys/types.h" >&5 +echo "configure:10439: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10433 "configure" +#line 10444 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -10458,7 +10469,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:10462: checking type of array argument to getgroups" >&5 +echo "configure:10473: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10466,7 +10477,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <<EOF -#line 10470 "configure" +#line 10481 "configure" #include "confdefs.h" /* Thanks to Mike Rendell for this test. */ @@ -10491,7 +10502,7 @@ main() } EOF -if { (eval echo configure:10495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -10505,7 +10516,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext <<EOF -#line 10509 "configure" +#line 10520 "configure" #include "confdefs.h" #include <unistd.h> EOF @@ -10529,12 +10540,12 @@ EOF echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:10533: checking for pid_t" >&5 +echo "configure:10544: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10538 "configure" +#line 10549 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -10562,12 +10573,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:10566: checking for uid_t in sys/types.h" >&5 +echo "configure:10577: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10571 "configure" +#line 10582 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -10596,12 +10607,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:10600: checking for mode_t" >&5 +echo "configure:10611: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10605 "configure" +#line 10616 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -10633,19 +10644,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:10637: checking for working alloca.h" >&5 +echo "configure:10648: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10642 "configure" +#line 10653 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:10649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -10666,12 +10677,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:10670: checking for alloca" >&5 +echo "configure:10681: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10675 "configure" +#line 10686 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -10699,7 +10710,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:10703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -10731,12 +10742,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:10735: checking whether alloca needs Cray hooks" >&5 +echo "configure:10746: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10740 "configure" +#line 10751 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -10761,12 +10772,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10765: checking for $ac_func" >&5 +echo "configure:10776: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10770 "configure" +#line 10781 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -10789,7 +10800,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:10793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10816,7 +10827,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:10820: checking stack direction for C alloca" >&5 +echo "configure:10831: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10824,7 +10835,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 10828 "configure" +#line 10839 "configure" #include "confdefs.h" find_stack_direction () { @@ -10843,7 +10854,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:10847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -10866,17 +10877,17 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:10870: checking for vfork.h" >&5 +echo "configure:10881: checking for vfork.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10875 "configure" +#line 10886 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10901,18 +10912,18 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:10905: checking for working vfork" >&5 +echo "configure:10916: checking for working vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then echo $ac_n "checking for vfork""... $ac_c" 1>&6 -echo "configure:10911: checking for vfork" >&5 +echo "configure:10922: checking for vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10916 "configure" +#line 10927 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vfork(); below. */ @@ -10935,7 +10946,7 @@ vfork(); ; return 0; } EOF -if { (eval echo configure:10939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -10957,7 +10968,7 @@ fi ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext <<EOF -#line 10961 "configure" +#line 10972 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -11052,7 +11063,7 @@ main() { } } EOF -if { (eval echo configure:11056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -11076,13 +11087,13 @@ fi echo $ac_n "checking if we should use fcntl or ioctl""... $ac_c" 1>&6 -echo "configure:11080: checking if we should use fcntl or ioctl" >&5 +echo "configure:11091: checking if we should use fcntl or ioctl" >&5 if eval "test \"`echo '$''{'cf_cv_fionbio'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11086 "configure" +#line 11097 "configure" #include "confdefs.h" #include <sys/types.h> @@ -11094,7 +11105,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_fionbio=ioctl else @@ -11103,7 +11114,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 11107 "configure" +#line 11118 "configure" #include "confdefs.h" #include <sys/types.h> @@ -11120,7 +11131,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_fionbio=fcntl else @@ -11143,20 +11154,20 @@ EOF echo $ac_n "checking for broken/missing definition of remove""... $ac_c" 1>&6 -echo "configure:11147: checking for broken/missing definition of remove" >&5 +echo "configure:11158: checking for broken/missing definition of remove" >&5 if eval "test \"`echo '$''{'cf_cv_baddef_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11153 "configure" +#line 11164 "configure" #include "confdefs.h" #include <stdio.h> int main() { remove("dummy") ; return 0; } EOF -if { (eval echo configure:11160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_baddef_remove=no else @@ -11164,7 +11175,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 11168 "configure" +#line 11179 "configure" #include "confdefs.h" #include <stdio.h> int __unlink(name) { return unlink(name); } @@ -11172,7 +11183,7 @@ int main() { remove("dummy") ; return 0; } EOF -if { (eval echo configure:11176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_baddef_remove=yes else @@ -11196,13 +11207,13 @@ EOF echo $ac_n "checking for lstat""... $ac_c" 1>&6 -echo "configure:11200: checking for lstat" >&5 +echo "configure:11211: checking for lstat" >&5 if eval "test \"`echo '$''{'ac_cv_func_lstat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11206 "configure" +#line 11217 "configure" #include "confdefs.h" #include <sys/types.h> @@ -11211,7 +11222,7 @@ int main() { lstat(".", (struct stat *)0) ; return 0; } EOF -if { (eval echo configure:11215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_lstat=yes else @@ -11254,12 +11265,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11258: checking for $ac_func" >&5 +echo "configure:11269: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11263 "configure" +#line 11274 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -11282,7 +11293,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:11286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11312,12 +11323,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11316: checking for $ac_func" >&5 +echo "configure:11327: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11321 "configure" +#line 11332 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -11340,7 +11351,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:11344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11369,7 +11380,7 @@ done echo $ac_n "checking for random-integer functions""... $ac_c" 1>&6 -echo "configure:11373: checking for random-integer functions" >&5 +echo "configure:11384: checking for random-integer functions" >&5 if eval "test \"`echo '$''{'cf_cv_srand_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11380,7 +11391,7 @@ do cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'` cf_rand_func=`echo $cf_func | sed -e 's%.*/%%'` cat > conftest.$ac_ext <<EOF -#line 11384 "configure" +#line 11395 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -11394,7 +11405,7 @@ int main() { long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func() ; return 0; } EOF -if { (eval echo configure:11398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_srand_func=$cf_func break @@ -11410,7 +11421,7 @@ fi echo "$ac_t""$cf_cv_srand_func" 1>&6 if test "$cf_cv_srand_func" != unknown ; then echo $ac_n "checking for range of random-integers""... $ac_c" 1>&6 -echo "configure:11414: checking for range of random-integers" >&5 +echo "configure:11425: checking for range of random-integers" >&5 if eval "test \"`echo '$''{'cf_cv_rand_max'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11426,7 +11437,7 @@ else ;; esac cat > conftest.$ac_ext <<EOF -#line 11430 "configure" +#line 11441 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -11440,7 +11451,7 @@ int main() { long x = $cf_cv_rand_max ; return 0; } EOF -if { (eval echo configure:11444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -11476,12 +11487,12 @@ for ac_func in strstr do echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6 -echo "configure:11480: checking for $ac_func declaration" >&5 +echo "configure:11491: checking for $ac_func declaration" >&5 if eval "test \"`echo '$''{'ac_cv_func_decl_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11485 "configure" +#line 11496 "configure" #include "confdefs.h" #include <string.h> int main() { @@ -11490,11 +11501,11 @@ extern int ${ac_func}(); #endif ; return 0; } EOF -if { (eval echo configure:11494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 11498 "configure" +#line 11509 "configure" #include "confdefs.h" #include <string.h> int main() { @@ -11503,7 +11514,7 @@ int (*p)() = ${ac_func}; #endif ; return 0; } EOF -if { (eval echo configure:11507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_decl_$ac_func=yes" @@ -11545,12 +11556,12 @@ for ac_func in getgrgid getgrnam do echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6 -echo "configure:11549: checking for $ac_func declaration" >&5 +echo "configure:11560: checking for $ac_func declaration" >&5 if eval "test \"`echo '$''{'ac_cv_func_decl_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11554 "configure" +#line 11565 "configure" #include "confdefs.h" #include <stdio.h> @@ -11561,11 +11572,11 @@ extern int ${ac_func}(); #endif ; return 0; } EOF -if { (eval echo configure:11565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 11569 "configure" +#line 11580 "configure" #include "confdefs.h" #include <stdio.h> @@ -11576,7 +11587,7 @@ int (*p)() = ${ac_func}; #endif ; return 0; } EOF -if { (eval echo configure:11580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_decl_$ac_func=yes" @@ -11618,13 +11629,13 @@ done echo $ac_n "checking if TRUE/FALSE are defined""... $ac_c" 1>&6 -echo "configure:11622: checking if TRUE/FALSE are defined" >&5 +echo "configure:11633: checking if TRUE/FALSE are defined" >&5 if eval "test \"`echo '$''{'cf_cv_bool_defs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11628 "configure" +#line 11639 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -11633,7 +11644,7 @@ int main() { int x = TRUE, y = FALSE ; return 0; } EOF -if { (eval echo configure:11637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_bool_defs=yes else @@ -11660,13 +11671,13 @@ fi echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6 -echo "configure:11664: checking if external errno is declared" >&5 +echo "configure:11675: checking if external errno is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11670 "configure" +#line 11681 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -11679,7 +11690,7 @@ int main() { long x = (long) errno ; return 0; } EOF -if { (eval echo configure:11683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_errno=yes else @@ -11707,13 +11718,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external errno exists""... $ac_c" 1>&6 -echo "configure:11711: checking if external errno exists" >&5 +echo "configure:11722: checking if external errno exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11717 "configure" +#line 11728 "configure" #include "confdefs.h" #undef errno @@ -11723,7 +11734,7 @@ int main() { errno = 2 ; return 0; } EOF -if { (eval echo configure:11727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_errno=yes else @@ -11753,21 +11764,21 @@ fi echo $ac_n "checking if we can set errno""... $ac_c" 1>&6 -echo "configure:11757: checking if we can set errno" >&5 +echo "configure:11768: checking if we can set errno" >&5 if eval "test \"`echo '$''{'cf_cv_set_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext <<EOF -#line 11764 "configure" +#line 11775 "configure" #include "confdefs.h" #include <errno.h> int main() { errno = 255 ; return 0; } EOF -if { (eval echo configure:11771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_set_errno=maybe else @@ -11779,7 +11790,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext <<EOF -#line 11783 "configure" +#line 11794 "configure" #include "confdefs.h" #include <errno.h> @@ -11789,7 +11800,7 @@ int main() exit(errno != 255); } EOF -if { (eval echo configure:11793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_set_errno=yes else @@ -11812,20 +11823,20 @@ EOF echo $ac_n "checking for setlocale()""... $ac_c" 1>&6 -echo "configure:11816: checking for setlocale()" >&5 +echo "configure:11827: checking for setlocale()" >&5 if eval "test \"`echo '$''{'cf_cv_locale'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11822 "configure" +#line 11833 "configure" #include "confdefs.h" #include <locale.h> int main() { setlocale(LC_ALL, "") ; return 0; } EOF -if { (eval echo configure:11829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_locale=yes else @@ -11846,13 +11857,13 @@ EOF echo $ac_n "checking if NGROUPS is defined""... $ac_c" 1>&6 -echo "configure:11850: checking if NGROUPS is defined" >&5 +echo "configure:11861: checking if NGROUPS is defined" >&5 if eval "test \"`echo '$''{'cf_cv_ngroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11856 "configure" +#line 11867 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -11866,7 +11877,7 @@ int main() { int x = NGROUPS ; return 0; } EOF -if { (eval echo configure:11870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ngroups=yes else @@ -11874,7 +11885,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 11878 "configure" +#line 11889 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -11888,7 +11899,7 @@ int main() { int x = NGROUPS_MAX ; return 0; } EOF -if { (eval echo configure:11892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ngroups=NGROUPS_MAX else @@ -11920,13 +11931,13 @@ fi echo $ac_n "checking if external sys_nerr is declared""... $ac_c" 1>&6 -echo "configure:11924: checking if external sys_nerr is declared" >&5 +echo "configure:11935: checking if external sys_nerr is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_sys_nerr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11930 "configure" +#line 11941 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -11939,7 +11950,7 @@ int main() { long x = (long) sys_nerr ; return 0; } EOF -if { (eval echo configure:11943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_nerr=yes else @@ -11967,13 +11978,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external sys_nerr exists""... $ac_c" 1>&6 -echo "configure:11971: checking if external sys_nerr exists" >&5 +echo "configure:11982: checking if external sys_nerr exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_sys_nerr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11977 "configure" +#line 11988 "configure" #include "confdefs.h" #undef sys_nerr @@ -11983,7 +11994,7 @@ int main() { sys_nerr = 2 ; return 0; } EOF -if { (eval echo configure:11987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_sys_nerr=yes else @@ -12012,13 +12023,13 @@ fi echo $ac_n "checking if external sys_errlist is declared""... $ac_c" 1>&6 -echo "configure:12016: checking if external sys_errlist is declared" >&5 +echo "configure:12027: checking if external sys_errlist is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_sys_errlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12022 "configure" +#line 12033 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -12031,7 +12042,7 @@ int main() { long x = (long) sys_errlist ; return 0; } EOF -if { (eval echo configure:12035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_errlist=yes else @@ -12059,13 +12070,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external sys_errlist exists""... $ac_c" 1>&6 -echo "configure:12063: checking if external sys_errlist exists" >&5 +echo "configure:12074: checking if external sys_errlist exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_sys_errlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12069 "configure" +#line 12080 "configure" #include "confdefs.h" #undef sys_errlist @@ -12075,7 +12086,7 @@ int main() { sys_errlist = 2 ; return 0; } EOF -if { (eval echo configure:12079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_sys_errlist=yes else @@ -12108,17 +12119,17 @@ for ac_hdr in lastlog.h paths.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12112: checking for $ac_hdr" >&5 +echo "configure:12123: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12117 "configure" +#line 12128 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12145,13 +12156,13 @@ fi done echo $ac_n "checking for lastlog path""... $ac_c" 1>&6 -echo "configure:12149: checking for lastlog path" >&5 +echo "configure:12160: checking for lastlog path" >&5 if eval "test \"`echo '$''{'cf_cv_path_lastlog'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12155 "configure" +#line 12166 "configure" #include "confdefs.h" #include <sys/types.h> @@ -12166,7 +12177,7 @@ int main() { char *path = _PATH_LASTLOG ; return 0; } EOF -if { (eval echo configure:12170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_path_lastlog="_PATH_LASTLOG" else @@ -12193,7 +12204,7 @@ EOF echo $ac_n "checking for utmp implementation""... $ac_c" 1>&6 -echo "configure:12197: checking for utmp implementation" >&5 +echo "configure:12208: checking for utmp implementation" >&5 if eval "test \"`echo '$''{'cf_cv_have_utmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12209,7 +12220,7 @@ cf_utmp_includes=" #endif " cat > conftest.$ac_ext <<EOF -#line 12213 "configure" +#line 12224 "configure" #include "confdefs.h" $cf_utmp_includes int main() { @@ -12218,7 +12229,7 @@ struct $cf_header x; ; return 0; } EOF -if { (eval echo configure:12222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp=$cf_header break @@ -12228,7 +12239,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 12232 "configure" +#line 12243 "configure" #include "confdefs.h" $cf_utmp_includes int main() { @@ -12237,7 +12248,7 @@ struct $cf_header x; ; return 0; } EOF -if { (eval echo configure:12241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp=$cf_header break @@ -12267,13 +12278,13 @@ EOF if test $cf_cv_have_utmp != no ; then echo $ac_n "checking if utmp.ut_host is declared""... $ac_c" 1>&6 -echo "configure:12271: checking if utmp.ut_host is declared" >&5 +echo "configure:12282: checking if utmp.ut_host is declared" >&5 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_host'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12277 "configure" +#line 12288 "configure" #include "confdefs.h" #include <sys/types.h> @@ -12282,7 +12293,7 @@ int main() { struct $cf_cv_have_utmp x; char *y = &x.ut_host[0] ; return 0; } EOF -if { (eval echo configure:12286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp_ut_host=yes else @@ -12305,7 +12316,7 @@ fi if test $cf_cv_have_utmp != no ; then echo $ac_n "checking if utmp.ut_name is declared""... $ac_c" 1>&6 -echo "configure:12309: checking if utmp.ut_name is declared" >&5 +echo "configure:12320: checking if utmp.ut_name is declared" >&5 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_name'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12321,7 +12332,7 @@ cf_utmp_includes=" " for cf_header in ut_name ut_user ; do cat > conftest.$ac_ext <<EOF -#line 12325 "configure" +#line 12336 "configure" #include "confdefs.h" $cf_utmp_includes int main() { @@ -12330,7 +12341,7 @@ struct $cf_cv_have_utmp x; ; return 0; } EOF -if { (eval echo configure:12334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp_ut_name=$cf_header break @@ -12361,7 +12372,7 @@ fi if test $cf_cv_have_utmp != no ; then echo $ac_n "checking for exit-status in $cf_cv_have_utmp""... $ac_c" 1>&6 -echo "configure:12365: checking for exit-status in $cf_cv_have_utmp" >&5 +echo "configure:12376: checking for exit-status in $cf_cv_have_utmp" >&5 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_xstatus'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12373,7 +12384,7 @@ for cf_result in \ ut_exit.ut_exit do cat > conftest.$ac_ext <<EOF -#line 12377 "configure" +#line 12388 "configure" #include "confdefs.h" #include <sys/types.h> @@ -12382,7 +12393,7 @@ int main() { struct $cf_cv_have_utmp x; long y = x.$cf_result = 0 ; return 0; } EOF -if { (eval echo configure:12386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp_ut_xstatus=$cf_result break @@ -12413,13 +12424,13 @@ fi if test $cf_cv_have_utmp != no ; then echo $ac_n "checking if utmp.ut_xtime is declared""... $ac_c" 1>&6 -echo "configure:12417: checking if utmp.ut_xtime is declared" >&5 +echo "configure:12428: checking if utmp.ut_xtime is declared" >&5 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_xtime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12423 "configure" +#line 12434 "configure" #include "confdefs.h" #include <sys/types.h> @@ -12428,7 +12439,7 @@ int main() { struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0 ; return 0; } EOF -if { (eval echo configure:12432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp_ut_xtime=yes else @@ -12436,7 +12447,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 12440 "configure" +#line 12451 "configure" #include "confdefs.h" #include <sys/types.h> @@ -12445,7 +12456,7 @@ int main() { struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec ; return 0; } EOF -if { (eval echo configure:12449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp_ut_xtime=define else @@ -12479,13 +12490,13 @@ fi if test $cf_cv_have_utmp != no ; then echo $ac_n "checking if utmp.ut_session is declared""... $ac_c" 1>&6 -echo "configure:12483: checking if utmp.ut_session is declared" >&5 +echo "configure:12494: checking if utmp.ut_session is declared" >&5 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_session'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12489 "configure" +#line 12500 "configure" #include "confdefs.h" #include <sys/types.h> @@ -12494,7 +12505,7 @@ int main() { struct $cf_cv_have_utmp x; long y = x.ut_session ; return 0; } EOF -if { (eval echo configure:12498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp_ut_session=yes else @@ -12518,14 +12529,14 @@ fi echo $ac_n "checking if $cf_cv_have_utmp is SYSV flavor""... $ac_c" 1>&6 -echo "configure:12522: checking if $cf_cv_have_utmp is SYSV flavor" >&5 +echo "configure:12533: checking if $cf_cv_have_utmp is SYSV flavor" >&5 if eval "test \"`echo '$''{'cf_cv_sysv_utmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx" cat > conftest.$ac_ext <<EOF -#line 12529 "configure" +#line 12540 "configure" #include "confdefs.h" #include <sys/types.h> @@ -12539,7 +12550,7 @@ struct $cf_cv_have_utmp x; end${cf_prefix}ent(); ; return 0; } EOF -if { (eval echo configure:12543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_sysv_utmp=yes else @@ -12562,13 +12573,13 @@ fi echo $ac_n "checking if external h_errno exists""... $ac_c" 1>&6 -echo "configure:12566: checking if external h_errno exists" >&5 +echo "configure:12577: checking if external h_errno exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_h_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12572 "configure" +#line 12583 "configure" #include "confdefs.h" #undef h_errno @@ -12578,7 +12589,7 @@ int main() { h_errno = 2 ; return 0; } EOF -if { (eval echo configure:12582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_h_errno=yes else @@ -12609,7 +12620,7 @@ fi echo $ac_n "checking if bibp: URLs should be supported""... $ac_c" 1>&6 -echo "configure:12613: checking if bibp: URLs should be supported" >&5 +echo "configure:12624: checking if bibp: URLs should be supported" >&5 # Check whether --enable-bibp-urls or --disable-bibp-urls was given. if test "${enable_bibp_urls+set}" = set; then @@ -12633,7 +12644,7 @@ EOF echo $ac_n "checking if configuration info should be browsable""... $ac_c" 1>&6 -echo "configure:12637: checking if configuration info should be browsable" >&5 +echo "configure:12648: checking if configuration info should be browsable" >&5 # Check whether --enable-config-info or --disable-config-info was given. if test "${enable_config_info+set}" = set; then @@ -12657,7 +12668,7 @@ EOF echo $ac_n "checking if new-style forms-based options screen should be used""... $ac_c" 1>&6 -echo "configure:12661: checking if new-style forms-based options screen should be used" >&5 +echo "configure:12672: checking if new-style forms-based options screen should be used" >&5 # Check whether --enable-forms-options or --disable-forms-options was given. if test "${enable_forms_options+set}" = set; then @@ -12681,7 +12692,7 @@ EOF echo $ac_n "checking if old-style options menu should be used""... $ac_c" 1>&6 -echo "configure:12685: checking if old-style options menu should be used" >&5 +echo "configure:12696: checking if old-style options menu should be used" >&5 # Check whether --enable-menu-options or --disable-menu-options was given. if test "${enable_menu_options+set}" = set; then @@ -12705,7 +12716,7 @@ EOF echo $ac_n "checking if experimental address-list page should be used""... $ac_c" 1>&6 -echo "configure:12709: checking if experimental address-list page should be used" >&5 +echo "configure:12720: checking if experimental address-list page should be used" >&5 # Check whether --enable-addrlist-page or --disable-addrlist-page was given. if test "${enable_addrlist_page+set}" = set; then @@ -12729,7 +12740,7 @@ EOF echo $ac_n "checking if experimental charset-selection logic should be used""... $ac_c" 1>&6 -echo "configure:12733: checking if experimental charset-selection logic should be used" >&5 +echo "configure:12744: checking if experimental charset-selection logic should be used" >&5 # Check whether --enable-charset-choice or --disable-charset-choice was given. if test "${enable_charset_choice+set}" = set; then @@ -12753,7 +12764,7 @@ EOF echo $ac_n "checking if experimental CJK logic should be used""... $ac_c" 1>&6 -echo "configure:12757: checking if experimental CJK logic should be used" >&5 +echo "configure:12768: checking if experimental CJK logic should be used" >&5 # Check whether --enable-cjk or --disable-cjk was given. if test "${enable_cjk+set}" = set; then @@ -12777,7 +12788,7 @@ EOF echo $ac_n "checking if color-style code should be used""... $ac_c" 1>&6 -echo "configure:12781: checking if color-style code should be used" >&5 +echo "configure:12792: checking if color-style code should be used" >&5 # Check whether --enable-color-style or --disable-color-style was given. if test "${enable_color_style+set}" = set; then @@ -12808,7 +12819,7 @@ EOF echo "$ac_t""yes" 1>&6 echo $ac_n "checking for location of style-sheet file""... $ac_c" 1>&6 -echo "configure:12812: checking for location of style-sheet file" >&5 +echo "configure:12823: checking for location of style-sheet file" >&5 LYNX_LSS_FILE=$cf_libdir/lynx.lss cat >> confdefs.h <<EOF #define LYNX_LSS_FILE "$LYNX_LSS_FILE" @@ -12829,7 +12840,7 @@ esac if test "$use_dft_colors" != no ; then echo $ac_n "checking if you want to use default-colors""... $ac_c" 1>&6 -echo "configure:12833: checking if you want to use default-colors" >&5 +echo "configure:12844: checking if you want to use default-colors" >&5 # Check whether --enable-default-colors or --disable-default-colors was given. if test "${enable_default_colors+set}" = set; then @@ -12854,7 +12865,7 @@ EOF fi echo $ac_n "checking if experimental htmlized lynx.cfg should be built""... $ac_c" 1>&6 -echo "configure:12858: checking if experimental htmlized lynx.cfg should be built" >&5 +echo "configure:12869: checking if experimental htmlized lynx.cfg should be built" >&5 # Check whether --enable-htmlized-cfg or --disable-htmlized-cfg was given. if test "${enable_htmlized_cfg+set}" = set; then @@ -12884,7 +12895,7 @@ fi ### check for ipv6 support echo $ac_n "checking whether to enable ipv6""... $ac_c" 1>&6 -echo "configure:12888: checking whether to enable ipv6" >&5 +echo "configure:12899: checking whether to enable ipv6" >&5 # Check whether --enable-ipv6 or --disable-ipv6 was given. if test "${enable_ipv6+set}" = set; then @@ -12905,7 +12916,7 @@ if test "$enableval" = "yes"; then echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6 -echo "configure:12909: checking ipv6 stack type" >&5 +echo "configure:12920: checking ipv6 stack type" >&5 if eval "test \"`echo '$''{'cf_cv_ipv6type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12925,7 +12936,7 @@ do ;; inria) #(vi cat > conftest.$ac_ext <<EOF -#line 12929 "configure" +#line 12940 "configure" #include "confdefs.h" #include <netinet/in.h> @@ -12943,7 +12954,7 @@ rm -f conftest* ;; kame) #(vi cat > conftest.$ac_ext <<EOF -#line 12947 "configure" +#line 12958 "configure" #include "confdefs.h" #include <netinet/in.h> @@ -12961,7 +12972,7 @@ rm -f conftest* ;; linux-glibc) #(vi cat > conftest.$ac_ext <<EOF -#line 12965 "configure" +#line 12976 "configure" #include "confdefs.h" #include <features.h> @@ -12988,7 +12999,7 @@ rm -f conftest* ;; toshiba) #(vi cat > conftest.$ac_ext <<EOF -#line 12992 "configure" +#line 13003 "configure" #include "confdefs.h" #include <sys/param.h> @@ -13006,7 +13017,7 @@ rm -f conftest* ;; v6d) #(vi cat > conftest.$ac_ext <<EOF -#line 13010 "configure" +#line 13021 "configure" #include "confdefs.h" #include </usr/local/v6/include/sys/v6config.h> @@ -13024,7 +13035,7 @@ rm -f conftest* ;; zeta) cat > conftest.$ac_ext <<EOF -#line 13028 "configure" +#line 13039 "configure" #include "confdefs.h" #include <sys/param.h> @@ -13057,7 +13068,7 @@ cf_ipv6lib=none cf_ipv6dir=none echo $ac_n "checking for IPv6 library if required""... $ac_c" 1>&6 -echo "configure:13061: checking for IPv6 library if required" >&5 +echo "configure:13072: checking for IPv6 library if required" >&5 case $cf_cv_ipv6type in #(vi solaris) #(vi ;; @@ -13091,7 +13102,7 @@ echo "$ac_t""$cf_ipv6lib" 1>&6 if test "$cf_ipv6lib" != "none"; then cat > conftest.$ac_ext <<EOF -#line 13095 "configure" +#line 13106 "configure" #include "confdefs.h" #include <sys/types.h> @@ -13102,7 +13113,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:13106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -13199,12 +13210,12 @@ rm -f conftest* eval 'cf_cv_have_lib_'$cf_ipv6lib'=no' cf_libdir="" echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:13203: checking for getaddrinfo" >&5 +echo "configure:13214: checking for getaddrinfo" >&5 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13208 "configure" +#line 13219 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getaddrinfo(); below. */ @@ -13227,7 +13238,7 @@ getaddrinfo(); ; return 0; } EOF -if { (eval echo configure:13231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getaddrinfo=yes" else @@ -13247,10 +13258,10 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for getaddrinfo in -l$cf_ipv6lib""... $ac_c" 1>&6 -echo "configure:13251: checking for getaddrinfo in -l$cf_ipv6lib" >&5 +echo "configure:13262: checking for getaddrinfo in -l$cf_ipv6lib" >&5 LIBS="-l$cf_ipv6lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 13254 "configure" +#line 13265 "configure" #include "confdefs.h" #include <sys/types.h> @@ -13261,7 +13272,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:13265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' @@ -13330,10 +13341,10 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_ipv6lib in $cf_libdir""... $ac_c" 1>&6 -echo "configure:13334: checking for -l$cf_ipv6lib in $cf_libdir" >&5 +echo "configure:13345: checking for -l$cf_ipv6lib in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 13337 "configure" +#line 13348 "configure" #include "confdefs.h" #include <sys/types.h> @@ -13344,7 +13355,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:13348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' @@ -13377,7 +13388,7 @@ fi echo $ac_n "checking working getaddrinfo""... $ac_c" 1>&6 -echo "configure:13381: checking working getaddrinfo" >&5 +echo "configure:13392: checking working getaddrinfo" >&5 if eval "test \"`echo '$''{'cf_cv_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13386,7 +13397,7 @@ if test "$cross_compiling" = yes; then cf_cv_getaddrinfo=unknown else cat > conftest.$ac_ext <<EOF -#line 13390 "configure" +#line 13401 "configure" #include "confdefs.h" #include <sys/types.h> @@ -13465,7 +13476,7 @@ int main() } EOF -if { (eval echo configure:13469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_getaddrinfo=yes else @@ -13508,7 +13519,7 @@ fi fi echo $ac_n "checking if experimental element-justification logic should be used""... $ac_c" 1>&6 -echo "configure:13512: checking if experimental element-justification logic should be used" >&5 +echo "configure:13523: checking if experimental element-justification logic should be used" >&5 # Check whether --enable-justify-elts or --disable-justify-elts was given. if test "${enable_justify_elts+set}" = set; then @@ -13532,7 +13543,7 @@ EOF echo $ac_n "checking if experimental keyboard-layout logic should be used""... $ac_c" 1>&6 -echo "configure:13536: checking if experimental keyboard-layout logic should be used" >&5 +echo "configure:13547: checking if experimental keyboard-layout logic should be used" >&5 # Check whether --enable-kbd-layout or --disable-kbd-layout was given. if test "${enable_kbd_layout+set}" = set; then @@ -13557,7 +13568,7 @@ EOF echo $ac_n "checking if experimental locale-charset selection logic should be used""... $ac_c" 1>&6 -echo "configure:13561: checking if experimental locale-charset selection logic should be used" >&5 +echo "configure:13572: checking if experimental locale-charset selection logic should be used" >&5 # Check whether --enable-locale-charset or --disable-locale-charset was given. if test "${enable_locale_charset+set}" = set; then @@ -13581,7 +13592,7 @@ EOF echo $ac_n "checking if experimental nested-table logic should be used""... $ac_c" 1>&6 -echo "configure:13585: checking if experimental nested-table logic should be used" >&5 +echo "configure:13596: checking if experimental nested-table logic should be used" >&5 # Check whether --enable-nested-tables or --disable-nested-tables was given. if test "${enable_nested_tables+set}" = set; then @@ -13605,7 +13616,7 @@ EOF echo $ac_n "checking if scrollbar code should be used""... $ac_c" 1>&6 -echo "configure:13609: checking if scrollbar code should be used" >&5 +echo "configure:13620: checking if scrollbar code should be used" >&5 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -13628,7 +13639,7 @@ echo "$ac_t""$use_scrollbar" 1>&6 echo $ac_n "checking if alternative line-edit bindings should be used""... $ac_c" 1>&6 -echo "configure:13632: checking if alternative line-edit bindings should be used" >&5 +echo "configure:13643: checking if alternative line-edit bindings should be used" >&5 # Check whether --enable-alt-bindings or --disable-alt-bindings was given. if test "${enable_alt_bindings+set}" = set; then @@ -13652,7 +13663,7 @@ EOF echo $ac_n "checking if you want to use extended HTML DTD logic""... $ac_c" 1>&6 -echo "configure:13656: checking if you want to use extended HTML DTD logic" >&5 +echo "configure:13667: checking if you want to use extended HTML DTD logic" >&5 # Check whether --enable-extended-dtd or --disable-extended-dtd was given. if test "${enable_extended_dtd+set}" = set; then @@ -13676,7 +13687,7 @@ EOF echo $ac_n "checking if file-upload logic should be used""... $ac_c" 1>&6 -echo "configure:13680: checking if file-upload logic should be used" >&5 +echo "configure:13691: checking if file-upload logic should be used" >&5 # Check whether --enable-file-upload or --disable-file-upload was given. if test "${enable_file_upload+set}" = set; then @@ -13700,7 +13711,7 @@ EOF echo $ac_n "checking if partial-display should be used""... $ac_c" 1>&6 -echo "configure:13704: checking if partial-display should be used" >&5 +echo "configure:13715: checking if partial-display should be used" >&5 # Check whether --enable-partial or --disable-partial was given. if test "${enable_partial+set}" = set; then @@ -13724,7 +13735,7 @@ EOF echo $ac_n "checking if persistent-cookie logic should be used""... $ac_c" 1>&6 -echo "configure:13728: checking if persistent-cookie logic should be used" >&5 +echo "configure:13739: checking if persistent-cookie logic should be used" >&5 # Check whether --enable-persistent-cookies or --disable-persistent-cookies was given. if test "${enable_persistent_cookies+set}" = set; then @@ -13748,7 +13759,7 @@ EOF echo $ac_n "checking if html source should be colorized""... $ac_c" 1>&6 -echo "configure:13752: checking if html source should be colorized" >&5 +echo "configure:13763: checking if html source should be colorized" >&5 # Check whether --enable-prettysrc or --disable-prettysrc was given. if test "${enable_prettysrc+set}" = set; then @@ -13772,7 +13783,7 @@ EOF echo $ac_n "checking if read-progress message should show ETA""... $ac_c" 1>&6 -echo "configure:13776: checking if read-progress message should show ETA" >&5 +echo "configure:13787: checking if read-progress message should show ETA" >&5 # Check whether --enable-read-eta or --disable-read-eta was given. if test "${enable_read_eta+set}" = set; then @@ -13796,7 +13807,7 @@ EOF echo $ac_n "checking if source caching should be used""... $ac_c" 1>&6 -echo "configure:13800: checking if source caching should be used" >&5 +echo "configure:13811: checking if source caching should be used" >&5 # Check whether --enable-source-cache or --disable-source-cache was given. if test "${enable_source_cache+set}" = set; then @@ -13820,7 +13831,7 @@ EOF echo $ac_n "checking if you want to use external commands""... $ac_c" 1>&6 -echo "configure:13824: checking if you want to use external commands" >&5 +echo "configure:13835: checking if you want to use external commands" >&5 # Check whether --enable-externs or --disable-externs was given. if test "${enable_externs+set}" = set; then @@ -13847,7 +13858,7 @@ EOF fi echo $ac_n "checking if you want to use setfont support""... $ac_c" 1>&6 -echo "configure:13851: checking if you want to use setfont support" >&5 +echo "configure:13862: checking if you want to use setfont support" >&5 # Check whether --enable-font-switch or --disable-font-switch was given. if test "${enable_font_switch+set}" = set; then @@ -13871,7 +13882,7 @@ EOF echo $ac_n "checking if you want cgi-link support""... $ac_c" 1>&6 -echo "configure:13875: checking if you want cgi-link support" >&5 +echo "configure:13886: checking if you want cgi-link support" >&5 # Check whether --enable-cgi-links or --disable-cgi-links was given. if test "${enable_cgi_links+set}" = set; then @@ -13890,7 +13901,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you want change-exec support""... $ac_c" 1>&6 -echo "configure:13894: checking if you want change-exec support" >&5 +echo "configure:13905: checking if you want change-exec support" >&5 # Check whether --enable-change-exec or --disable-change-exec was given. if test "${enable_change_exec+set}" = set; then @@ -13914,7 +13925,7 @@ EOF echo $ac_n "checking if you want exec-links support""... $ac_c" 1>&6 -echo "configure:13918: checking if you want exec-links support" >&5 +echo "configure:13929: checking if you want exec-links support" >&5 # Check whether --enable-exec-links or --disable-exec-links was given. if test "${enable_exec_links+set}" = set; then @@ -13938,7 +13949,7 @@ EOF echo $ac_n "checking if you want exec-scripts support""... $ac_c" 1>&6 -echo "configure:13942: checking if you want exec-scripts support" >&5 +echo "configure:13953: checking if you want exec-scripts support" >&5 # Check whether --enable-exec-scripts or --disable-exec-scripts was given. if test "${enable_exec_scripts+set}" = set; then @@ -13962,7 +13973,7 @@ EOF echo $ac_n "checking if you want internal-links feature""... $ac_c" 1>&6 -echo "configure:13966: checking if you want internal-links feature" >&5 +echo "configure:13977: checking if you want internal-links feature" >&5 # Check whether --enable-internal-links or --disable-internal-links was given. if test "${enable_internal_links+set}" = set; then @@ -13986,7 +13997,7 @@ EOF echo $ac_n "checking if you want to fork NSL requests""... $ac_c" 1>&6 -echo "configure:13990: checking if you want to fork NSL requests" >&5 +echo "configure:14001: checking if you want to fork NSL requests" >&5 # Check whether --enable-nsl-fork or --disable-nsl-fork was given. if test "${enable_nsl_fork+set}" = set; then @@ -14010,7 +14021,7 @@ EOF echo $ac_n "checking if you want to log URL requests via syslog""... $ac_c" 1>&6 -echo "configure:14014: checking if you want to log URL requests via syslog" >&5 +echo "configure:14025: checking if you want to log URL requests via syslog" >&5 # Check whether --enable-syslog or --disable-syslog was given. if test "${enable_syslog+set}" = set; then @@ -14034,7 +14045,7 @@ EOF echo $ac_n "checking if you want to underline links""... $ac_c" 1>&6 -echo "configure:14038: checking if you want to underline links" >&5 +echo "configure:14049: checking if you want to underline links" >&5 # Check whether --enable-underlines or --disable-underlines was given. if test "${enable_underlines+set}" = set; then @@ -14056,9 +14067,13 @@ test $use_underline = yes && cat >> confdefs.h <<\EOF #define UNDERLINE_LINKS 1 EOF +test $use_underline = no && cat >> confdefs.h <<\EOF +#define UNDERLINE_LINKS 0 +EOF + echo $ac_n "checking if help files should be gzip'ed""... $ac_c" 1>&6 -echo "configure:14062: checking if help files should be gzip'ed" >&5 +echo "configure:14077: checking if help files should be gzip'ed" >&5 # Check whether --enable-gzip-help or --disable-gzip-help was given. if test "${enable_gzip_help+set}" = set; then @@ -14078,7 +14093,7 @@ fi echo "$ac_t""$use_gzip_help" 1>&6 echo $ac_n "checking if you want to use libbz2 for decompression of some bzip2 files""... $ac_c" 1>&6 -echo "configure:14082: checking if you want to use libbz2 for decompression of some bzip2 files" >&5 +echo "configure:14097: checking if you want to use libbz2 for decompression of some bzip2 files" >&5 # Check whether --with-bzlib or --without-bzlib was given. if test "${with_bzlib+set}" = set; then @@ -14093,16 +14108,16 @@ echo "$ac_t""$use_bzlib" 1>&6 if test ".$use_bzlib" != ".no" ; then echo $ac_n "checking if we need to add -I option to get bzlib.h""... $ac_c" 1>&6 -echo "configure:14097: checking if we need to add -I option to get bzlib.h" >&5 +echo "configure:14112: checking if we need to add -I option to get bzlib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14099 "configure" +#line 14114 "configure" #include "confdefs.h" #include <zlib.h> int main() { ; return 0; } EOF -if { (eval echo configure:14106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -14231,12 +14246,12 @@ rm -f conftest* eval 'cf_cv_have_lib_'bz2'=no' cf_libdir="" echo $ac_n "checking for BZ2_bzopen""... $ac_c" 1>&6 -echo "configure:14235: checking for BZ2_bzopen" >&5 +echo "configure:14250: checking for BZ2_bzopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_BZ2_bzopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 14240 "configure" +#line 14255 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char BZ2_bzopen(); below. */ @@ -14259,7 +14274,7 @@ BZ2_bzopen(); ; return 0; } EOF -if { (eval echo configure:14263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_BZ2_bzopen=yes" else @@ -14279,10 +14294,10 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for BZ2_bzopen in -lbz2""... $ac_c" 1>&6 -echo "configure:14283: checking for BZ2_bzopen in -lbz2" >&5 +echo "configure:14298: checking for BZ2_bzopen in -lbz2" >&5 LIBS="-lbz2 $LIBS" cat > conftest.$ac_ext <<EOF -#line 14286 "configure" +#line 14301 "configure" #include "confdefs.h" #include <stdio.h> @@ -14291,7 +14306,7 @@ int main() { BZ2_bzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:14295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'bz2'=yes' @@ -14360,10 +14375,10 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -lbz2 in $cf_libdir""... $ac_c" 1>&6 -echo "configure:14364: checking for -lbz2 in $cf_libdir" >&5 +echo "configure:14379: checking for -lbz2 in $cf_libdir" >&5 LIBS="-L$cf_libdir -lbz2 $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 14367 "configure" +#line 14382 "configure" #include "confdefs.h" #include <stdio.h> @@ -14372,7 +14387,7 @@ int main() { BZ2_bzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:14376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'bz2'=yes' @@ -14407,7 +14422,7 @@ EOF fi echo $ac_n "checking if you want to use zlib for decompression of some gzip files""... $ac_c" 1>&6 -echo "configure:14411: checking if you want to use zlib for decompression of some gzip files" >&5 +echo "configure:14426: checking if you want to use zlib for decompression of some gzip files" >&5 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -14422,16 +14437,16 @@ echo "$ac_t""$use_zlib" 1>&6 if test ".$use_zlib" != ".no" ; then echo $ac_n "checking if we need to add -I option to get zlib.h""... $ac_c" 1>&6 -echo "configure:14426: checking if we need to add -I option to get zlib.h" >&5 +echo "configure:14441: checking if we need to add -I option to get zlib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14428 "configure" +#line 14443 "configure" #include "confdefs.h" #include <zlib.h> int main() { ; return 0; } EOF -if { (eval echo configure:14435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -14560,12 +14575,12 @@ rm -f conftest* eval 'cf_cv_have_lib_'z'=no' cf_libdir="" echo $ac_n "checking for gzopen""... $ac_c" 1>&6 -echo "configure:14564: checking for gzopen" >&5 +echo "configure:14579: checking for gzopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_gzopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 14569 "configure" +#line 14584 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gzopen(); below. */ @@ -14588,7 +14603,7 @@ gzopen(); ; return 0; } EOF -if { (eval echo configure:14592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gzopen=yes" else @@ -14608,17 +14623,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6 -echo "configure:14612: checking for gzopen in -lz" >&5 +echo "configure:14627: checking for gzopen in -lz" >&5 LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 14615 "configure" +#line 14630 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:14622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'z'=yes' @@ -14687,17 +14702,17 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -lz in $cf_libdir""... $ac_c" 1>&6 -echo "configure:14691: checking for -lz in $cf_libdir" >&5 +echo "configure:14706: checking for -lz in $cf_libdir" >&5 LIBS="-L$cf_libdir -lz $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 14694 "configure" +#line 14709 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:14701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'z'=yes' @@ -14734,7 +14749,7 @@ fi echo $ac_n "checking if you want to exclude FINGER code""... $ac_c" 1>&6 -echo "configure:14738: checking if you want to exclude FINGER code" >&5 +echo "configure:14753: checking if you want to exclude FINGER code" >&5 # Check whether --enable-finger or --disable-finger was given. if test "${enable_finger+set}" = set; then @@ -14758,7 +14773,7 @@ EOF echo $ac_n "checking if you want to exclude GOPHER code""... $ac_c" 1>&6 -echo "configure:14762: checking if you want to exclude GOPHER code" >&5 +echo "configure:14777: checking if you want to exclude GOPHER code" >&5 # Check whether --enable-gopher or --disable-gopher was given. if test "${enable_gopher+set}" = set; then @@ -14782,7 +14797,7 @@ EOF echo $ac_n "checking if you want to exclude NEWS code""... $ac_c" 1>&6 -echo "configure:14786: checking if you want to exclude NEWS code" >&5 +echo "configure:14801: checking if you want to exclude NEWS code" >&5 # Check whether --enable-news or --disable-news was given. if test "${enable_news+set}" = set; then @@ -14806,7 +14821,7 @@ EOF echo $ac_n "checking if you want to exclude FTP code""... $ac_c" 1>&6 -echo "configure:14810: checking if you want to exclude FTP code" >&5 +echo "configure:14825: checking if you want to exclude FTP code" >&5 # Check whether --enable-ftp or --disable-ftp was given. if test "${enable_ftp+set}" = set; then @@ -14835,7 +14850,7 @@ EOF # All DirEd functions that were enabled on compilation can be disabled # or modified at run time via DIRED_MENU symbols in lynx.cfg. echo $ac_n "checking if directory-editor code should be used""... $ac_c" 1>&6 -echo "configure:14839: checking if directory-editor code should be used" >&5 +echo "configure:14854: checking if directory-editor code should be used" >&5 # Check whether --enable-dired or --disable-dired was given. if test "${enable_dired+set}" = set; then @@ -14862,7 +14877,7 @@ EOF echo $ac_n "checking if you wish to allow extracting from archives via DirEd""... $ac_c" 1>&6 -echo "configure:14866: checking if you wish to allow extracting from archives via DirEd" >&5 +echo "configure:14881: checking if you wish to allow extracting from archives via DirEd" >&5 # Check whether --enable-dired-dearchive or --disable-dired-dearchive was given. if test "${enable_dired_dearchive+set}" = set; then @@ -14881,7 +14896,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if DirEd mode should override keys""... $ac_c" 1>&6 -echo "configure:14885: checking if DirEd mode should override keys" >&5 +echo "configure:14900: checking if DirEd mode should override keys" >&5 # Check whether --enable-dired-override or --disable-dired-override was given. if test "${enable_dired_override+set}" = set; then @@ -14907,7 +14922,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow permissions commands via DirEd""... $ac_c" 1>&6 -echo "configure:14911: checking if you wish to allow permissions commands via DirEd" >&5 +echo "configure:14926: checking if you wish to allow permissions commands via DirEd" >&5 # Check whether --enable-dired-permit or --disable-dired-permit was given. if test "${enable_dired_permit+set}" = set; then @@ -14933,7 +14948,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow executable-permission commands via DirEd""... $ac_c" 1>&6 -echo "configure:14937: checking if you wish to allow executable-permission commands via DirEd" >&5 +echo "configure:14952: checking if you wish to allow executable-permission commands via DirEd" >&5 # Check whether --enable-dired-xpermit or --disable-dired-xpermit was given. if test "${enable_dired_xpermit+set}" = set; then @@ -14952,7 +14967,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow "tar" commands from DirEd""... $ac_c" 1>&6 -echo "configure:14956: checking if you wish to allow "tar" commands from DirEd" >&5 +echo "configure:14971: checking if you wish to allow "tar" commands from DirEd" >&5 # Check whether --enable-dired-tar or --disable-dired-tar was given. if test "${enable_dired_tar+set}" = set; then @@ -14978,7 +14993,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow "uudecode" commands from DirEd""... $ac_c" 1>&6 -echo "configure:14982: checking if you wish to allow "uudecode" commands from DirEd" >&5 +echo "configure:14997: checking if you wish to allow "uudecode" commands from DirEd" >&5 # Check whether --enable-dired-uudecode or --disable-dired-uudecode was given. if test "${enable_dired_uudecode+set}" = set; then @@ -15004,7 +15019,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow "zip" and "unzip" commands from DirEd""... $ac_c" 1>&6 -echo "configure:15008: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5 +echo "configure:15023: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5 # Check whether --enable-dired-zip or --disable-dired-zip was given. if test "${enable_dired_zip+set}" = set; then @@ -15030,7 +15045,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow "gzip" and "gunzip" commands from DirEd""... $ac_c" 1>&6 -echo "configure:15034: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5 +echo "configure:15049: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5 # Check whether --enable-dired-gzip or --disable-dired-gzip was given. if test "${enable_dired_gzip+set}" = set; then @@ -15057,7 +15072,7 @@ fi fi echo $ac_n "checking if you want long-directory listings""... $ac_c" 1>&6 -echo "configure:15061: checking if you want long-directory listings" >&5 +echo "configure:15076: checking if you want long-directory listings" >&5 # Check whether --enable-long-list or --disable-long-list was given. if test "${enable_long_list+set}" = set; then @@ -15083,7 +15098,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if parent-directory references are permitted""... $ac_c" 1>&6 -echo "configure:15087: checking if parent-directory references are permitted" >&5 +echo "configure:15102: checking if parent-directory references are permitted" >&5 # Check whether --enable-parent-dir-refs or --disable-parent-dir-refs was given. if test "${enable_parent_dir_refs+set}" = set; then @@ -15103,10 +15118,12 @@ echo "$ac_t""$enableval" 1>&6 test -z "$TELNET" && TELNET=telnet -# Extract the first word of "telnet", so it can be a program name with args. -set dummy telnet; ac_word=$2 +for ac_prog in $TELNET telnet +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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15110: checking for $ac_word" >&5 +echo "configure:15127: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TELNET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15128,7 +15145,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_TELNET" && ac_cv_path_TELNET="$TELNET" ;; esac fi @@ -15139,6 +15155,10 @@ else echo "$ac_t""no" 1>&6 fi +test -n "$TELNET" && break +done +test -n "$TELNET" || TELNET="$TELNET" + cf_path_prog="" cf_path_args="" @@ -15194,7 +15214,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 15198) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 15218) testing defining path for ${cf_path_prog} ..." 1>&5 cat >> confdefs.h <<EOF #define TELNET_PATH "$cf_path_prog" @@ -15208,10 +15228,12 @@ fi test -z "$TN3270" && TN3270=tn3270 -# Extract the first word of "tn3270", so it can be a program name with args. -set dummy tn3270; ac_word=$2 +for ac_prog in $TN3270 tn3270 +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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15215: checking for $ac_word" >&5 +echo "configure:15237: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TN3270'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15233,7 +15255,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_TN3270" && ac_cv_path_TN3270="$TN3270" ;; esac fi @@ -15244,6 +15265,10 @@ else echo "$ac_t""no" 1>&6 fi +test -n "$TN3270" && break +done +test -n "$TN3270" || TN3270="$TN3270" + cf_path_prog="" cf_path_args="" @@ -15299,7 +15324,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 15303) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 15328) testing defining path for ${cf_path_prog} ..." 1>&5 cat >> confdefs.h <<EOF #define TN3270_PATH "$cf_path_prog" @@ -15313,10 +15338,12 @@ fi test -z "$RLOGIN" && RLOGIN=rlogin -# Extract the first word of "rlogin", so it can be a program name with args. -set dummy rlogin; ac_word=$2 +for ac_prog in $RLOGIN rlogin +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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15320: checking for $ac_word" >&5 +echo "configure:15347: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RLOGIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15338,7 +15365,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_RLOGIN" && ac_cv_path_RLOGIN="$RLOGIN" ;; esac fi @@ -15349,6 +15375,10 @@ else echo "$ac_t""no" 1>&6 fi +test -n "$RLOGIN" && break +done +test -n "$RLOGIN" || RLOGIN="$RLOGIN" + cf_path_prog="" cf_path_args="" @@ -15404,7 +15434,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 15408) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 15438) testing defining path for ${cf_path_prog} ..." 1>&5 cat >> confdefs.h <<EOF #define RLOGIN_PATH "$cf_path_prog" @@ -15419,10 +15449,12 @@ fi test -z "$MV" && MV=mv -# Extract the first word of "mv", so it can be a program name with args. -set dummy mv; ac_word=$2 +for ac_prog in $MV mv +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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15426: checking for $ac_word" >&5 +echo "configure:15458: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15444,7 +15476,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_MV" && ac_cv_path_MV="$MV" ;; esac fi @@ -15455,6 +15486,10 @@ else echo "$ac_t""no" 1>&6 fi +test -n "$MV" && break +done +test -n "$MV" || MV="$MV" + cf_path_prog="" cf_path_args="" @@ -15510,7 +15545,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 15514) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 15549) testing defining path for ${cf_path_prog} ..." 1>&5 cat >> confdefs.h <<EOF #define MV_PATH "$cf_path_prog" @@ -15525,10 +15560,12 @@ fi test -z "$GZIP" && GZIP=gzip -# Extract the first word of "gzip", so it can be a program name with args. -set dummy gzip; ac_word=$2 +for ac_prog in $GZIP gzip +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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15532: checking for $ac_word" >&5 +echo "configure:15569: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GZIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15550,7 +15587,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_GZIP" && ac_cv_path_GZIP="$GZIP" ;; esac fi @@ -15561,6 +15597,10 @@ else echo "$ac_t""no" 1>&6 fi +test -n "$GZIP" && break +done +test -n "$GZIP" || GZIP="$GZIP" + cf_path_prog="" cf_path_args="" @@ -15616,7 +15656,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 15620) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 15660) testing defining path for ${cf_path_prog} ..." 1>&5 cat >> confdefs.h <<EOF #define GZIP_PATH "$cf_path_prog" @@ -15630,10 +15670,12 @@ fi test -z "$UNCOMPRESS" && UNCOMPRESS=gunzip -# Extract the first word of "gunzip", so it can be a program name with args. -set dummy gunzip; ac_word=$2 +for ac_prog in $UNCOMPRESS gunzip +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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15637: checking for $ac_word" >&5 +echo "configure:15679: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_UNCOMPRESS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15655,7 +15697,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_UNCOMPRESS" && ac_cv_path_UNCOMPRESS="$UNCOMPRESS" ;; esac fi @@ -15666,6 +15707,10 @@ else echo "$ac_t""no" 1>&6 fi +test -n "$UNCOMPRESS" && break +done +test -n "$UNCOMPRESS" || UNCOMPRESS="$UNCOMPRESS" + cf_path_prog="" cf_path_args="" @@ -15721,7 +15766,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 15725) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 15770) testing defining path for ${cf_path_prog} ..." 1>&5 cat >> confdefs.h <<EOF #define UNCOMPRESS_PATH "$cf_path_prog" @@ -15735,10 +15780,12 @@ fi test -z "$UNZIP" && UNZIP=unzip -# Extract the first word of "unzip", so it can be a program name with args. -set dummy unzip; ac_word=$2 +for ac_prog in $UNZIP unzip +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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15742: checking for $ac_word" >&5 +echo "configure:15789: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15760,7 +15807,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_UNZIP" && ac_cv_path_UNZIP="$UNZIP" ;; esac fi @@ -15771,6 +15817,10 @@ else echo "$ac_t""no" 1>&6 fi +test -n "$UNZIP" && break +done +test -n "$UNZIP" || UNZIP="$UNZIP" + cf_path_prog="" cf_path_args="" @@ -15826,7 +15876,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 15830) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 15880) testing defining path for ${cf_path_prog} ..." 1>&5 cat >> confdefs.h <<EOF #define UNZIP_PATH "$cf_path_prog" @@ -15840,10 +15890,12 @@ fi test -z "$BZIP2" && BZIP2=bzip2 -# Extract the first word of "bzip2", so it can be a program name with args. -set dummy bzip2; ac_word=$2 +for ac_prog in $BZIP2 bzip2 +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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15847: checking for $ac_word" >&5 +echo "configure:15899: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BZIP2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15865,7 +15917,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_BZIP2" && ac_cv_path_BZIP2="$BZIP2" ;; esac fi @@ -15876,6 +15927,10 @@ else echo "$ac_t""no" 1>&6 fi +test -n "$BZIP2" && break +done +test -n "$BZIP2" || BZIP2="$BZIP2" + cf_path_prog="" cf_path_args="" @@ -15931,7 +15986,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 15935) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 15990) testing defining path for ${cf_path_prog} ..." 1>&5 cat >> confdefs.h <<EOF #define BZIP2_PATH "$cf_path_prog" @@ -15948,10 +16003,12 @@ if test ".$use_dired" != ".no" ; then test -z "$COMPRESS" && COMPRESS=compress -# Extract the first word of "compress", so it can be a program name with args. -set dummy compress; ac_word=$2 +for ac_prog in $COMPRESS compress +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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15955: checking for $ac_word" >&5 +echo "configure:16012: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_COMPRESS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15973,7 +16030,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_COMPRESS" && ac_cv_path_COMPRESS="$COMPRESS" ;; esac fi @@ -15984,6 +16040,10 @@ else echo "$ac_t""no" 1>&6 fi +test -n "$COMPRESS" && break +done +test -n "$COMPRESS" || COMPRESS="$COMPRESS" + cf_path_prog="" cf_path_args="" @@ -16039,7 +16099,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 16043) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 16103) testing defining path for ${cf_path_prog} ..." 1>&5 cat >> confdefs.h <<EOF #define COMPRESS_PATH "$cf_path_prog" @@ -16053,10 +16113,12 @@ fi test -z "$RM" && RM=rm -# Extract the first word of "rm", so it can be a program name with args. -set dummy rm; ac_word=$2 +for ac_prog in $RM rm +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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16060: checking for $ac_word" >&5 +echo "configure:16122: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16078,7 +16140,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_RM" && ac_cv_path_RM="$RM" ;; esac fi @@ -16089,6 +16150,10 @@ else echo "$ac_t""no" 1>&6 fi +test -n "$RM" && break +done +test -n "$RM" || RM="$RM" + cf_path_prog="" cf_path_args="" @@ -16144,7 +16209,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 16148) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 16213) testing defining path for ${cf_path_prog} ..." 1>&5 cat >> confdefs.h <<EOF #define RM_PATH "$cf_path_prog" @@ -16158,10 +16223,12 @@ fi test -z "$TAR" && TAR=tar -# Extract the first word of "tar", so it can be a program name with args. -set dummy tar; ac_word=$2 +for ac_prog in $TAR tar pax gtar gnutar bsdtar star +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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16165: checking for $ac_word" >&5 +echo "configure:16232: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16183,7 +16250,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_TAR" && ac_cv_path_TAR="$TAR" ;; esac fi @@ -16194,6 +16260,10 @@ else echo "$ac_t""no" 1>&6 fi +test -n "$TAR" && break +done +test -n "$TAR" || TAR="$TAR" + cf_path_prog="" cf_path_args="" @@ -16249,7 +16319,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 16253) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 16323) testing defining path for ${cf_path_prog} ..." 1>&5 cat >> confdefs.h <<EOF #define TAR_PATH "$cf_path_prog" @@ -16263,10 +16333,12 @@ fi test -z "$UUDECODE" && UUDECODE=uudecode -# Extract the first word of "uudecode", so it can be a program name with args. -set dummy uudecode; ac_word=$2 +for ac_prog in $UUDECODE uudecode +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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16270: checking for $ac_word" >&5 +echo "configure:16342: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_UUDECODE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16288,7 +16360,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_UUDECODE" && ac_cv_path_UUDECODE="$UUDECODE" ;; esac fi @@ -16299,6 +16370,10 @@ else echo "$ac_t""no" 1>&6 fi +test -n "$UUDECODE" && break +done +test -n "$UUDECODE" || UUDECODE="$UUDECODE" + cf_path_prog="" cf_path_args="" @@ -16354,7 +16429,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 16358) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 16433) testing defining path for ${cf_path_prog} ..." 1>&5 cat >> confdefs.h <<EOF #define UUDECODE_PATH "$cf_path_prog" @@ -16368,10 +16443,12 @@ fi test -z "$ZCAT" && ZCAT=zcat -# Extract the first word of "zcat", so it can be a program name with args. -set dummy zcat; ac_word=$2 +for ac_prog in $ZCAT zcat +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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16375: checking for $ac_word" >&5 +echo "configure:16452: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ZCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16393,7 +16470,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_ZCAT" && ac_cv_path_ZCAT="$ZCAT" ;; esac fi @@ -16404,6 +16480,10 @@ else echo "$ac_t""no" 1>&6 fi +test -n "$ZCAT" && break +done +test -n "$ZCAT" || ZCAT="$ZCAT" + cf_path_prog="" cf_path_args="" @@ -16459,7 +16539,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 16463) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 16543) testing defining path for ${cf_path_prog} ..." 1>&5 cat >> confdefs.h <<EOF #define ZCAT_PATH "$cf_path_prog" @@ -16473,10 +16553,12 @@ fi test -z "$ZIP" && ZIP=zip -# Extract the first word of "zip", so it can be a program name with args. -set dummy zip; ac_word=$2 +for ac_prog in $ZIP zip +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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16480: checking for $ac_word" >&5 +echo "configure:16562: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16498,7 +16580,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_ZIP" && ac_cv_path_ZIP="$ZIP" ;; esac fi @@ -16509,6 +16590,10 @@ else echo "$ac_t""no" 1>&6 fi +test -n "$ZIP" && break +done +test -n "$ZIP" || ZIP="$ZIP" + cf_path_prog="" cf_path_args="" @@ -16564,7 +16649,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 16568) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 16653) testing defining path for ${cf_path_prog} ..." 1>&5 cat >> confdefs.h <<EOF #define ZIP_PATH "$cf_path_prog" @@ -16578,6 +16663,50 @@ fi +case $TAR in +*pax) + TAR_UP_OPTIONS="-w" + TAR_DOWN_OPTIONS="-r" + TAR_PIPE_OPTIONS="" + TAR_FILE_OPTIONS="-f" + ;; +*star) + TAR_UP_OPTIONS="-c -f" + TAR_DOWN_OPTIONS="-x -U -f" + TAR_PIPE_OPTIONS="-" + TAR_FILE_OPTIONS="" + ;; +*tar) + # FIXME: some versions of tar require, some don't allow the "-" + TAR_UP_OPTIONS="-cf" + TAR_DOWN_OPTIONS="-xf" + TAR_PIPE_OPTIONS="-" + TAR_FILE_OPTIONS="" + ;; +esac + + + + + + +cat >> confdefs.h <<EOF +#define TAR_UP_OPTIONS "$TAR_UP_OPTIONS" +EOF + +cat >> confdefs.h <<EOF +#define TAR_DOWN_OPTIONS "$TAR_DOWN_OPTIONS" +EOF + +cat >> confdefs.h <<EOF +#define TAR_FILE_OPTIONS "$TAR_FILE_OPTIONS" +EOF + +cat >> confdefs.h <<EOF +#define TAR_PIPE_OPTIONS "$TAR_PIPE_OPTIONS" +EOF + + case "$INSTALL" in $srcdir*) # (vi cat >> confdefs.h <<EOF @@ -16589,10 +16718,12 @@ EOF cf_save_INSTALL="$INSTALL" test -z "$INSTALL" && INSTALL=install -# Extract the first word of "install", so it can be a program name with args. -set dummy install; ac_word=$2 +for ac_prog in $INSTALL install +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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16596: checking for $ac_word" >&5 +echo "configure:16727: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_INSTALL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16614,7 +16745,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_INSTALL" && ac_cv_path_INSTALL="$INSTALL" ;; esac fi @@ -16625,6 +16755,10 @@ else echo "$ac_t""no" 1>&6 fi +test -n "$INSTALL" && break +done +test -n "$INSTALL" || INSTALL="$INSTALL" + cf_path_prog="" cf_path_args="" @@ -16680,7 +16814,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "(line 16684) testing defining path for ${cf_path_prog} ..." 1>&5 +echo "(line 16818) testing defining path for ${cf_path_prog} ..." 1>&5 cat >> confdefs.h <<EOF #define INSTALL_PATH "$cf_path_prog" @@ -16713,7 +16847,7 @@ if test $cf_cv_screen = pdcurses ; then # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:16717: checking for X" >&5 +echo "configure:16851: checking for X" >&5 # Check whether --with-x or --without-x was given. @@ -16776,12 +16910,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 16780 "configure" +#line 16914 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -16850,14 +16984,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 16854 "configure" +#line 16988 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:16861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -16957,7 +17091,7 @@ clix*) # FIXME: modify the library lookup in autoconf to # allow _s.a suffix ahead of .a echo $ac_n "checking for open in -lc_s""... $ac_c" 1>&6 -echo "configure:16961: checking for open in -lc_s" >&5 +echo "configure:17095: checking for open in -lc_s" >&5 ac_lib_var=`echo c_s'_'open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16965,7 +17099,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 16969 "configure" +#line 17103 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -16976,7 +17110,7 @@ int main() { open() ; return 0; } EOF -if { (eval echo configure:16980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16993,7 +17127,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 LIBS="-lc_s $LIBS" echo $ac_n "checking for gethostname in -lbsd""... $ac_c" 1>&6 -echo "configure:16997: checking for gethostname in -lbsd" >&5 +echo "configure:17131: checking for gethostname in -lbsd" >&5 ac_lib_var=`echo bsd'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17001,7 +17135,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <<EOF -#line 17005 "configure" +#line 17139 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -17012,7 +17146,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:17016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17029,7 +17163,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 LIBS="-lbsd $LIBS" echo $ac_n "checking for gethostname in -lnsl_s""... $ac_c" 1>&6 -echo "configure:17033: checking for gethostname in -lnsl_s" >&5 +echo "configure:17167: checking for gethostname in -lnsl_s" >&5 ac_lib_var=`echo nsl_s'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17037,7 +17171,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 17041 "configure" +#line 17175 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -17048,7 +17182,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:17052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17065,7 +17199,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 LIBS="-lnsl_s $LIBS" echo $ac_n "checking for XOpenDisplay in -lX11_s""... $ac_c" 1>&6 -echo "configure:17069: checking for XOpenDisplay in -lX11_s" >&5 +echo "configure:17203: checking for XOpenDisplay in -lX11_s" >&5 ac_lib_var=`echo X11_s'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17073,7 +17207,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 17077 "configure" +#line 17211 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -17084,7 +17218,7 @@ int main() { XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:17088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17101,7 +17235,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 LIBS="-lX11_s $LIBS" echo $ac_n "checking for XtAppInitialize in -lXt_s""... $ac_c" 1>&6 -echo "configure:17105: checking for XtAppInitialize in -lXt_s" >&5 +echo "configure:17239: checking for XtAppInitialize in -lXt_s" >&5 ac_lib_var=`echo Xt_s'_'XtAppInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17109,7 +17243,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 17113 "configure" +#line 17247 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -17120,7 +17254,7 @@ int main() { XtAppInitialize() ; return 0; } EOF -if { (eval echo configure:17124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17161,7 +17295,7 @@ fi ;; *) echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:17165: checking for socket in -lsocket" >&5 +echo "configure:17299: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17169,7 +17303,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 17173 "configure" +#line 17307 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -17180,7 +17314,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:17184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17208,7 +17342,7 @@ else fi echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:17212: checking for gethostname in -lnsl" >&5 +echo "configure:17346: checking for gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17216,7 +17350,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 17220 "configure" +#line 17354 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -17227,7 +17361,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:17231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17278,17 +17412,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:17282: checking whether -R must be followed by a space" >&5 +echo "configure:17416: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 17285 "configure" +#line 17419 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:17292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -17304,14 +17438,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 17308 "configure" +#line 17442 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:17315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -17343,7 +17477,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:17347: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:17481: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17351,7 +17485,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <<EOF -#line 17355 "configure" +#line 17489 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -17362,7 +17496,7 @@ int main() { dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:17366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17384,7 +17518,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:17388: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:17522: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17392,7 +17526,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <<EOF -#line 17396 "configure" +#line 17530 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -17403,7 +17537,7 @@ int main() { dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:17407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17432,12 +17566,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:17436: checking for gethostbyname" >&5 +echo "configure:17570: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17441 "configure" +#line 17575 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -17460,7 +17594,7 @@ gethostbyname(); ; return 0; } EOF -if { (eval echo configure:17464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -17481,7 +17615,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:17485: checking for gethostbyname in -lnsl" >&5 +echo "configure:17619: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17489,7 +17623,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 17493 "configure" +#line 17627 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -17500,7 +17634,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:17504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17530,12 +17664,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:17534: checking for connect" >&5 +echo "configure:17668: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17539 "configure" +#line 17673 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -17558,7 +17692,7 @@ connect(); ; return 0; } EOF -if { (eval echo configure:17562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -17579,7 +17713,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:17583: checking for connect in -lsocket" >&5 +echo "configure:17717: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17587,7 +17721,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 17591 "configure" +#line 17725 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -17598,7 +17732,7 @@ int main() { connect() ; return 0; } EOF -if { (eval echo configure:17602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17622,12 +17756,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:17626: checking for remove" >&5 +echo "configure:17760: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17631 "configure" +#line 17765 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -17650,7 +17784,7 @@ remove(); ; return 0; } EOF -if { (eval echo configure:17654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -17671,7 +17805,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:17675: checking for remove in -lposix" >&5 +echo "configure:17809: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17679,7 +17813,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <<EOF -#line 17683 "configure" +#line 17817 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -17690,7 +17824,7 @@ int main() { remove() ; return 0; } EOF -if { (eval echo configure:17694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17714,12 +17848,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:17718: checking for shmat" >&5 +echo "configure:17852: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17723 "configure" +#line 17857 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -17742,7 +17876,7 @@ shmat(); ; return 0; } EOF -if { (eval echo configure:17746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -17763,7 +17897,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:17767: checking for shmat in -lipc" >&5 +echo "configure:17901: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17771,7 +17905,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 17775 "configure" +#line 17909 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -17782,7 +17916,7 @@ int main() { shmat() ; return 0; } EOF -if { (eval echo configure:17786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17815,7 +17949,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:17819: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:17953: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17823,7 +17957,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 17827 "configure" +#line 17961 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -17834,7 +17968,7 @@ int main() { IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:17838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17900,14 +18034,14 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext <<EOF -#line 17904 "configure" +#line 18038 "configure" #include "confdefs.h" #include <stdio.h> int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:17911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -17925,7 +18059,7 @@ rm -f conftest* fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:17929: checking for XOpenDisplay in -lX11" >&5 +echo "configure:18063: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17933,7 +18067,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 17937 "configure" +#line 18071 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -17944,7 +18078,7 @@ int main() { XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:17948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17965,7 +18099,7 @@ else fi echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:17969: checking for XtAppInitialize in -lXt" >&5 +echo "configure:18103: checking for XtAppInitialize in -lXt" >&5 ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17973,7 +18107,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 17977 "configure" +#line 18111 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -17984,7 +18118,7 @@ int main() { XtAppInitialize() ; return 0; } EOF -if { (eval echo configure:17988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -18052,14 +18186,14 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext <<EOF -#line 18056 "configure" +#line 18190 "configure" #include "confdefs.h" #include <stdio.h> int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:18063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -18112,7 +18246,7 @@ fi echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:18116: checking for XextCreateExtension in -lXext" >&5 +echo "configure:18250: checking for XextCreateExtension in -lXext" >&5 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18120,7 +18254,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <<EOF -#line 18124 "configure" +#line 18258 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -18131,7 +18265,7 @@ int main() { XextCreateExtension() ; return 0; } EOF -if { (eval echo configure:18135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -18170,13 +18304,13 @@ do if test $cf_path != default ; then CPPFLAGS="-I$cf_path/include $cf_save" echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6 -echo "configure:18174: checking for $cf_test in $cf_path" >&5 +echo "configure:18308: checking for $cf_test in $cf_path" >&5 else echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 -echo "configure:18177: checking for $cf_test" >&5 +echo "configure:18311: checking for $cf_test" >&5 fi cat > conftest.$ac_ext <<EOF -#line 18180 "configure" +#line 18314 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> @@ -18185,7 +18319,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -18232,23 +18366,23 @@ do if test $cf_path != default ; then LIBS="-L$cf_path/lib $cf_lib $LIBS" echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6 -echo "configure:18236: checking for $cf_lib in $cf_path" >&5 +echo "configure:18370: checking for $cf_lib in $cf_path" >&5 else LIBS="$cf_lib $LIBS" echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6 -echo "configure:18240: checking for $cf_test in $cf_lib" >&5 +echo "configure:18374: checking for $cf_test in $cf_lib" >&5 fi cf_SAVE="$LIBS" LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS" cat > conftest.$ac_ext <<EOF -#line 18245 "configure" +#line 18379 "configure" #include "confdefs.h" int main() { $cf_test() ; return 0; } EOF -if { (eval echo configure:18252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -18327,14 +18461,14 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext <<EOF -#line 18331 "configure" +#line 18465 "configure" #include "confdefs.h" #include <stdio.h> int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:18338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -18352,7 +18486,7 @@ rm -f conftest* fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:18356: checking for XOpenDisplay in -lX11" >&5 +echo "configure:18490: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18360,7 +18494,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 18364 "configure" +#line 18498 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -18371,7 +18505,7 @@ int main() { XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:18375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -18392,14 +18526,14 @@ else fi echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 -echo "configure:18396: checking for XCurses library" >&5 +echo "configure:18530: checking for XCurses library" >&5 if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else LIBS="-lXCurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 18403 "configure" +#line 18537 "configure" #include "confdefs.h" #include <xcurses.h> @@ -18409,7 +18543,7 @@ int main() { XCursesExit(); ; return 0; } EOF -if { (eval echo configure:18413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_lib_XCurses=yes else @@ -18443,7 +18577,7 @@ fi else echo $ac_n "checking if we can include termio.h with curses""... $ac_c" 1>&6 -echo "configure:18447: checking if we can include termio.h with curses" >&5 +echo "configure:18581: checking if we can include termio.h with curses" >&5 if eval "test \"`echo '$''{'cf_cv_termio_and_curses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18452,7 +18586,7 @@ else CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir-.} -I${srcdir-.}/src -I${srcdir-.}/WWW/Library/Implementation" touch lynx_cfg.h cat > conftest.$ac_ext <<EOF -#line 18456 "configure" +#line 18590 "configure" #include "confdefs.h" #include <LYCurses.h> @@ -18461,7 +18595,7 @@ int main() { putchar(0x0a) ; return 0; } EOF -if { (eval echo configure:18465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_termio_and_curses=yes else @@ -18491,17 +18625,17 @@ if test $cf_cv_screen != slang ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:18495: checking for $ac_hdr" >&5 +echo "configure:18629: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18500 "configure" +#line 18634 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:18505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -18529,7 +18663,7 @@ done echo $ac_n "checking if curses supports alternate-character set""... $ac_c" 1>&6 -echo "configure:18533: checking if curses supports alternate-character set" >&5 +echo "configure:18667: checking if curses supports alternate-character set" >&5 if eval "test \"`echo '$''{'cf_cv_alt_char_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18537,7 +18671,7 @@ else for mapname in acs_map _acs_map do cat > conftest.$ac_ext <<EOF -#line 18541 "configure" +#line 18675 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -18546,7 +18680,7 @@ int main() { chtype x = $mapname['l']; $mapname['m'] = 0 ; return 0; } EOF -if { (eval echo configure:18550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_alt_char_set=$mapname break @@ -18569,13 +18703,13 @@ EOF echo $ac_n "checking if curses supports fancy attributes""... $ac_c" 1>&6 -echo "configure:18573: checking if curses supports fancy attributes" >&5 +echo "configure:18707: checking if curses supports fancy attributes" >&5 if eval "test \"`echo '$''{'cf_cv_fancy_curses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18579 "configure" +#line 18713 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -18588,7 +18722,7 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE); ; return 0; } EOF -if { (eval echo configure:18592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_fancy_curses=yes else @@ -18611,13 +18745,13 @@ EOF if test "$cf_cv_ncurses_version" != no ; then echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6 -echo "configure:18615: checking for obsolete/broken version of ncurses" >&5 +echo "configure:18749: checking for obsolete/broken version of ncurses" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18621 "configure" +#line 18755 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -18631,7 +18765,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_broken=no else @@ -18656,13 +18790,13 @@ fi echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:18660: checking if curses supports color attributes" >&5 +echo "configure:18794: checking if curses supports color attributes" >&5 if eval "test \"`echo '$''{'cf_cv_color_curses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18666 "configure" +#line 18800 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -18677,7 +18811,7 @@ chtype x = COLOR_BLUE; ; return 0; } EOF -if { (eval echo configure:18681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_color_curses=yes else @@ -18711,17 +18845,17 @@ unistd.h \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:18715: checking for $ac_hdr" >&5 +echo "configure:18849: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18720 "configure" +#line 18854 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:18725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -18752,17 +18886,17 @@ if test "$ISC" = yes ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:18756: checking for $ac_hdr" >&5 +echo "configure:18890: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18761 "configure" +#line 18895 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:18766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -18797,16 +18931,16 @@ if test "$ac_cv_header_termios_h" = yes ; then esac if test "$termios_bad" = maybe ; then echo $ac_n "checking whether termios.h needs _POSIX_SOURCE""... $ac_c" 1>&6 -echo "configure:18801: checking whether termios.h needs _POSIX_SOURCE" >&5 +echo "configure:18935: checking whether termios.h needs _POSIX_SOURCE" >&5 cat > conftest.$ac_ext <<EOF -#line 18803 "configure" +#line 18937 "configure" #include "confdefs.h" #include <termios.h> int main() { struct termios foo; int x = foo.c_iflag ; return 0; } EOF -if { (eval echo configure:18810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=no else @@ -18815,7 +18949,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 18819 "configure" +#line 18953 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -18824,7 +18958,7 @@ int main() { struct termios foo; int x = foo.c_iflag ; return 0; } EOF -if { (eval echo configure:18828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=unknown else @@ -18847,7 +18981,7 @@ fi echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6 -echo "configure:18851: checking declaration of size-change" >&5 +echo "configure:18985: checking declaration of size-change" >&5 if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18861,7 +18995,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat > conftest.$ac_ext <<EOF -#line 18865 "configure" +#line 18999 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef HAVE_TERMIOS_H @@ -18900,7 +19034,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19038: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sizechange=yes else @@ -18939,20 +19073,20 @@ fi echo $ac_n "checking if ttytype is declared in curses library""... $ac_c" 1>&6 -echo "configure:18943: checking if ttytype is declared in curses library" >&5 +echo "configure:19077: checking if ttytype is declared in curses library" >&5 if eval "test \"`echo '$''{'cf_cv_have_ttytype'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18949 "configure" +#line 19083 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { char *x = &ttytype[1]; *x = 1 ; return 0; } EOF -if { (eval echo configure:18956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_ttytype=yes else @@ -18973,13 +19107,13 @@ EOF echo $ac_n "checking if curses supports wide characters""... $ac_c" 1>&6 -echo "configure:18977: checking if curses supports wide characters" >&5 +echo "configure:19111: checking if curses supports wide characters" >&5 if eval "test \"`echo '$''{'cf_cv_widec_curses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18983 "configure" +#line 19117 "configure" #include "confdefs.h" #include <stdlib.h> @@ -18993,7 +19127,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_widec_curses=yes else @@ -19016,13 +19150,13 @@ EOF # This is needed on Tru64 5.0 to declare mbstate_t echo $ac_n "checking if we must include wchar.h to declare mbstate_t""... $ac_c" 1>&6 -echo "configure:19020: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "configure:19154: checking if we must include wchar.h to declare mbstate_t" >&5 if eval "test \"`echo '$''{'cf_cv_widec_mbstate'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 19026 "configure" +#line 19160 "configure" #include "confdefs.h" #include <stdlib.h> @@ -19031,7 +19165,7 @@ int main() { mbstate_t state ; return 0; } EOF -if { (eval echo configure:19035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_widec_mbstate=no else @@ -19039,7 +19173,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 19043 "configure" +#line 19177 "configure" #include "confdefs.h" #include <stdlib.h> @@ -19049,7 +19183,7 @@ int main() { mbstate_t state ; return 0; } EOF -if { (eval echo configure:19053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_widec_mbstate=yes else @@ -19083,13 +19217,13 @@ fi echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:19087: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:19221: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 19093 "configure" +#line 19227 "configure" #include "confdefs.h" #include <stdlib.h> @@ -19101,7 +19235,7 @@ int main() { getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:19105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=no else @@ -19109,7 +19243,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 19113 "configure" +#line 19247 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -19122,7 +19256,7 @@ int main() { getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:19126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=yes else @@ -19141,7 +19275,7 @@ test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EX echo $ac_n "checking for term.h""... $ac_c" 1>&6 -echo "configure:19145: checking for term.h" >&5 +echo "configure:19279: checking for term.h" >&5 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19154,7 +19288,7 @@ for cf_header in \ term.h do cat > conftest.$ac_ext <<EOF -#line 19158 "configure" +#line 19292 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -19163,7 +19297,7 @@ int main() { WINDOW *x ; return 0; } EOF -if { (eval echo configure:19167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header=$cf_header break @@ -19231,9 +19365,9 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` echo $ac_n "checking for ${cf_func}""... $ac_c" 1>&6 -echo "configure:19235: checking for ${cf_func}" >&5 +echo "configure:19369: checking for ${cf_func}" >&5 -echo "(line 19237) testing ${cf_func} ..." 1>&5 +echo "(line 19371) testing ${cf_func} ..." 1>&5 if eval "test \"`echo '$''{'cf_cv_func_$cf_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -19242,7 +19376,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat > conftest.$ac_ext <<EOF -#line 19246 "configure" +#line 19380 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -19271,7 +19405,7 @@ exit(foo == 0); ; return 0; } EOF -if { (eval echo configure:19275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -19328,9 +19462,9 @@ srcdir="$srcdir" SRCDIR_CLEAN="#" if test -n "$srcdir" ; then echo srcdir is $srcdir - $CONFIG_SHELL $srcdir/mkdirs.sh WWW/Library/Implementation - $CONFIG_SHELL $srcdir/mkdirs.sh src/chrtrans - test "$USE_INCLUDED_LIBINTL" = yes && $CONFIG_SHELL $srcdir/mkdirs.sh intl + $CONFIG_SHELL $MKINSTALLDIRS WWW/Library/Implementation + $CONFIG_SHELL $MKINSTALLDIRS src/chrtrans + test "$USE_INCLUDED_LIBINTL" = yes && $CONFIG_SHELL $MKINSTALLDIRS intl test "$srcdir" != "." && SRCDIR_CLEAN="" fi @@ -19557,6 +19691,10 @@ s%@TAR@%$TAR%g s%@UUDECODE@%$UUDECODE%g s%@ZCAT@%$ZCAT%g s%@ZIP@%$ZIP%g +s%@TAR_UP_OPTIONS@%$TAR_UP_OPTIONS%g +s%@TAR_DOWN_OPTIONS@%$TAR_DOWN_OPTIONS%g +s%@TAR_FILE_OPTIONS@%$TAR_FILE_OPTIONS%g +s%@TAR_PIPE_OPTIONS@%$TAR_PIPE_OPTIONS%g s%@INSTALL@%$INSTALL%g s%@COMPRESS_PROG@%$COMPRESS_PROG%g s%@COMPRESS_EXT@%$COMPRESS_EXT%g diff --git a/configure.in b/configure.in index d60b11b3..67a7ac43 100644 --- a/configure.in +++ b/configure.in @@ -4,8 +4,8 @@ dnl by T.E.Dickey <dickey@invisible-island.net> dnl and Jim Spath <jspath@mail.bcpl.lib.md.us> dnl dnl ask PRCS to plug-in the project-version for the configure-script. -dnl $Format: AC_REVISION($ProjectVersion: 2.8.5pre.3 $\""$) -AC_REVISION(none) +dnl $Format: "AC_REVISION($ProjectVersion$)"$ +AC_REVISION(2.8.5pre.4) # Save the original $CFLAGS so we can distinguish whether the user set those # in the environment, or whether autoconf added -O and -g options: @@ -31,8 +31,9 @@ AC_CONFIG_HEADER($CONFIG_H:config.hin) CF_CHECK_CACHE PACKAGE=lynx -VERSION=2.8.5 - +dnl ask PRCS to plug-in the project-version for the packages. +# $Format: "VERSION=$ProjectVersion$"$ +VERSION=2.8.5pre.4 AC_SUBST(PACKAGE) AC_SUBST(VERSION) AC_SUBST(DESTDIR) @@ -237,12 +238,12 @@ linux*) ;; msdosdjgpp*) LIBS="$LIBS -lwatt" - TRY_CFLAGS="$TRY_CFLAGS -DDOSPATH -DNOUSERS -DWATT32" + TRY_CFLAGS="$TRY_CFLAGS -DDOSPATH -DNOUSERS" ;; next*) TRY_CFLAGS="$TRY_CFLAGS -DNEXT" ;; -openbsd*) +openbsd* | ekkobsd* | mirbsd*) LIBS="$LIBS -lcompat" ;; osf4*) @@ -933,7 +934,8 @@ CF_ARG_ENABLE(underlines, [use_underline=yes], [use_underline=no]) AC_MSG_RESULT($use_underline) -test $use_underline = yes && AC_DEFINE(UNDERLINE_LINKS) +test $use_underline = yes && AC_DEFINE(UNDERLINE_LINKS,1) +test $use_underline = no && AC_DEFINE(UNDERLINE_LINKS,0) AC_MSG_CHECKING(if help files should be gzip'ed) CF_ARG_ENABLE(gzip-help, @@ -1093,15 +1095,16 @@ if test ".$use_dired" != ".no" ; then CF_PATH_PROG(COMPRESS, compress) CF_PATH_PROG(RM, rm) -CF_PATH_PROG(TAR, tar) +CF_PATH_PROG(TAR, tar, pax gtar gnutar bsdtar star) CF_PATH_PROG(UUDECODE, uudecode) CF_PATH_PROG(ZCAT, zcat) CF_PATH_PROG(ZIP, zip) -dnl builtin: CF_PATH_PROG(CHMOD, chmod) -dnl builtin: CF_PATH_PROG(COPY, cp) -dnl builtin: CF_PATH_PROG(MKDIR, mkdir) -dnl builtin: CF_PATH_PROG(TOUCH, touch) +CF_TAR_OPTIONS($TAR) +AC_DEFINE_UNQUOTED(TAR_UP_OPTIONS, "$TAR_UP_OPTIONS") +AC_DEFINE_UNQUOTED(TAR_DOWN_OPTIONS, "$TAR_DOWN_OPTIONS") +AC_DEFINE_UNQUOTED(TAR_FILE_OPTIONS, "$TAR_FILE_OPTIONS") +AC_DEFINE_UNQUOTED(TAR_PIPE_OPTIONS, "$TAR_PIPE_OPTIONS") dnl 'INSTALL' is a special case, since the configure script has to find a dnl BSD-compatible one so the build/install works properly. @@ -1193,9 +1196,9 @@ srcdir="$srcdir" SRCDIR_CLEAN="#" if test -n "$srcdir" ; then echo srcdir is $srcdir - $CONFIG_SHELL $srcdir/mkdirs.sh WWW/Library/Implementation - $CONFIG_SHELL $srcdir/mkdirs.sh src/chrtrans - test "$USE_INCLUDED_LIBINTL" = yes && $CONFIG_SHELL $srcdir/mkdirs.sh intl + $CONFIG_SHELL $MKINSTALLDIRS WWW/Library/Implementation + $CONFIG_SHELL $MKINSTALLDIRS src/chrtrans + test "$USE_INCLUDED_LIBINTL" = yes && $CONFIG_SHELL $MKINSTALLDIRS intl test "$srcdir" != "." && SRCDIR_CLEAN="" fi diff --git a/lynx.cfg b/lynx.cfg index f9a74156..acb4f533 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -3,10 +3,10 @@ # or Lynx_Dir:lynx.cfg (VMS) # # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$ -#PRCS LYNX_VERSION "2.8.5pre.3" +#PRCS LYNX_VERSION "2.8.5pre.4" # # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$ -#PRCS LYNX_DATE "Sat, 24 Jan 2004 17:51:04 -0800" +#PRCS LYNX_DATE "Wed, 28 Jan 2004 11:30:38 -0800" # # Definition pairs are of the form VARIABLE:DEFINITION # NO spaces are allowed between the pair items. @@ -396,7 +396,12 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html #CHARACTER_SET:iso-8859-1 .h2 LOCALE_CHARSET -# LOCALE_CHARSET +# LOCALE_CHARSET overrides CHARACTER_SET if true, using the current locale to +# lookup a MIME name that corresponds, and use that as the display charset. +# This feature is experimental because while nl_langinfo(CODESET) itself is +# standardized, the return values and their relationship to the locale value is +# not. GNU libiconv happens to give useful values, but other implementations +# are not guaranteed to do this. #LOCALE_CHARSET:FALSE @@ -736,6 +741,11 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html # #SHOW_CURSOR:FALSE +.h2 UNDERLINE_LINKS +# UNDERLINE_LINKS controls whether links are underlined by default, or shown +# in bold. Normally this default is set from the configure script. +# +#UNDERLINE_LINKS:FALSE .h2 BOLD_HEADERS # If BOLD_HEADERS is set to TRUE the HT_BOLD default style will be acted @@ -3207,7 +3217,7 @@ COLOR:6:brightred:black .h2 FTP_PASSIVE # Set FTP_PASSIVE to TRUE if you want to use passive mode ftp transfers. # You might have to do this if you're behind a restrictive firewall. -#FTP_PASSIVE:FALSE +#FTP_PASSIVE:TRUE .h2 ENABLE_LYNXRC # The forms-based O'ptions menu shows a (!) marker beside items which are not @@ -3264,6 +3274,7 @@ COLOR:6:brightred:black #ENABLE_LYNXRC:show_kb_rate:OFF #ENABLE_LYNXRC:sub_bookmarks:ON #ENABLE_LYNXRC:tagsoup:OFF +#ENABLE_LYNXRC:underline_links:OFF #ENABLE_LYNXRC:user_mode:ON #ENABLE_LYNXRC:useragent:OFF #ENABLE_LYNXRC:verbose_images:ON diff --git a/lynx.hlp b/lynx.hlp index 3ae84000..a4b260c1 100644 --- a/lynx.hlp +++ b/lynx.hlp @@ -657,6 +657,9 @@ trim_input_fields trim input text/textarea fields in forms. + -underline_links + toggles use of underline/bold attribute for links. + -underscore toggles use of _underline_ format in dumps. diff --git a/lynx.man b/lynx.man index 96bc6dcd..0c33404b 100644 --- a/lynx.man +++ b/lynx.man @@ -696,6 +696,9 @@ for more information. .B trim_input_fields trim input text/textarea fields in forms. .TP +.B \-underline_links +toggles use of underline/bold attribute for links. +.TP .B \-underscore toggles use of _underline_ format in dumps. .TP diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html index f3ec861e..4afaab9e 100644 --- a/lynx_help/Lynx_users_guide.html +++ b/lynx_help/Lynx_users_guide.html @@ -526,6 +526,7 @@ HREF="keystrokes/option_help.html">HELP!</A> Document Appearance Show color : [ON....] Show cursor : [OFF] + Underline links (!) : [OFF] Show scrollbar : [OFF] Popups for select fields : [ON.] HTML error recovery (!) : [strict (SortaSGML mode)] @@ -614,31 +615,17 @@ return to Lynx or the '<em>></em>' command to save the options to a <em>Options Menu</em>: <dl> - <dt>Editor - <dd>The editor to be invoked when editing browsable files, when - sending mail or comments, when preparing a news article for - posting, and for external TEXTAREA editing. The full pathname - of the editor command should be specified when possible. - - <dt>DISPLAY variable - <dd>This option is only relevant to X Window users. The DISPLAY - (Unix) or DECW$DISPLAY (VMS) variable is picked up automatically - from the environment if it has been previously set. - - <dt>Multi-bookmarks - <dd>Lynx supports a default bookmark file, and up to 26 total - bookmark files (see below). When multi-bookmarks is OFF, - the default bookmark file is used for the '<em>v</em>'iew - bookmarks and '<em>a</em>'dd bookmark link commands. If - multi-bookmark support is available in your account, the - setting can be changed to STANDARD or ADVANCED. In STANDARD - mode, a menu of available bookmarks always is invoked when - you seek to view a bookmark file or add a link, and you select - the bookmark file by its letter token (see - <em>Bookmark file</em>, below) in that menu. In ADVANCED mode, - you instead are prompted for the letter of the desired bookmark - file, but can enter '<em>=</em>' to invoke the STANDARD selection - menu, or <em>RETURN</em> for the default bookmark file. + <dt>Assumed document character set + <dd>This option changes the handling of documents which do not + explicitly specify a charset. Normally Lynx assumes that 8-bit + characters in those documents are encoded according to iso-8859-1 + (the official default for the HTTP protocol). Unfortunately, + many non-English web pages "forget" to include proper charset info; + this option helps you to browse those broken pages if you know + by some means what the charset is. When the value + given here or by an -assume_charset command line flag is in effect, + Lynx will treat documents as if they were encoded accordingly. + This option active when 'Raw 8-bit or CJK Mode' is OFF. <dt>Bookmark file <dd>When multi-bookmarks is OFF, this is the filename and location @@ -665,12 +652,139 @@ return to Lynx or the '<em>></em>' command to save the options to a [.BM]lynx_bookmarks.html). For Win32, see [???]. + <dt>DISPLAY variable + <dd>This option is only relevant to X Window users. The DISPLAY + (Unix) or DECW$DISPLAY (VMS) variable is picked up automatically + from the environment if it has been previously set. + + <dt>Display Character set + <dd>This option allows you to set up the default character set for + your specific terminal. The display character set provides a + mapping from the character encodings of viewed documents and + from HTML entities into viewable characters. It should be set + according to your terminal's character set so that characters + other than 7-bit ASCII can be displayed correctly, using + approximations if necessary. You must have the selected + character set installed on your terminal. (Since Lynx now + supports a wide range of platforms it may be useful to note + that cpXXX codepages used within IBM PC computers, and + windows-xxxx within native MS-Windows apps.) + + <dt>Editor + <dd>The editor to be invoked when editing browsable files, when + sending mail or comments, when preparing a news article for + posting, and for external TEXTAREA editing. The full pathname + of the editor command should be specified when possible. + + <dt>Emacs keys + <dd>If set to ON then the CTRL-P, CTRL-N, CTRL-F, and CTRL-B keys + will be mapped to up-arrow, down-arrow, right-arrow, and + left-arrow, respectively. Otherwise, they remain mapped to + their configured bindings (normally UP_TWO lines, DOWN_TWO + lines, NEXT_PAGE, and PREV_PAGE, respectively). + + <p>Note: this has no direct effect on the line-editor's key bindings. + <dt>FTP sort criteria <dd>This option allows you to specify how files will be sorted within FTP listings. The current options include "<code>By Filename</code>", "<code>By Size</code>", "<code>By Type</code>", and "<code>By Date</code>". + <dt>Keypad as arrows, numbered links, numbered fields, or numbered links and form fields + <dd>This option gives the choice among navigating with the arrow + keys, or having every link numbered so that the links may be + selected or made current by numbers as well as using the arrow + keys, or having every link as well as every form field numbered + so that they can be selected or sought by numbers. See the<br> + <a href="keystrokes/follow_help.html" + >Follow link (or page) number:</a> and<br> + <a + href="keystrokes/follow_help.html#select-option" + >Select option (or page) number:</a><br> + help for more information. + + <dt>Line edit style + <dd>This option allows you to set alternative key bindings for the + built-in line editor, if alternative line-edit bindings have + been compiled in. Otherwise, Lynx uses the <a + href="keystrokes/edit_help.html">Default Binding</a>. + + <dt>List directory style + <dd>Applies to Directory Editing. Files and directories can be + presented in the following ways: + <dl> + <dt>Mixed style + <dd>Files and directories are listed together in alphabetical + order. + <dt>Directories first + <dd>Files and directories are separated into two alphabetical + lists. Directories are listed first. + <dt>Files first + <dd>Files and directories are separated into two alphabetical + lists. Files are listed first. + <p> + The Options Form also allows you to sort by the file attributes, + using the <em>Local directory sort order</em>: + <dl> + <dt>By name + <dd>by filename (the default) + <dt>By size + <dd>by file size, in descending order + <dt>By date + <dd>by file modification time, in descending order + <dt>By mode + <dd>by file protection + <dt>By type + <dd>by filename suffix, e.g., the text beginning with '.' + <dt>By user + <dd>by file owner's user-id + <dt>By group + <dd>by file owner's group-id + </dl> + </dl> + + <dt>Local execution scripts or links + <dd>Local execution is activated when Lynx is first set up. + If it has not been activated you will not see this option + in the <em>Options Menu</em>. + <dd>When a local execution script is encountered Lynx checks the + users options to see whether the script can be executed. Users + have the following options: + <dl> + <dt> Always off + <dd>Local execution scripts will never be executed + <dt>For Local files only + <dd>Local execution scripts will only be executed if the + script to be executed resides on the local machine, + and is referenced by a URL that begins with + <em>file://localhost</em> + <dt>Always on + <dd>All local execution scripts will be executed + </dl> + + <dd>If the users options permit the script to be executed Lynx will + spawn a shell and run the script. If the script cannot be + executed Lynx will show the script within the Lynx window and + inform the user that the script is not allowed to be executed + and will ask the user to check his/her options. + [<A HREF="#ToC-InteractiveOptions">ToC</A>] + + <dt>Multi-bookmarks + <dd>Lynx supports a default bookmark file, and up to 26 total + bookmark files (see below). When multi-bookmarks is OFF, + the default bookmark file is used for the '<em>v</em>'iew + bookmarks and '<em>a</em>'dd bookmark link commands. If + multi-bookmark support is available in your account, the + setting can be changed to STANDARD or ADVANCED. In STANDARD + mode, a menu of available bookmarks always is invoked when + you seek to view a bookmark file or add a link, and you select + the bookmark file by its letter token (see + <em>Bookmark file</em>, below) in that menu. In ADVANCED mode, + you instead are prompted for the letter of the desired bookmark + file, but can enter '<em>=</em>' to invoke the STANDARD selection + menu, or <em>RETURN</em> for the default bookmark file. + <dt>Personal mail address <dd>This mail address will be used to help you send files to yourself and will be included as the From: address in any mail @@ -681,12 +795,15 @@ return to Lynx or the '<em>></em>' command to save the options to a (the compilation default is not to send the header), or via the <em>-from</em> command line toggle. - <dt>Searching type - <dd>Searching type has two possible values: CASE INSENSITIVE - (default) and CASE SENSITIVE. The searching type effects - inter-document searches only, and determines whether searches - for words within documents will be done in a case-sensitive or - case-insensitive manner. + <dt>Popups for select fields + <dd>Lynx normally uses a popup window for the OPTIONs in form + SELECT fields when the field does not have the MULTIPLE + attribute specified, and thus only one OPTION can be selected. + The use of popup windows can be disabled by changing this setting + to OFF, in which case the OPTIONs will be rendered as a list of + radio buttons. Note that if the SELECT field does have the + MULTIPLE attribute specified, the OPTIONs always are rendered + as a list of checkboxes. <dt>Preferred Document Language <dd>The language you prefer if multi-language files are available @@ -709,25 +826,6 @@ return to Lynx or the '<em>></em>' command to save the options to a HTTP protocol, for servers which understand it, for example: iso-8859-5, utf-8;q=0.8 - <dt>Use locale-based character set - <dd>This option allows you to request lynx to obtain a MIME name - from the operating system which corresponds to your locale - setting. If successful, it overrides the normal setting of - the display character set. - - <dt>Display Character set - <dd>This option allows you to set up the default character set for - your specific terminal. The display character set provides a - mapping from the character encodings of viewed documents and - from HTML entities into viewable characters. It should be set - according to your terminal's character set so that characters - other than 7-bit ASCII can be displayed correctly, using - approximations if necessary. You must have the selected - character set installed on your terminal. (Since Lynx now - supports a wide range of platforms it may be useful to note - that cpXXX codepages used within IBM PC computers, and - windows-xxxx within native MS-Windows apps.) - <dt>Raw 8-bit or CJK Mode <dd>Whether 8-bit characters are assumed to correspond with the display character set and therefore are processed without @@ -746,18 +844,6 @@ return to Lynx or the '<em>></em>' command to save the options to a command, normally mapped to '<em>@</em>', and at startup via the <em>-raw</em> switch. - <dt>Assumed document character set - <dd>This option changes the handling of documents which do not - explicitly specify a charset. Normally Lynx assumes that 8-bit - characters in those documents are encoded according to iso-8859-1 - (the official default for the HTTP protocol). Unfortunately, - many non-English web pages "forget" to include proper charset info; - this option helps you to browse those broken pages if you know - by some means what the charset is. When the value - given here or by an -assume_charset command line flag is in effect, - Lynx will treat documents as if they were encoded accordingly. - This option active when 'Raw 8-bit or CJK Mode' is OFF. - <dt>Show color. <dd>This option will be present if color support is available. If set to ON or ALWAYS, color mode will be forced on if possible. @@ -793,46 +879,12 @@ return to Lynx or the '<em>></em>' command to save the options to a for any reason the startup color mode is incorrect for your terminal, set it appropriately on or off via this option. - <dt>VI keys - <dd>If set to ON then the lowercase h, j, k, and l keys will be - mapped to left, down, up, and right arrow, respectively. The - uppercase H, J, K, and L keys remain mapped to their configured - bindings (normally HELP, JUMP, KEYMAP, and LIST, respectively). - - <p>Note: this has no effect on the line-editor's key bindings. - - <dt>Emacs keys - <dd>If set to ON then the CTRL-P, CTRL-N, CTRL-F, and CTRL-B keys - will be mapped to up-arrow, down-arrow, right-arrow, and - left-arrow, respectively. Otherwise, they remain mapped to - their configured bindings (normally UP_TWO lines, DOWN_TWO - lines, NEXT_PAGE, and PREV_PAGE, respectively). - - <p>Note: this has no direct effect on the line-editor's key bindings. - - <dt>Visited Pages - <dd>Enable several different views of the visited links: - <dl> - <dt>By First Visit - <dt>By First Visit Reversed - <dt>As Visit Tree - <dt>By Last Visit - <dt>By Last Visit Reversed - </dl> - - <dt>Show dot files - <dd>If display/creation of hidden (dot) files/directories is - enabled, you can turn the feature on or off via this setting. - - <dt>Popups for select fields - <dd>Lynx normally uses a popup window for the OPTIONs in form - SELECT fields when the field does not have the MULTIPLE - attribute specified, and thus only one OPTION can be selected. - The use of popup windows can be disabled by changing this setting - to OFF, in which case the OPTIONs will be rendered as a list of - radio buttons. Note that if the SELECT field does have the - MULTIPLE attribute specified, the OPTIONs always are rendered - as a list of checkboxes. + <dt>Searching type + <dd>Searching type has two possible values: CASE INSENSITIVE + (default) and CASE SENSITIVE. The searching type effects + inter-document searches only, and determines whether searches + for words within documents will be done in a case-sensitive or + case-insensitive manner. <dt>Show cursor for current link or option. <dd>Lynx normally hides the cursor by positioning it to the right @@ -846,80 +898,18 @@ return to Lynx or the '<em>></em>' command to save the options to a to distinguish the current link or OPTION from the others in the screen display. - <dt>Keypad as arrows, numbered links, numbered fields, or numbered links and form fields - <dd>This option gives the choice among navigating with the arrow - keys, or having every link numbered so that the links may be - selected or made current by numbers as well as using the arrow - keys, or having every link as well as every form field numbered - so that they can be selected or sought by numbers. See the<br> - <a href="keystrokes/follow_help.html" - >Follow link (or page) number:</a> and<br> - <a - href="keystrokes/follow_help.html#select-option" - >Select option (or page) number:</a><br> - help for more information. - - <dt>Line edit style - <dd>This option allows you to set alternative key bindings for the - built-in line editor, if alternative line-edit bindings have - been compiled in. Otherwise, Lynx uses the <a - href="keystrokes/edit_help.html">Default Binding</a>. - - <dt>List directory style - <dd>Applies to Directory Editing. Files and directories can be - presented in the following ways: - <dl> - <dt>Mixed style - <dd>Files and directories are listed together in alphabetical - order. - <dt>Directories first - <dd>Files and directories are separated into two alphabetical - lists. Directories are listed first. - <dt>Files first - <dd>Files and directories are separated into two alphabetical - lists. Files are listed first. - <p> - The Options Form also allows you to sort by the file attributes, - using the <em>Local directory sort order</em>: - <dl> - <dt>By name - <dd>by filename (the default) - <dt>By size - <dd>by file size, in descending order - <dt>By date - <dd>by file modification time, in descending order - <dt>By mode - <dd>by file protection - <dt>By type - <dd>by filename suffix, e.g., the text beginning with '.' - <dt>By user - <dd>by file owner's user-id - <dt>By group - <dd>by file owner's group-id - </dl> - </dl> + <dt>Show dot files + <dd>If display/creation of hidden (dot) files/directories is + enabled, you can turn the feature on or off via this setting. - <dt>User Mode - <dd>There are three possible choices: Novice, Intermediate, and - Advanced. - <dl> - <dt>Novice - <dd>In Novice mode two lines of help are displayed at the - bottom of the screen. - <dt>Intermediate - <dd>Intermediate mode turns off the help lines. - <dt>Advanced - <dd>Advanced mode displays the URL of the currently selected - link at the bottom of the screen. - </dl> + <dt>Use locale-based character set + <dd>This option allows you to request lynx to obtain a MIME name + from the operating system which corresponds to your locale + setting. If successful, it overrides the normal setting of + the display character set. - <dt>Verbose Images - <dd>Controls whether or not Lynx replaces the [LINK], [INLINE] and - [IMAGE] comments (for images without ALT) with filenames of these - images. This is extremely useful because now we can determine - immediately what images are just decorations (button.gif, line.gif) - and what images are important. This setting can also be toggled - on startup via the <em>-verbose</em> switch. + <dt>Underline links + <dd>Use underline-attribute rather than bold for links. <dt>User Agent <dd>The header string which Lynx sends to HTTP servers to indicate the @@ -946,31 +936,45 @@ return to Lynx or the '<em>></em>' command to save the options to a header is changed to one which does not include "Lynx" or "L_y_n_x". - <dt>Local execution scripts or links - <dd>Local execution is activated when Lynx is first set up. - If it has not been activated you will not see this option - in the <em>Options Menu</em>. - <dd>When a local execution script is encountered Lynx checks the - users options to see whether the script can be executed. Users - have the following options: - <dl> - <dt> Always off - <dd>Local execution scripts will never be executed - <dt>For Local files only - <dd>Local execution scripts will only be executed if the - script to be executed resides on the local machine, - and is referenced by a URL that begins with - <em>file://localhost</em> - <dt>Always on - <dd>All local execution scripts will be executed - </dl> + <dt>User Mode + <dd>There are three possible choices: Novice, Intermediate, and + Advanced. + <dl> + <dt>Novice + <dd>In Novice mode two lines of help are displayed at the + bottom of the screen. + <dt>Intermediate + <dd>Intermediate mode turns off the help lines. + <dt>Advanced + <dd>Advanced mode displays the URL of the currently selected + link at the bottom of the screen. + </dl> - <dd>If the users options permit the script to be executed Lynx will - spawn a shell and run the script. If the script cannot be - executed Lynx will show the script within the Lynx window and - inform the user that the script is not allowed to be executed - and will ask the user to check his/her options. - [<A HREF="#ToC-InteractiveOptions">ToC</A>] + <dt>Verbose Images + <dd>Controls whether or not Lynx replaces the [LINK], [INLINE] and + [IMAGE] comments (for images without ALT) with filenames of these + images. This is extremely useful because now we can determine + immediately what images are just decorations (button.gif, line.gif) + and what images are important. This setting can also be toggled + on startup via the <em>-verbose</em> switch. + + <dt>VI keys + <dd>If set to ON then the lowercase h, j, k, and l keys will be + mapped to left, down, up, and right arrow, respectively. The + uppercase H, J, K, and L keys remain mapped to their configured + bindings (normally HELP, JUMP, KEYMAP, and LIST, respectively). + + <p>Note: this has no effect on the line-editor's key bindings. + + <dt>Visited Pages + <dd>Enable several different views of the visited links: + <dl> + <dt>By First Visit + <dt>By First Visit Reversed + <dt>As Visit Tree + <dt>By Last Visit + <dt>By Last Visit Reversed + </dl> </dl> <h2 ID="Mail"><A NAME="Mail"><em>Comments and mailto: links</em></A></h2> diff --git a/makefile.in b/makefile.in index 9842a1b4..ed385a98 100644 --- a/makefile.in +++ b/makefile.in @@ -25,8 +25,15 @@ LIBS = @LIBS@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ + LN_S = @LN_S@ +MKINSTALLDIRS = @MKINSTALLDIRS@ + +TAR = @TAR@ +TAR_UP = $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@ +TAR_DOWN = $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@ + ## This is the version which we are developing (or, upon release, make this ## the same). Use no dots in the name, since it must work on VMS and MS-DOS. VERSION = 2-8-5 @@ -246,7 +253,7 @@ zip: clean cd ..; rm -f $(lynxname).zip; zip -r $(lynxname).zip $(lynxdir) save: - cd ..; rm -f $(lynxname).tar; tar -cf - $(lynxdir) > $(lynxname).tar + cd ..; rm -f $(lynxname).tar; $(TAR_UP) $(lynxdir) > $(lynxname).tar compress: tar cd ..; rm -f $(lynxname).tar.Z; compress -f -v $(lynxname).tar @@ -291,8 +298,8 @@ install-man : $(MANDIR) install-doc : $(DOCDIR) $(HELPDIR) @echo Copying sample files - (cd $(srcdir) && tar cf - C[HO]* PROBLEMS README docs samples test ) | \ - ( cd $(DOCDIR) && chmod -R u+w . && tar xf - ) + (cd $(srcdir) && $(TAR_UP) C[HO]* PROBLEMS README docs samples test ) | \ + ( cd $(DOCDIR) && chmod -R u+w . && $(TAR_DOWN) ) $(SHELL) -c 'if test "$(COMPRESS_PROG)" != "" ; then \ (cd $(DOCDIR) && $(COMPRESS_PROG) -f docs/CHANGES*.[0-9] docs/*.announce ) \ fi' @@ -300,6 +307,7 @@ install-doc : $(DOCDIR) $(HELPDIR) cd $(HELPDIR) && rm -f $$name ;\ cd $(HELPDIR) && ( $(LN_S) $(DOCDIR)/$$name . || cp $(DOCDIR)/$$name . );\ done' + -$(SHELL) -c 'case `id|sed -e "s/(.*//"` in uid=0) chown -R root $(DOCDIR);; esac' # HPUX 'sed' does not seem to like '=' as pattern delimiter. # We cannot use '%' because it may appear in a URL. @@ -418,6 +426,6 @@ $(MANDIR) \ $(LIBDIR) \ $(HELPDIR) \ $(DOCDIR) : - $(SHELL) $(srcdir)/mkdirs.sh $@ + $(SHELL) $(MKINSTALLDIRS) $@ etags: etags -r "/\(PRIVATE\|PUBLIC\)[ \t]+\([a-zA-Z_][a-zA-Z_0-1]*[ \t*]+\)*\([a-zA-Z_][a-zA-Z_0-1]*\)[ \t]+\(ARGS[0-9]\|NOARGS\)/\3/" *.[ch] */*.[ch] */*/*.[ch] */*/*/*.[ch] diff --git a/po/lynx.pot b/po/lynx.pot index 37ea90f2..6fb3048c 100644 --- a/po/lynx.pot +++ b/po/lynx.pot @@ -1,14 +1,9 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: lynx 2.8.5pre.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-01-22 20:49-0500\n" +"POT-Creation-Date: 2004-01-26 20:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -3819,272 +3814,272 @@ msgstr "" msgid "Visible links" msgstr "" -#: src/LYLocal.c:267 +#: src/LYLocal.c:268 #, c-format msgid "Unable to get status of '%s'." msgstr "" -#: src/LYLocal.c:301 +#: src/LYLocal.c:302 msgid "The selected item is not a file or a directory! Request ignored." msgstr "" -#: src/LYLocal.c:366 +#: src/LYLocal.c:367 #, c-format msgid "Unable to %s due to system error!" msgstr "" #. error return -#: src/LYLocal.c:400 +#: src/LYLocal.c:401 #, c-format msgid "Probable failure to %s due to system error!" msgstr "" -#: src/LYLocal.c:463 src/LYLocal.c:484 +#: src/LYLocal.c:464 src/LYLocal.c:485 #, c-format msgid "remove %s" msgstr "" -#: src/LYLocal.c:502 +#: src/LYLocal.c:503 #, c-format msgid "touch %s" msgstr "" -#: src/LYLocal.c:529 +#: src/LYLocal.c:530 #, c-format msgid "move %s to %s" msgstr "" -#: src/LYLocal.c:569 +#: src/LYLocal.c:570 msgid "There is already a directory with that name! Request ignored." msgstr "" -#: src/LYLocal.c:571 +#: src/LYLocal.c:572 msgid "There is already a file with that name! Request ignored." msgstr "" -#: src/LYLocal.c:573 +#: src/LYLocal.c:574 msgid "The specified name is already in use! Request ignored." msgstr "" -#: src/LYLocal.c:584 +#: src/LYLocal.c:585 msgid "Destination has different owner! Request denied." msgstr "" -#: src/LYLocal.c:587 +#: src/LYLocal.c:588 msgid "Destination is not a valid directory! Request denied." msgstr "" -#: src/LYLocal.c:609 +#: src/LYLocal.c:610 msgid "Remove all tagged files and directories?" msgstr "" -#: src/LYLocal.c:668 +#: src/LYLocal.c:669 msgid "Enter new location for tagged items: " msgstr "" -#: src/LYLocal.c:737 +#: src/LYLocal.c:738 msgid "Path too long" msgstr "" -#: src/LYLocal.c:768 +#: src/LYLocal.c:769 msgid "Source and destination are the same location - request ignored!" msgstr "" -#: src/LYLocal.c:826 +#: src/LYLocal.c:827 msgid "Enter new name for directory: " msgstr "" -#: src/LYLocal.c:828 +#: src/LYLocal.c:829 msgid "Enter new name for file: " msgstr "" -#: src/LYLocal.c:840 +#: src/LYLocal.c:841 msgid "Illegal character (path-separator) found! Request ignored." msgstr "" -#: src/LYLocal.c:889 +#: src/LYLocal.c:890 msgid "Enter new location for directory: " msgstr "" -#: src/LYLocal.c:895 +#: src/LYLocal.c:896 msgid "Enter new location for file: " msgstr "" -#: src/LYLocal.c:922 +#: src/LYLocal.c:923 msgid "Unexpected failure - unable to find trailing path separator" msgstr "" -#: src/LYLocal.c:942 +#: src/LYLocal.c:943 msgid "Source and destination are the same location! Request ignored!" msgstr "" -#: src/LYLocal.c:991 +#: src/LYLocal.c:992 msgid "Modify name, location, or permission (n, l, or p): " msgstr "" -#: src/LYLocal.c:993 +#: src/LYLocal.c:994 msgid "Modify name or location (n or l): " msgstr "" #. #. * Code for changing ownership needed here. #. -#: src/LYLocal.c:1022 +#: src/LYLocal.c:1023 msgid "This feature not yet implemented!" msgstr "" -#: src/LYLocal.c:1040 +#: src/LYLocal.c:1041 msgid "Enter name of file to create: " msgstr "" -#: src/LYLocal.c:1048 src/LYLocal.c:1090 +#: src/LYLocal.c:1049 src/LYLocal.c:1091 msgid "Illegal redirection \"//\" found! Request ignored." msgstr "" -#: src/LYLocal.c:1082 +#: src/LYLocal.c:1083 msgid "Enter name for new directory: " msgstr "" -#: src/LYLocal.c:1127 +#: src/LYLocal.c:1128 msgid "Create file or directory (f or d): " msgstr "" -#: src/LYLocal.c:1168 +#: src/LYLocal.c:1169 #, c-format -msgid "Remove '%s' and all of its contents?" +msgid "Remove directory '%s'?" msgstr "" -#: src/LYLocal.c:1171 -msgid "Remove directory and all of its contents?" +#: src/LYLocal.c:1172 +msgid "Remove directory?" msgstr "" -#: src/LYLocal.c:1176 +#: src/LYLocal.c:1177 #, c-format msgid "Remove file '%s'?" msgstr "" -#: src/LYLocal.c:1178 +#: src/LYLocal.c:1179 msgid "Remove file?" msgstr "" -#: src/LYLocal.c:1183 +#: src/LYLocal.c:1184 #, c-format msgid "Remove symbolic link '%s'?" msgstr "" -#: src/LYLocal.c:1185 +#: src/LYLocal.c:1186 msgid "Remove symbolic link?" msgstr "" -#: src/LYLocal.c:1273 +#: src/LYLocal.c:1274 msgid "Sorry, don't know how to permit non-UNIX files yet." msgstr "" -#: src/LYLocal.c:1303 +#: src/LYLocal.c:1304 msgid "Unable to open permit options file" msgstr "" -#: src/LYLocal.c:1330 +#: src/LYLocal.c:1331 msgid "Specify permissions below:" msgstr "" -#: src/LYLocal.c:1331 src/LYShowInfo.c:196 +#: src/LYLocal.c:1332 src/LYShowInfo.c:196 msgid "Owner:" msgstr "" -#: src/LYLocal.c:1347 +#: src/LYLocal.c:1348 msgid "Group" msgstr "" -#: src/LYLocal.c:1363 +#: src/LYLocal.c:1364 msgid "Others:" msgstr "" -#: src/LYLocal.c:1381 +#: src/LYLocal.c:1382 msgid "form to permit" msgstr "" -#: src/LYLocal.c:1477 +#: src/LYLocal.c:1478 msgid "Invalid mode format." msgstr "" -#: src/LYLocal.c:1481 +#: src/LYLocal.c:1482 msgid "Invalid syntax format." msgstr "" -#: src/LYLocal.c:1670 +#: src/LYLocal.c:1671 msgid "Warning! UUDecoded file will exist in the directory you started Lynx." msgstr "" -#: src/LYLocal.c:1850 +#: src/LYLocal.c:1862 msgid "NULL URL pointer" msgstr "" -#: src/LYLocal.c:1933 +#: src/LYLocal.c:1945 #, c-format msgid "Executing %s " msgstr "" -#: src/LYLocal.c:1936 +#: src/LYLocal.c:1948 msgid "Executing system command. This might take a while." msgstr "" -#: src/LYLocal.c:2010 +#: src/LYLocal.c:2022 msgid "Current directory:" msgstr "" -#: src/LYLocal.c:2013 src/LYLocal.c:2031 +#: src/LYLocal.c:2025 src/LYLocal.c:2043 msgid "Current selection:" msgstr "" -#: src/LYLocal.c:2017 +#: src/LYLocal.c:2029 msgid "Nothing currently selected." msgstr "" -#: src/LYLocal.c:2032 +#: src/LYLocal.c:2044 msgid "tagged item:" msgstr "" -#: src/LYLocal.c:2032 +#: src/LYLocal.c:2044 msgid "tagged items:" msgstr "" -#: src/LYLocal.c:2130 src/LYLocal.c:2141 +#: src/LYLocal.c:2142 src/LYLocal.c:2153 msgid "Illegal filename; request ignored." msgstr "" #. directory not writable -#: src/LYLocal.c:2238 src/LYLocal.c:2296 +#: src/LYLocal.c:2250 src/LYLocal.c:2308 msgid "Install in the selected directory not permitted." msgstr "" -#: src/LYLocal.c:2292 +#: src/LYLocal.c:2304 msgid "The selected item is not a directory! Request ignored." msgstr "" -#: src/LYLocal.c:2301 +#: src/LYLocal.c:2313 msgid "Just a moment, ..." msgstr "" -#: src/LYLocal.c:2318 +#: src/LYLocal.c:2330 msgid "Error buiding install args" msgstr "" -#: src/LYLocal.c:2333 src/LYLocal.c:2362 +#: src/LYLocal.c:2345 src/LYLocal.c:2374 #, c-format msgid "Source and target are the same: %s" msgstr "" -#: src/LYLocal.c:2340 src/LYLocal.c:2369 +#: src/LYLocal.c:2352 src/LYLocal.c:2381 #, c-format msgid "Already in target directory: %s" msgstr "" -#: src/LYLocal.c:2387 +#: src/LYLocal.c:2399 msgid "Installation complete" msgstr "" -#: src/LYLocal.c:2576 +#: src/LYLocal.c:2588 msgid "Temporary URL or list would be too long." msgstr "" @@ -4123,19 +4118,19 @@ msgstr "" msgid "No system mailer configured" msgstr "" -#: src/LYMain.c:971 +#: src/LYMain.c:976 msgid "No Winsock found, sorry." msgstr "" -#: src/LYMain.c:1173 +#: src/LYMain.c:1178 msgid "You MUST define a valid TMP or TEMP area!\n" msgstr "" -#: src/LYMain.c:1227 src/LYMainLoop.c:5027 +#: src/LYMain.c:1232 src/LYMainLoop.c:5027 msgid "No such directory" msgstr "" -#: src/LYMain.c:1439 +#: src/LYMain.c:1444 #, c-format msgid "" "\n" @@ -4143,21 +4138,21 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1449 +#: src/LYMain.c:1454 msgid "" "\n" "Lynx character sets not declared.\n" "\n" msgstr "" -#: src/LYMain.c:1478 +#: src/LYMain.c:1483 msgid "" "\n" "Lynx edit map not declared.\n" "\n" msgstr "" -#: src/LYMain.c:1507 +#: src/LYMain.c:1512 #, c-format msgid "" "\n" @@ -4165,54 +4160,54 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1746 +#: src/LYMain.c:1755 msgid "Warning:" msgstr "" -#: src/LYMain.c:2296 +#: src/LYMain.c:2305 msgid "persistent cookies state will be changed in next session only." msgstr "" -#: src/LYMain.c:2543 src/LYMain.c:2591 +#: src/LYMain.c:2552 src/LYMain.c:2600 #, c-format msgid "Lynx: ignoring unrecognized charset=%s\n" msgstr "" -#: src/LYMain.c:3123 +#: src/LYMain.c:3132 #, c-format msgid "%s Version %s (%s)" msgstr "" -#: src/LYMain.c:3146 +#: src/LYMain.c:3155 #, c-format msgid "Built on %s %s %s\n" msgstr "" -#: src/LYMain.c:3169 +#: src/LYMain.c:3178 msgid "" "Copyrights held by the University of Kansas, CERN, and other contributors.\n" msgstr "" -#: src/LYMain.c:3171 +#: src/LYMain.c:3180 msgid "Distributed under the GNU General Public License.\n" msgstr "" -#: src/LYMain.c:3173 +#: src/LYMain.c:3182 msgid "" "See http://lynx.isc.org/ and the online help for more information.\n" "\n" msgstr "" -#: src/LYMain.c:3922 +#: src/LYMain.c:3935 #, c-format msgid "USAGE: %s [options] [file]\n" msgstr "" -#: src/LYMain.c:3923 +#: src/LYMain.c:3936 msgid "Options are:\n" msgstr "" -#: src/LYMain.c:4194 +#: src/LYMain.c:4207 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "" @@ -4387,8 +4382,8 @@ msgid "ON" msgstr "" #. verbose_img variable -#: src/LYOptions.c:2104 src/LYOptions.c:2108 src/LYOptions.c:2235 -#: src/LYOptions.c:2244 +#: src/LYOptions.c:2104 src/LYOptions.c:2108 src/LYOptions.c:2237 +#: src/LYOptions.c:2246 msgid "OFF" msgstr "" @@ -4400,7 +4395,7 @@ msgstr "" msgid "ALWAYS" msgstr "" -#: src/LYOptions.c:2120 src/LYOptions.c:2228 +#: src/LYOptions.c:2120 src/LYOptions.c:2230 msgid "ignore" msgstr "" @@ -4448,227 +4443,231 @@ msgstr "" msgid "Case sensitive" msgstr "" -#: src/LYOptions.c:2181 +#: src/LYOptions.c:2183 msgid "prompt normally" msgstr "" -#: src/LYOptions.c:2182 +#: src/LYOptions.c:2184 msgid "force yes-response" msgstr "" -#: src/LYOptions.c:2183 +#: src/LYOptions.c:2185 msgid "force no-response" msgstr "" -#: src/LYOptions.c:2198 +#: src/LYOptions.c:2200 msgid "Novice" msgstr "" -#: src/LYOptions.c:2199 +#: src/LYOptions.c:2201 msgid "Intermediate" msgstr "" -#: src/LYOptions.c:2200 +#: src/LYOptions.c:2202 msgid "Advanced" msgstr "" -#: src/LYOptions.c:2207 +#: src/LYOptions.c:2209 msgid "By First Visit" msgstr "" -#: src/LYOptions.c:2209 +#: src/LYOptions.c:2211 msgid "By First Visit Reversed" msgstr "" -#: src/LYOptions.c:2210 +#: src/LYOptions.c:2212 msgid "As Visit Tree" msgstr "" -#: src/LYOptions.c:2211 +#: src/LYOptions.c:2213 msgid "By Last Visit" msgstr "" -#: src/LYOptions.c:2213 +#: src/LYOptions.c:2215 msgid "By Last Visit Reversed" msgstr "" #. Old_DTD variable -#: src/LYOptions.c:2222 +#: src/LYOptions.c:2224 msgid "relaxed (TagSoup mode)" msgstr "" -#: src/LYOptions.c:2223 +#: src/LYOptions.c:2225 msgid "strict (SortaSGML mode)" msgstr "" -#: src/LYOptions.c:2229 +#: src/LYOptions.c:2231 msgid "as labels" msgstr "" -#: src/LYOptions.c:2230 +#: src/LYOptions.c:2232 msgid "as links" msgstr "" -#: src/LYOptions.c:2236 +#: src/LYOptions.c:2238 msgid "show filename" msgstr "" -#: src/LYOptions.c:2245 +#: src/LYOptions.c:2247 msgid "STANDARD" msgstr "" -#: src/LYOptions.c:2246 +#: src/LYOptions.c:2248 msgid "ADVANCED" msgstr "" -#: src/LYOptions.c:2266 +#: src/LYOptions.c:2272 msgid "Directories first" msgstr "" -#: src/LYOptions.c:2267 +#: src/LYOptions.c:2273 msgid "Files first" msgstr "" -#: src/LYOptions.c:2268 +#: src/LYOptions.c:2274 msgid "Mixed style" msgstr "" -#: src/LYOptions.c:2273 src/LYOptions.c:2288 +#: src/LYOptions.c:2279 src/LYOptions.c:2294 msgid "By Name" msgstr "" -#: src/LYOptions.c:2274 src/LYOptions.c:2289 +#: src/LYOptions.c:2280 src/LYOptions.c:2295 msgid "By Type" msgstr "" -#: src/LYOptions.c:2275 src/LYOptions.c:2290 +#: src/LYOptions.c:2281 src/LYOptions.c:2296 msgid "By Size" msgstr "" -#: src/LYOptions.c:2276 src/LYOptions.c:2291 +#: src/LYOptions.c:2282 src/LYOptions.c:2297 msgid "By Date" msgstr "" -#: src/LYOptions.c:2277 +#: src/LYOptions.c:2283 msgid "By Mode" msgstr "" -#: src/LYOptions.c:2279 +#: src/LYOptions.c:2285 msgid "By User" msgstr "" -#: src/LYOptions.c:2280 +#: src/LYOptions.c:2286 msgid "By Group" msgstr "" -#: src/LYOptions.c:2297 +#: src/LYOptions.c:2303 msgid "Do not show rate" msgstr "" -#: src/LYOptions.c:2298 src/LYOptions.c:2299 +#: src/LYOptions.c:2304 src/LYOptions.c:2305 #, c-format msgid "Show %s/sec rate" msgstr "" -#: src/LYOptions.c:2301 src/LYOptions.c:2302 +#: src/LYOptions.c:2307 src/LYOptions.c:2308 #, c-format msgid "Show %s/sec, ETA" msgstr "" -#: src/LYOptions.c:2552 src/LYOptions.c:2576 +#: src/LYOptions.c:2558 src/LYOptions.c:2582 #, c-format msgid "Use %s to invoke the Options menu!" msgstr "" -#: src/LYOptions.c:3273 +#: src/LYOptions.c:3297 msgid "(options marked with (!) will not be saved)" msgstr "" -#: src/LYOptions.c:3281 +#: src/LYOptions.c:3305 msgid "General Preferences" msgstr "" #. *************************************************************** #. User Mode: SELECT -#: src/LYOptions.c:3285 +#: src/LYOptions.c:3309 msgid "User mode" msgstr "" #. Editor: INPUT -#: src/LYOptions.c:3291 +#: src/LYOptions.c:3315 msgid "Editor" msgstr "" #. Search Type: SELECT -#: src/LYOptions.c:3296 +#: src/LYOptions.c:3320 msgid "Type of Search" msgstr "" -#: src/LYOptions.c:3301 +#: src/LYOptions.c:3325 msgid "Security and Privacy" msgstr "" #. *************************************************************** #. Cookies: SELECT -#: src/LYOptions.c:3305 +#: src/LYOptions.c:3329 msgid "Cookies" msgstr "" #. Cookie Prompting: SELECT -#: src/LYOptions.c:3319 +#: src/LYOptions.c:3343 msgid "Invalid-Cookie Prompting" msgstr "" #. SSL Prompting: SELECT -#: src/LYOptions.c:3326 +#: src/LYOptions.c:3350 msgid "SSL Prompting" msgstr "" -#: src/LYOptions.c:3332 +#: src/LYOptions.c:3356 msgid "Keyboard Input" msgstr "" #. *************************************************************** #. Keypad Mode: SELECT -#: src/LYOptions.c:3336 +#: src/LYOptions.c:3360 msgid "Keypad mode" msgstr "" #. Emacs keys: ON/OFF -#: src/LYOptions.c:3342 +#: src/LYOptions.c:3366 msgid "Emacs keys" msgstr "" #. VI Keys: ON/OFF -#: src/LYOptions.c:3348 +#: src/LYOptions.c:3372 msgid "VI keys" msgstr "" #. Line edit style: SELECT #. well, at least 2 line edit styles available -#: src/LYOptions.c:3355 +#: src/LYOptions.c:3379 msgid "Line edit style" msgstr "" #. Keyboard layout: SELECT -#: src/LYOptions.c:3367 +#: src/LYOptions.c:3391 msgid "Keyboard layout" msgstr "" #. #. * Display and Character Set #. -#: src/LYOptions.c:3380 +#: src/LYOptions.c:3404 msgid "Display and Character Set" msgstr "" -#. *************************************************************** +#. Use locale-based character set: ON/OFF +#: src/LYOptions.c:3409 +msgid "Use locale-based character set" +msgstr "" + #. Display Character Set: SELECT -#: src/LYOptions.c:3384 +#: src/LYOptions.c:3418 msgid "Display character set" msgstr "" -#: src/LYOptions.c:3413 +#: src/LYOptions.c:3447 msgid "Assumed document character set" msgstr "" @@ -4677,152 +4676,157 @@ msgstr "" #. * we split the header to make it more readable: #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others. #. -#: src/LYOptions.c:3433 +#: src/LYOptions.c:3467 msgid "CJK mode" msgstr "" -#: src/LYOptions.c:3435 +#: src/LYOptions.c:3469 msgid "Raw 8-bit" msgstr "" #. X Display: INPUT -#: src/LYOptions.c:3443 +#: src/LYOptions.c:3477 msgid "X Display" msgstr "" #. #. * Document Appearance #. -#: src/LYOptions.c:3449 +#: src/LYOptions.c:3483 msgid "Document Appearance" msgstr "" -#: src/LYOptions.c:3455 +#: src/LYOptions.c:3489 msgid "Show color" msgstr "" #. Show cursor: ON/OFF -#: src/LYOptions.c:3479 +#: src/LYOptions.c:3513 msgid "Show cursor" msgstr "" +#. Underline links: ON/OFF +#: src/LYOptions.c:3519 +msgid "Underline links" +msgstr "" + #. Show scrollbar: ON/OFF -#: src/LYOptions.c:3486 +#: src/LYOptions.c:3526 msgid "Show scrollbar" msgstr "" #. Select Popups: ON/OFF -#: src/LYOptions.c:3493 +#: src/LYOptions.c:3533 msgid "Popups for select fields" msgstr "" #. HTML error recovery: SELECT -#: src/LYOptions.c:3499 +#: src/LYOptions.c:3539 msgid "HTML error recovery" msgstr "" #. Show Images: SELECT -#: src/LYOptions.c:3505 +#: src/LYOptions.c:3545 msgid "Show images" msgstr "" #. Verbose Images: ON/OFF -#: src/LYOptions.c:3519 +#: src/LYOptions.c:3559 msgid "Verbose images" msgstr "" #. #. * Headers Transferred to Remote Servers #. -#: src/LYOptions.c:3527 +#: src/LYOptions.c:3567 msgid "Headers Transferred to Remote Servers" msgstr "" #. *************************************************************** #. Mail Address: INPUT -#: src/LYOptions.c:3531 +#: src/LYOptions.c:3571 msgid "Personal mail address" msgstr "" #. Preferred Document Character Set: INPUT -#: src/LYOptions.c:3536 +#: src/LYOptions.c:3576 msgid "Preferred document character set" msgstr "" #. Preferred Document Language: INPUT -#: src/LYOptions.c:3541 +#: src/LYOptions.c:3581 msgid "Preferred document language" msgstr "" -#: src/LYOptions.c:3547 +#: src/LYOptions.c:3587 msgid "User-Agent header" msgstr "" #. #. * Listing and Accessing Files #. -#: src/LYOptions.c:3555 +#: src/LYOptions.c:3595 msgid "Listing and Accessing Files" msgstr "" #. *************************************************************** #. FTP sort: SELECT -#: src/LYOptions.c:3559 +#: src/LYOptions.c:3599 msgid "FTP sort criteria" msgstr "" #. Local Directory Sort: SELECT -#: src/LYOptions.c:3566 +#: src/LYOptions.c:3606 msgid "Local directory sort criteria" msgstr "" #. Local Directory Order: SELECT -#: src/LYOptions.c:3572 +#: src/LYOptions.c:3612 msgid "Local directory sort order" msgstr "" -#: src/LYOptions.c:3581 +#: src/LYOptions.c:3621 msgid "Show dot files" msgstr "" -#: src/LYOptions.c:3589 +#: src/LYOptions.c:3629 msgid "Execution links" msgstr "" #. Show transfer rate: SELECT -#: src/LYOptions.c:3609 +#: src/LYOptions.c:3649 msgid "Show transfer rate" msgstr "" #. #. * Special Files and Screens #. -#: src/LYOptions.c:3628 +#: src/LYOptions.c:3668 msgid "Special Files and Screens" msgstr "" -#: src/LYOptions.c:3633 +#: src/LYOptions.c:3673 msgid "Multi-bookmarks" msgstr "" -#: src/LYOptions.c:3641 +#: src/LYOptions.c:3681 msgid "Review/edit Bookmarks files" msgstr "" -#: src/LYOptions.c:3643 +#: src/LYOptions.c:3683 msgid "Goto multi-bookmark menu" msgstr "" -#: src/LYOptions.c:3645 +#: src/LYOptions.c:3685 msgid "Bookmarks file" msgstr "" #. Visited Pages: SELECT -#: src/LYOptions.c:3651 +#: src/LYOptions.c:3691 msgid "Visited Pages" msgstr "" -#: src/LYOptions.c:3656 +#: src/LYOptions.c:3696 msgid "View the file " msgstr "" @@ -4935,38 +4939,38 @@ msgstr "" msgid "(no name)" msgstr "" -#: src/LYReadCFG.c:1783 +#: src/LYReadCFG.c:1787 #, c-format msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n" msgstr "" -#: src/LYReadCFG.c:1785 +#: src/LYReadCFG.c:1789 #, c-format msgid "Last attempted include was '%s',\n" msgstr "" -#: src/LYReadCFG.c:1786 +#: src/LYReadCFG.c:1790 #, c-format msgid "included from '%s'.\n" msgstr "" -#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205 src/LYReadCFG.c:2263 +#: src/LYReadCFG.c:2196 src/LYReadCFG.c:2209 src/LYReadCFG.c:2267 msgid "The following is read from your lynx.cfg file." msgstr "" -#: src/LYReadCFG.c:2193 src/LYReadCFG.c:2206 +#: src/LYReadCFG.c:2197 src/LYReadCFG.c:2210 msgid "Please read the distribution" msgstr "" -#: src/LYReadCFG.c:2199 src/LYReadCFG.c:2209 +#: src/LYReadCFG.c:2203 src/LYReadCFG.c:2213 msgid "for more comments." msgstr "" -#: src/LYReadCFG.c:2245 +#: src/LYReadCFG.c:2249 msgid "RELOAD THE CHANGES" msgstr "" -#: src/LYReadCFG.c:2254 +#: src/LYReadCFG.c:2258 msgid "Your primary configuration" msgstr "" @@ -5341,7 +5345,7 @@ msgid "" "Current lineedit modes are:\n" msgstr "" -#: src/LYrcFile.c:404 +#: src/LYrcFile.c:407 msgid "" "The following allow you to define sub-bookmark files and descriptions.\n" "The format is multi_bookmark<capital_letter>=<filename>,<description>\n" @@ -5349,7 +5353,7 @@ msgid "" "We start with \"multi_bookmarkB\" since 'A' is the default (see above).\n" msgstr "" -#: src/LYrcFile.c:410 +#: src/LYrcFile.c:413 msgid "" "personal_mail_address specifies your personal mail address. The\n" "address will be sent during HTTP file transfers for authorization and\n" @@ -5360,7 +5364,7 @@ msgid "" "your mailed comments.\n" msgstr "" -#: src/LYrcFile.c:419 +#: src/LYrcFile.c:422 msgid "" "preferred_charset specifies the character set in MIME notation (e.g.,\n" "ISO-8859-2, ISO-8859-5) which Lynx will indicate you prefer in requests\n" @@ -5376,7 +5380,7 @@ msgid "" "is also allowed.\n" msgstr "" -#: src/LYrcFile.c:433 +#: src/LYrcFile.c:436 msgid "" "preferred_language specifies the language in MIME notation (e.g., en,\n" "fr, may be a comma-separated list in decreasing preference)\n" @@ -5385,7 +5389,7 @@ msgid "" "Otherwise, the server will send the file in its default language.\n" msgstr "" -#: src/LYrcFile.c:442 +#: src/LYrcFile.c:445 msgid "" "If run_all_execution_links is set \"on\" then all local execution links\n" "will be executed when they are selected.\n" @@ -5398,7 +5402,7 @@ msgid "" " you are viewing trusted source information.\n" msgstr "" -#: src/LYrcFile.c:453 +#: src/LYrcFile.c:456 msgid "" "If run_execution_links_on_local_files is set \"on\" then all local\n" "execution links that are found in LOCAL files will be executed when they\n" @@ -5414,7 +5418,7 @@ msgid "" " you are viewing trusted source information.\n" msgstr "" -#: src/LYrcFile.c:471 +#: src/LYrcFile.c:474 msgid "" "select_popups specifies whether the OPTIONs in a SELECT block which\n" "lacks a MULTIPLE attribute are presented as a vertical list of radio\n" @@ -5425,7 +5429,7 @@ msgid "" "The default can be overridden via the -popup command line toggle.\n" msgstr "" -#: src/LYrcFile.c:481 +#: src/LYrcFile.c:484 msgid "" "show_color specifies how to set the color mode at startup. A value of\n" "\"never\" will force color mode off (treat the terminal as monochrome)\n" @@ -5444,7 +5448,7 @@ msgid "" "\"off\" \"show color\" settings will be treated as \"default\".\n" msgstr "" -#: src/LYrcFile.c:498 +#: src/LYrcFile.c:501 msgid "" "show_cursor specifies whether to 'hide' the cursor to the right (and\n" "bottom, if possible) of the screen, or to place it to the left of the\n" @@ -5457,7 +5461,7 @@ msgid "" "The default can be overridden via the -show_cursor command line toggle.\n" msgstr "" -#: src/LYrcFile.c:509 +#: src/LYrcFile.c:512 msgid "" "show_dotfiles specifies that the directory listing should include\n" "\"hidden\" (dot) files/directories. If set \"on\", this will be\n" @@ -5466,7 +5470,7 @@ msgid "" "is disabled, creation of such files via Lynx also is disabled.\n" msgstr "" -#: src/LYrcFile.c:520 +#: src/LYrcFile.c:523 msgid "" "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n" "been defined (see below), then all bookmark operations will first\n" @@ -5479,7 +5483,7 @@ msgid "" "presented regardless of user mode.\n" msgstr "" -#: src/LYrcFile.c:533 +#: src/LYrcFile.c:537 msgid "" "user_mode specifies the users level of knowledge with Lynx. The\n" "default is \"NOVICE\" which displays two extra lines of help at the\n" @@ -5489,14 +5493,14 @@ msgid "" "bottom of the screen.\n" msgstr "" -#: src/LYrcFile.c:542 +#: src/LYrcFile.c:546 msgid "" "If verbose_images is \"on\", lynx will print the name of the image\n" "source file in place of [INLINE], [LINK] or [IMAGE]\n" "See also VERBOSE_IMAGES in lynx.cfg\n" msgstr "" -#: src/LYrcFile.c:547 +#: src/LYrcFile.c:551 msgid "" "If vi_keys is set to \"on\", then the normal VI movement keys:\n" " j = down k = up\n" @@ -5506,13 +5510,13 @@ msgid "" "and the keymap display, respectively.\n" msgstr "" -#: src/LYrcFile.c:555 +#: src/LYrcFile.c:559 msgid "" "The visited_links setting controls how Lynx organizes the information\n" "in the Visited Links Page.\n" msgstr "" -#: src/LYrcFile.c:772 +#: src/LYrcFile.c:776 msgid "" "If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n" "your keypad when the numlock is on will act as arrow keys:\n" @@ -5523,13 +5527,13 @@ msgid "" "regardless of whether numlock is on.\n" msgstr "" -#: src/LYrcFile.c:781 +#: src/LYrcFile.c:785 msgid "" "If keypad_mode is set to \"LINKS_ARE_NUMBERED\", then numbers will\n" "appear next to each link and numbers are used to select links.\n" msgstr "" -#: src/LYrcFile.c:785 +#: src/LYrcFile.c:789 msgid "" "If keypad_mode is set to \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", then\n" "numbers will appear next to each link and visible form input field.\n" @@ -5540,14 +5544,14 @@ msgid "" "lists and output from the list command also enumerate form inputs.\n" msgstr "" -#: src/LYrcFile.c:794 +#: src/LYrcFile.c:798 msgid "" "NOTE: Some fixed format documents may look disfigured when\n" "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n" "enabled.\n" msgstr "" -#: src/LYrcFile.c:827 +#: src/LYrcFile.c:831 msgid "" "Lynx User Defaults File\n" "\n" diff --git a/po/makefile.inn b/po/makefile.inn index 7b63ddbe..a3c3ed5a 100644 --- a/po/makefile.inn +++ b/po/makefile.inn @@ -90,7 +90,7 @@ $(srcdir)/$(PACKAGE).pot: $(POTFILES) --files-from=$(srcdir)/POTFILES.in \ && test ! -f $(PACKAGE).po \ || ( rm -f $(srcdir)/$(PACKAGE).pot \ - && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) + && ( sed -e 1,5d -e s/"Project-Id-Version: PACKAGE VERSION"/"Project-Id-Version: $(PACKAGE) $(VERSION)"/ $(PACKAGE).po > $(srcdir)/$(PACKAGE).pot ) ) $(srcdir)/cat-id-tbl.c: stamp-cat-id; @: $(srcdir)/stamp-cat-id: $(PACKAGE).pot diff --git a/src/GridText.c b/src/GridText.c index 614275fb..a9a073e1 100644 --- a/src/GridText.c +++ b/src/GridText.c @@ -1384,8 +1384,8 @@ PRIVATE int display_line ARGS4( if (!cp_tgt || i_start_tgt != i) { LYstopTargetEmphasis(); intarget = NO; - if (inbold) start_bold(); - if (inunderline) start_underline(); + if (inbold) lynx_start_bold(); + if (inunderline) lynx_start_underline(); } } } @@ -1416,11 +1416,11 @@ PRIVATE int display_line ARGS4( if (!intarget) { #if defined(PDCURSES) if (LYShowColor == SHOW_COLOR_NEVER) - start_bold(); + lynx_start_bold(); else - start_underline(); + lynx_start_underline(); #else - start_underline(); + lynx_start_underline(); #endif /* PDCURSES */ } } @@ -1435,11 +1435,11 @@ PRIVATE int display_line ARGS4( if (!intarget) { #if defined(PDCURSES) if (LYShowColor == SHOW_COLOR_NEVER) - stop_bold(); + lynx_stop_bold(); else - stop_underline(); + lynx_stop_underline(); #else - stop_underline(); + lynx_stop_underline(); #endif /* PDCURSES */ } } @@ -1448,13 +1448,13 @@ PRIVATE int display_line ARGS4( case LY_BOLD_START_CHAR: inbold = YES; if (!intarget) - start_bold(); + lynx_start_bold(); break; case LY_BOLD_END_CHAR: inbold = NO; if (!intarget) - stop_bold(); + lynx_stop_bold(); break; #endif @@ -1572,8 +1572,8 @@ after_while: #undef intarget #endif /* SHOW_WHEREIS_TARGETS && !USE_COLOR_STYLE */ #ifndef USE_COLOR_STYLE - stop_underline(); - stop_bold(); + lynx_stop_underline(); + lynx_stop_bold(); #else while (current_style < line->numstyles) { @@ -13201,7 +13201,7 @@ PRIVATE void redraw_part_of_line ARGS4( LYaddch('_'); i++; } else { - start_underline(); + lynx_start_underline(); } break; @@ -13210,16 +13210,16 @@ PRIVATE void redraw_part_of_line ARGS4( LYaddch('_'); i++; } else { - stop_underline(); + lynx_stop_underline(); } break; case LY_BOLD_START_CHAR: - start_bold(); + lynx_start_bold(); break; case LY_BOLD_END_CHAR: - stop_bold (); + lynx_stop_bold (); break; #endif @@ -13293,8 +13293,8 @@ PRIVATE void redraw_part_of_line ARGS4( } /* end of while */ #ifndef USE_COLOR_STYLE - stop_underline(); - stop_bold(); + lynx_stop_underline(); + lynx_stop_bold(); #else while (current_style < line->numstyles) @@ -13491,8 +13491,8 @@ PRIVATE void move_to_glyph ARGS10( #endif /* SHOW_WHEREIS_TARGETS */ { if (inunderline) inU = YES; - if (inunderline) stop_underline(); - if (inbold) stop_bold(); + if (inunderline) lynx_stop_underline(); + if (inbold) lynx_stop_bold(); lynx_start_link_color (flag, inU); } @@ -13548,8 +13548,8 @@ PRIVATE void move_to_glyph ARGS10( } } if (!incurlink) { - if (inbold) start_bold(); - if (inunderline) start_underline(); + if (inbold) lynx_start_bold(); + if (inunderline) lynx_start_underline(); } } } @@ -13581,25 +13581,25 @@ PRIVATE void move_to_glyph ARGS10( case LY_UNDERLINE_START_CHAR: if (!drawing || !incurlink) inunderline = YES; if (drawing && !intarget && !incurlink) - start_underline(); + lynx_start_underline(); break; case LY_UNDERLINE_END_CHAR: inunderline = NO; if (drawing && !intarget && !incurlink) - stop_underline(); + lynx_stop_underline(); break; case LY_BOLD_START_CHAR: if (!drawing || !incurlink) inbold = YES; if (drawing && !intarget && !incurlink) - start_bold(); + lynx_start_bold(); break; case LY_BOLD_END_CHAR: inbold = NO; if (drawing && !intarget && !incurlink) - stop_bold(); + lynx_stop_bold(); break; case LY_SOFT_NEWLINE: @@ -13720,9 +13720,9 @@ PRIVATE void move_to_glyph ARGS10( #endif /* SHOW_WHEREIS_TARGETS */ { if (inbold) - start_bold(); + lynx_start_bold(); if (inunderline) - start_underline(); + lynx_start_underline(); } } LYaddstr(buffer); diff --git a/src/LYBookmark.c b/src/LYBookmark.c index 256842f5..6f333c76 100644 --- a/src/LYBookmark.c +++ b/src/LYBookmark.c @@ -869,15 +869,15 @@ PUBLIC int select_menu_multi_bookmarks NOARGS if (MBM_screens > 1) { LYmove(LYlines-2, 0); LYaddstr("'"); - start_bold(); + lynx_start_bold(); LYaddstr("["); - stop_bold(); + lynx_stop_bold(); LYaddstr("' "); LYaddstr(PREVIOUS); LYaddstr(", '"); - start_bold(); + lynx_start_bold(); LYaddstr("]"); - stop_bold(); + lynx_stop_bold(); LYaddstr("' "); LYaddstr(NEXT_SCREEN); } diff --git a/src/LYCurses.c b/src/LYCurses.c index 40addf86..5058f989 100644 --- a/src/LYCurses.c +++ b/src/LYCurses.c @@ -1683,10 +1683,10 @@ PUBLIC void LYstartTargetEmphasis NOARGS } #endif #if defined(FANCY_CURSES) || defined(USE_SLANG) - start_bold(); - start_reverse(); + lynx_start_bold(); + lynx_start_reverse(); #endif /* FANCY_CURSES || USE_SLANG */ - start_underline(); + lynx_start_underline(); } PUBLIC void LYstopTargetEmphasis NOARGS @@ -1697,10 +1697,10 @@ PUBLIC void LYstopTargetEmphasis NOARGS return; } #endif - stop_underline(); + lynx_stop_underline(); #if defined(FANCY_CURSES) || defined(USE_SLANG) - stop_reverse(); - stop_bold(); + lynx_stop_reverse(); + lynx_stop_bold(); #endif /* FANCY_CURSES || USE_SLANG */ } @@ -2463,14 +2463,14 @@ PUBLIC void lynx_force_repaint NOARGS PUBLIC void lynx_start_title_color NOARGS { #ifdef SH_EX - start_reverse(); + lynx_start_reverse(); #endif } PUBLIC void lynx_stop_title_color NOARGS { #ifdef SH_EX - stop_reverse(); + lynx_stop_reverse(); #endif } @@ -2483,26 +2483,26 @@ PUBLIC void lynx_start_link_color ARGS2( * they can't handle two attributes at the * same time */ - /* start_bold(); */ - start_reverse(); + /* lynx_start_bold(); */ + lynx_start_reverse(); #if defined(USE_SLANG) #ifndef __DJGPP__ if (SLtt_Use_Ansi_Colors) #endif /* !__DJGPP__ */ - start_underline (); + lynx_start_underline (); #endif /* USE_SLANG */ #if defined(FANCY_CURSES) && defined(COLOR_CURSES) if (lynx_has_color && LYShowColor >= SHOW_COLOR_ON) - start_underline (); + lynx_start_underline (); #endif /* USE_SLANG */ } else { - start_bold(); + lynx_start_bold(); /* * Make sure when flag is OFF that "unhighlighted" links * will be underlined if appropriate. - LE & FM */ if (pending) - start_underline(); + lynx_start_underline(); } } @@ -2514,41 +2514,42 @@ PUBLIC void lynx_stop_link_color ARGS2( LynxChangeStyle(flag == ON ? s_alink : s_a, ABS_OFF); #else if (flag) { - stop_reverse(); + lynx_stop_reverse(); #if defined(USE_SLANG) #ifndef __DJGPP__ if (SLtt_Use_Ansi_Colors) #endif /* !__DJGPP__ */ - stop_underline (); + lynx_stop_underline (); #endif /* USE_SLANG */ #if defined(FANCY_CURSES) && defined(COLOR_CURSES) if (lynx_has_color && LYShowColor >= SHOW_COLOR_ON) - stop_underline (); + lynx_stop_underline (); #endif /* FANCY_CURSES && COLOR_CURSES */ } else { - stop_bold(); + lynx_stop_bold(); /* * If underlining was turned on above, turn it off. - LE & FM */ if (pending) - stop_underline(); + lynx_stop_underline(); } #endif } +/* FIXME: consider inlining these */ PUBLIC void lynx_stop_target_color NOARGS { - stop_underline(); - stop_reverse(); - stop_bold(); + lynx_stop_underline(); + lynx_stop_reverse(); + lynx_stop_bold(); } PUBLIC void lynx_start_target_color NOARGS { - start_bold(); - start_reverse(); - start_underline(); + lynx_start_bold(); + lynx_start_reverse(); + lynx_start_underline(); } @@ -2559,7 +2560,7 @@ PUBLIC void lynx_start_status_color NOARGS lynx_set_color (2); else #endif - start_reverse (); + lynx_start_reverse (); } PUBLIC void lynx_stop_status_color NOARGS @@ -2569,46 +2570,79 @@ PUBLIC void lynx_stop_status_color NOARGS lynx_set_color (0); else #endif - stop_reverse (); + lynx_stop_reverse (); } PUBLIC void lynx_start_h1_color NOARGS { if (bold_H1 || bold_headers) - start_bold(); + lynx_start_bold(); } PUBLIC void lynx_stop_h1_color NOARGS { if (bold_H1 || bold_headers) - stop_bold(); + lynx_stop_bold(); } PUBLIC void lynx_start_prompt_color NOARGS { - start_reverse (); + lynx_start_reverse (); } PUBLIC void lynx_stop_prompt_color NOARGS { - stop_reverse (); + lynx_stop_reverse (); } PUBLIC void lynx_start_radio_color NOARGS { - start_bold (); + lynx_start_bold (); } PUBLIC void lynx_stop_radio_color NOARGS { - stop_bold (); + lynx_stop_bold (); } PUBLIC void lynx_stop_all_colors NOARGS { - stop_underline (); - stop_reverse (); - stop_bold (); + lynx_stop_underline (); + lynx_stop_reverse (); + lynx_stop_bold (); +} + +/* + * Wrappers for LYUnderlineLinks flag. + */ +PUBLIC void lynx_start_bold NOARGS +{ + start_bold(); +} + +PUBLIC void lynx_start_reverse NOARGS +{ + start_reverse(); +} + +PUBLIC void lynx_start_underline NOARGS +{ + start_underline(); +} + +PUBLIC void lynx_stop_bold NOARGS +{ + stop_bold(); +} + +PUBLIC void lynx_stop_reverse NOARGS +{ + stop_reverse(); +} + +PUBLIC void lynx_stop_underline NOARGS +{ + stop_underline(); } /* @@ -2658,9 +2692,13 @@ PRIVATE void make_blink_boldbg NOARGS PUBLIC long LYgetattrs ARGS1(WINDOW *, win) { attr_t result = 0; +#if (defined(NCURSES_VERSION_MAJOR) && NCURSES_VERSION_MAJOR < 5) || !defined(NCURSES_MAJOR_VERSION) + result = getattrs(win); +#else short pair = 0; wattr_get(win, &result, &pair, NULL); +#endif return result; } #endif /* HAVE_WATTR_GET */ diff --git a/src/LYCurses.h b/src/LYCurses.h index e2943a24..6168667d 100644 --- a/src/LYCurses.h +++ b/src/LYCurses.h @@ -447,21 +447,12 @@ extern unsigned int Lynx_Color_Flags; #define SL_LYNX_USE_COLOR 1 #define SL_LYNX_OVERRIDE_COLOR 2 -#ifdef UNDERLINE_LINKS -#define start_bold() LYaddAttr(4) +#define start_bold() LYaddAttr(LYUnderlineLinks ? 4 : 1) #define start_reverse() LYaddAttr(2) -#define start_underline() LYaddAttr(1) -#define stop_bold() LYsubAttr(4) +#define start_underline() LYaddAttr(LYUnderlineLinks ? 1 : 4) +#define stop_bold() LYsubAttr(LYUnderlineLinks ? 4 : 1) #define stop_reverse() LYsubAttr(2) -#define stop_underline() LYsubAttr(1) -#else -#define start_bold() LYaddAttr(1) -#define start_reverse() LYaddAttr(2) -#define start_underline() LYaddAttr(4) -#define stop_bold() LYsubAttr(1) -#define stop_reverse() LYsubAttr(2) -#define stop_underline() LYsubAttr(4) -#endif +#define stop_underline() LYsubAttr(LYUnderlineLinks ? 1 : 4) #ifdef FANCY_CURSES #undef FANCY_CURSES @@ -533,17 +524,10 @@ extern void VTHome NOPARAMS; * add and subtract, respectively, the attributes * _UNDERLINE, _BOLD, _REVERSE, and _BLINK. - FM */ -#ifdef UNDERLINE_LINKS -#define start_bold() setattr(_UNDERLINE) -#define stop_bold() clrattr(_UNDERLINE) -#define start_underline() setattr(_BOLD) -#define stop_underline() clrattr(_BOLD) -#else /* not UNDERLINE_LINKS */ -#define start_bold() setattr(_BOLD) -#define stop_bold() clrattr(_BOLD) -#define start_underline() setattr(_UNDERLINE) -#define stop_underline() clrattr(_UNDERLINE) -#endif /* UNDERLINE_LINKS */ +#define start_bold() setattr(LYUnderlineLinks ? _UNDERLINE : _BOLD) +#define stop_bold() clrattr(LYUnderlineLinks ? _UNDERLINE : _BOLD) +#define start_underline() setattr(LYUnderlineLinks ? _BOLD : _UNDERLINE) +#define stop_underline() clrattr(LYUnderlineLinks ? _BOLD : _UNDERLINE) #define start_reverse() setattr(_REVERSE) #define wstart_reverse(w) wsetattr(w, _REVERSE) #define stop_reverse() clrattr(_REVERSE) @@ -577,21 +561,10 @@ extern int lynx_chg_color PARAMS((int, int, int)); #define LYsubWAttr(win,attr) wattroff(win,attr) #endif -#ifdef UNDERLINE_LINKS -#define start_bold() LYaddAttr(A_UNDERLINE) -#define stop_bold() LYsubAttr(A_UNDERLINE) -#define start_underline() LYaddAttr(A_BOLD) -#define stop_underline() LYsubAttr(A_BOLD) -#else /* not UNDERLINE_LINKS: */ -#define start_bold() LYaddAttr(A_BOLD) -#define stop_bold() LYsubAttr(A_BOLD) -#ifdef USE_COLOR_STYLE -#define start_underline() attron(A_UNDERLINE) /* allow combining - kw */ -#else -#define start_underline() LYaddAttr(A_UNDERLINE) -#endif /* USE_COLOR_STYLE */ -#define stop_underline() LYsubAttr(A_UNDERLINE) -#endif /* UNDERLINE_LINKS */ +#define start_bold() LYaddAttr(LYUnderlineLinks ? A_UNDERLINE : A_BOLD) +#define stop_bold() LYsubAttr(LYUnderlineLinks ? A_UNDERLINE : A_BOLD) +#define start_underline() LYaddAttr(LYUnderlineLinks ? A_BOLD : A_UNDERLINE) +#define stop_underline() LYsubAttr(LYUnderlineLinks ? A_BOLD : A_UNDERLINE) #if defined(SNAKE) && defined(HP_TERMINAL) #define start_reverse() LYaddWAttr(LYwin, A_DIM) @@ -711,6 +684,13 @@ extern void lynx_start_radio_color NOPARAMS; extern void lynx_stop_radio_color NOPARAMS; extern void lynx_stop_all_colors NOPARAMS; +extern void lynx_start_bold NOPARAMS; +extern void lynx_start_reverse NOPARAMS; +extern void lynx_start_underline NOPARAMS; +extern void lynx_stop_bold NOPARAMS; +extern void lynx_stop_reverse NOPARAMS; +extern void lynx_stop_underline NOPARAMS; + /* * To prevent corrupting binary data on DOS, MS-WINDOWS or OS/2 we open files * and stdout in BINARY mode by default. Where necessary we should open and diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h index 9df42f62..e8cdcb5b 100644 --- a/src/LYGlobalDefs.h +++ b/src/LYGlobalDefs.h @@ -184,6 +184,7 @@ extern BOOLEAN LYJumpFileURL; /* URL from the jump file shortcuts? */ extern BOOLEAN LYNewsPosting; /* News posting supported if TRUE */ extern BOOLEAN LYShowCursor; /* Show the cursor or hide it? */ extern BOOLEAN LYShowTransferRate; +extern BOOLEAN LYUnderlineLinks; /* Show the links underlined vs bold */ extern BOOLEAN LYUseDefShoCur; /* Command line -show_cursor toggle */ extern BOOLEAN LYUserSpecifiedURL; /* URL from a goto or document? */ extern BOOLEAN LYfind_leaks; diff --git a/src/LYLocal.c b/src/LYLocal.c index 8d85d09e..65c20190 100644 --- a/src/LYLocal.c +++ b/src/LYLocal.c @@ -110,6 +110,7 @@ struct dired_menu { char *href; struct dired_menu *next; } defmenu[] = { + /* * The following initializations determine the contents of the f)ull menu * selection when in dired mode. If any menu entries are defined in the @@ -1165,10 +1166,10 @@ PRIVATE int remove_single ARGS1( /*** Course, it's probably broken for screen sizes other 80, too ***/ if (strlen(cp) < 37) { HTSprintf0(&tmpbuf, - gettext("Remove '%s' and all of its contents?"), cp); + gettext("Remove directory '%s'?"), cp); } else { HTSprintf0(&tmpbuf, - gettext("Remove directory and all of its contents?")); + gettext("Remove directory?")); } is_directory = TRUE; } else if (S_ISREG(dir_info.st_mode)) { @@ -1524,7 +1525,7 @@ PUBLIC void tagflag ARGS2( { if (nlinks > 0) { LYmove(links[cur].ly, 2); - stop_reverse(); + lynx_stop_reverse(); if (flag == ON) { LYaddch('+'); } else { @@ -1678,81 +1679,92 @@ PRIVATE char *build_command ARGS3( # ifndef ARCHIVE_ONLY # ifdef OK_GZIP if ((arg = match_op("UNTAR_GZ", line)) != 0) { -#define FMT_UNTAR_GZ "cd %s; %s -qdc %s | %s -xf -" +#define FMT_UNTAR_GZ "cd %s; %s -qdc %s | %s %s %s" if ((program = HTGetProgramPath(ppGZIP)) != NULL) { dirname = DirectoryOf(arg); HTAddParam(&buffer, FMT_UNTAR_GZ, 1, dirname); HTAddParam(&buffer, FMT_UNTAR_GZ, 2, program); HTAddParam(&buffer, FMT_UNTAR_GZ, 3, arg); HTAddParam(&buffer, FMT_UNTAR_GZ, 4, tar_path); - HTEndParam(&buffer, FMT_UNTAR_GZ, 4); + HTAddToCmd(&buffer, FMT_UNTAR_GZ, 5, TAR_DOWN_OPTIONS); + HTAddToCmd(&buffer, FMT_UNTAR_GZ, 6, TAR_PIPE_OPTIONS); + HTEndParam(&buffer, FMT_UNTAR_GZ, 6); } return buffer; } # endif /* OK_GZIP */ if ((arg = match_op("UNTAR_Z", line)) != 0) { -#define FMT_UNTAR_Z "cd %s; %s %s | %s -xf -" +#define FMT_UNTAR_Z "cd %s; %s %s | %s %s %s" if ((program = HTGetProgramPath(ppZCAT)) != NULL) { dirname = DirectoryOf(arg); HTAddParam(&buffer, FMT_UNTAR_Z, 1, dirname); HTAddParam(&buffer, FMT_UNTAR_Z, 2, program); HTAddParam(&buffer, FMT_UNTAR_Z, 3, arg); HTAddParam(&buffer, FMT_UNTAR_Z, 4, tar_path); - HTEndParam(&buffer, FMT_UNTAR_Z, 4); + HTAddToCmd(&buffer, FMT_UNTAR_Z, 5, TAR_DOWN_OPTIONS); + HTAddToCmd(&buffer, FMT_UNTAR_Z, 6, TAR_PIPE_OPTIONS); + HTEndParam(&buffer, FMT_UNTAR_Z, 6); } return buffer; } if ((arg = match_op("UNTAR", line)) != 0) { -#define FMT_UNTAR "cd %s; %s -xf %s" +#define FMT_UNTAR "cd %s; %s %s %s" dirname = DirectoryOf(arg); HTAddParam(&buffer, FMT_UNTAR, 1, dirname); HTAddParam(&buffer, FMT_UNTAR, 2, tar_path); - HTAddParam(&buffer, FMT_UNTAR, 3, arg); - HTEndParam(&buffer, FMT_UNTAR, 3); + HTAddToCmd(&buffer, FMT_UNTAR, 3, TAR_DOWN_OPTIONS); + HTAddParam(&buffer, FMT_UNTAR, 4, arg); + HTEndParam(&buffer, FMT_UNTAR, 4); return buffer; } # endif /* !ARCHIVE_ONLY */ # ifdef OK_GZIP if ((arg = match_op("TAR_GZ", line)) != 0) { -#define FMT_TAR_GZ "cd %s; %s -cf - %s | %s -qc >%s%s" +#define FMT_TAR_GZ "cd %s; %s %s %s %s | %s -qc >%s%s" if ((program = HTGetProgramPath(ppGZIP)) != NULL) { dirname = DirectoryOf(arg); HTAddParam(&buffer, FMT_TAR_GZ, 1, dirname); HTAddParam(&buffer, FMT_TAR_GZ, 2, tar_path); - HTAddParam(&buffer, FMT_TAR_GZ, 3, LYPathLeaf(arg)); - HTAddParam(&buffer, FMT_TAR_GZ, 4, program); - HTAddParam(&buffer, FMT_TAR_GZ, 5, LYonedot(LYPathLeaf(arg))); - HTAddParam(&buffer, FMT_TAR_GZ, 6, EXT_TAR_GZ); - HTEndParam(&buffer, FMT_TAR_GZ, 6); + HTAddToCmd(&buffer, FMT_TAR_GZ, 3, TAR_UP_OPTIONS); + HTAddToCmd(&buffer, FMT_TAR_GZ, 4, TAR_PIPE_OPTIONS); + HTAddParam(&buffer, FMT_TAR_GZ, 5, LYPathLeaf(arg)); + HTAddParam(&buffer, FMT_TAR_GZ, 6, program); + HTAddParam(&buffer, FMT_TAR_GZ, 7, LYonedot(LYPathLeaf(arg))); + HTAddParam(&buffer, FMT_TAR_GZ, 8, EXT_TAR_GZ); + HTEndParam(&buffer, FMT_TAR_GZ, 8); } return buffer; } # endif /* OK_GZIP */ if ((arg = match_op("TAR_Z", line)) != 0) { -#define FMT_TAR_Z "cd %s; %s -cf - %s | %s >%s%s" +#define FMT_TAR_Z "cd %s; %s %s %s %s | %s >%s%s" if ((program = HTGetProgramPath(ppCOMPRESS)) != NULL) { dirname = DirectoryOf(arg); HTAddParam(&buffer, FMT_TAR_Z, 1, dirname); HTAddParam(&buffer, FMT_TAR_Z, 2, tar_path); - HTAddParam(&buffer, FMT_TAR_Z, 3, LYPathLeaf(arg)); - HTAddParam(&buffer, FMT_TAR_Z, 4, program); - HTAddParam(&buffer, FMT_TAR_Z, 5, LYonedot(LYPathLeaf(arg))); - HTAddParam(&buffer, FMT_TAR_Z, 6, EXT_TAR_Z); - HTEndParam(&buffer, FMT_TAR_Z, 6); + HTAddToCmd(&buffer, FMT_TAR_Z, 3, TAR_UP_OPTIONS); + HTAddToCmd(&buffer, FMT_TAR_Z, 4, TAR_PIPE_OPTIONS); + HTAddParam(&buffer, FMT_TAR_Z, 5, LYPathLeaf(arg)); + HTAddParam(&buffer, FMT_TAR_Z, 6, program); + HTAddParam(&buffer, FMT_TAR_Z, 7, LYonedot(LYPathLeaf(arg))); + HTAddParam(&buffer, FMT_TAR_Z, 8, EXT_TAR_Z); + HTEndParam(&buffer, FMT_TAR_Z, 8); } return buffer; } if ((arg = match_op("TAR", line)) != 0) { -#define FMT_TAR "cd %s; %s -cf %s.tar %s" +#define FMT_TAR "cd %s; %s %s %s %s.tar %s" dirname = DirectoryOf(arg); HTAddParam(&buffer, FMT_TAR, 1, dirname); HTAddParam(&buffer, FMT_TAR, 2, tar_path); - HTAddParam(&buffer, FMT_TAR, 3, LYonedot(LYPathLeaf(arg))); - HTAddParam(&buffer, FMT_TAR, 4, LYPathLeaf(arg)); - HTEndParam(&buffer, FMT_TAR, 4); + HTAddToCmd(&buffer, FMT_TAR, 3, TAR_UP_OPTIONS); + HTAddToCmd(&buffer, FMT_TAR, 4, TAR_FILE_OPTIONS); + HTAddParam(&buffer, FMT_TAR, 5, LYonedot(LYPathLeaf(arg))); + HTAddParam(&buffer, FMT_TAR, 6, LYPathLeaf(arg)); + HTEndParam(&buffer, FMT_TAR, 6); return buffer; } } diff --git a/src/LYMain.c b/src/LYMain.c index fa8b4484..b85d70dc 100644 --- a/src/LYMain.c +++ b/src/LYMain.c @@ -171,6 +171,7 @@ PUBLIC BOOLEAN LYJumpFileURL = FALSE; /* always FALSE the first time */ PUBLIC BOOLEAN LYPermitURL = FALSE; PUBLIC BOOLEAN LYRestricted = FALSE; /* whether we have -anonymous option */ PUBLIC BOOLEAN LYShowCursor = SHOW_CURSOR; /* to show or not to show */ +PUBLIC BOOLEAN LYUnderlineLinks = UNDERLINE_LINKS; /* Show the links underlined vs bold */ PUBLIC BOOLEAN LYUseDefShoCur = TRUE; /* Command line -show_cursor toggle */ PUBLIC BOOLEAN LYUserSpecifiedURL = TRUE;/* always TRUE the first time */ PUBLIC BOOLEAN LYValidate = FALSE; @@ -3819,6 +3820,10 @@ treated '>' as a co-terminator for double-quotes and tags" "trim input text/textarea fields in forms" ), PARSE_SET( + "underline_links",4|TOGGLE_ARG, LYUnderlineLinks, + "toggles use of underline/bold attribute for links" + ), + PARSE_SET( "underscore", 4|TOGGLE_ARG, use_underscore, "toggles use of _underline_ format in dumps" ), diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c index 77b64dd5..c8c759e0 100644 --- a/src/LYMainLoop.c +++ b/src/LYMainLoop.c @@ -7619,9 +7619,9 @@ PRIVATE void show_main_statusline ARGS2( if (is_www_index) { char *indx = gettext("-index-"); LYmove(LYlines-1, LYcols - strlen(indx) - 1); - start_reverse(); + lynx_start_reverse(); LYaddstr(indx); - stop_reverse(); + lynx_stop_reverse(); } } else if (user_mode == ADVANCED_MODE && nlinks > 0) { diff --git a/src/LYOptions.c b/src/LYOptions.c index 6bef4f79..8749a59a 100644 --- a/src/LYOptions.c +++ b/src/LYOptions.c @@ -230,18 +230,18 @@ PRIVATE void addlbl ARGS1(CONST char *, text) actual[d++] = text[s]; if (text[s] == LPAREN) { d = add_it(actual, d-1); - start_bold(); + lynx_start_bold(); b = TRUE; actual[d++] = text[s]; } else if (text[s] == RPAREN) { d = add_it(actual, d); - stop_bold(); + lynx_stop_bold(); b = FALSE; } } add_it(actual, d); if (b) - stop_bold(); + lynx_stop_bold(); } #if !defined(VMS) || defined(USE_SLANG) @@ -564,23 +564,23 @@ draw_options: LYmove(LYlines-3, 2); LYaddstr(SELECT_SEGMENT); - start_bold(); + lynx_start_bold(); LYaddstr(CAP_LETT_SEGMENT); - stop_bold(); + lynx_stop_bold(); LYaddstr(OF_OPT_LINE_SEGMENT); if (!no_option_save) { LYaddstr(" '"); - start_bold(); + lynx_start_bold(); LYaddstr(">"); - stop_bold(); + lynx_stop_bold(); LYaddstr("'"); LYaddstr(TO_SAVE_SEGMENT); } LYaddstr(OR_SEGMENT); LYaddstr("'"); - start_bold(); + lynx_start_bold(); LYaddstr("r"); - stop_bold(); + lynx_stop_bold(); LYaddstr("'"); LYaddstr(TO_RETURN_SEGMENT); @@ -622,10 +622,10 @@ draw_options: } _statusline(ACCEPT_DATA); LYmove(L_EDITOR, COL_OPTION_VALUES); - start_bold(); + lynx_start_bold(); ch = LYgetstr(display_option, VISIBLE, sizeof(display_option), NORECALL); - stop_bold(); + lynx_stop_bold(); LYmove(L_EDITOR, COL_OPTION_VALUES); if (term_options || ch == -1) { LYaddstr((editor && *editor) ? @@ -658,10 +658,10 @@ draw_options: } _statusline(ACCEPT_DATA); LYmove(L_DISPLAY, COL_OPTION_VALUES); - start_bold(); + lynx_start_bold(); ch = LYgetstr(display_option, VISIBLE, sizeof(display_option), NORECALL); - stop_bold(); + lynx_stop_bold(); LYmove(L_DISPLAY, COL_OPTION_VALUES); #ifdef VMS @@ -776,10 +776,10 @@ draw_options: } _statusline(ACCEPT_DATA); LYmove(L_HOME, C_DEFAULT); - start_bold(); + lynx_start_bold(); ch = LYgetstr(display_option, VISIBLE, sizeof(display_option), NORECALL); - stop_bold(); + lynx_stop_bold(); LYmove(L_HOME, C_DEFAULT); if (term_options || ch == -1 || *display_option == '\0') { @@ -843,10 +843,10 @@ draw_options: } _statusline(ACCEPT_DATA); LYmove(L_MAIL_ADDRESS, COL_OPTION_VALUES); - start_bold(); + lynx_start_bold(); ch = LYgetstr(display_option, VISIBLE, sizeof(display_option), NORECALL); - stop_bold(); + lynx_stop_bold(); LYmove(L_MAIL_ADDRESS, COL_OPTION_VALUES); if (term_options || ch == -1) { LYaddstr((personal_mail_address && @@ -1051,10 +1051,10 @@ draw_options: } _statusline(ACCEPT_DATA); LYmove(L_LANGUAGE, COL_OPTION_VALUES); - start_bold(); + lynx_start_bold(); ch = LYgetstr(display_option, VISIBLE, sizeof(display_option), NORECALL); - stop_bold(); + lynx_stop_bold(); LYmove(L_LANGUAGE, COL_OPTION_VALUES); if (term_options || ch == -1) { LYaddstr((language && *language) ? @@ -1086,10 +1086,10 @@ draw_options: } _statusline(ACCEPT_DATA); LYmove(L_PREF_CHARSET, COL_OPTION_VALUES); - start_bold(); + lynx_start_bold(); ch = LYgetstr(display_option, VISIBLE, sizeof(display_option), NORECALL); - stop_bold(); + lynx_stop_bold(); LYmove(L_PREF_CHARSET, COL_OPTION_VALUES); if (term_options || ch == -1) { LYaddstr((pref_charset && *pref_charset) ? @@ -1421,10 +1421,10 @@ draw_options: } _statusline(ACCEPT_DATA_OR_DEFAULT); LYmove(L_User_Agent, COL_OPTION_VALUES); - start_bold(); + lynx_start_bold(); ch = LYgetstr(display_option, VISIBLE, sizeof(display_option), NORECALL); - stop_bold(); + lynx_stop_bold(); LYmove(L_User_Agent, COL_OPTION_VALUES); if (term_options || ch == -1) { LYaddstr((LYUserAgent && @@ -1605,7 +1605,7 @@ PRIVATE int boolean_choice ARGS4( * Highlight the current choice. */ LYmove(line, col); - start_reverse(); + lynx_start_reverse(); show_choice(choices[cur_choice], width); if (LYShowCursor) LYmove(line, (col - 1)); @@ -1704,7 +1704,7 @@ PRIVATE int boolean_choice ARGS4( * Unhighlight choice. */ LYmove(line, col); - stop_reverse(); + lynx_stop_reverse(); show_choice(choices[cur_choice], width); if (term_options) { @@ -1820,15 +1820,15 @@ draw_bookmark_list: if (LYlines < MBM_V_MAXFILES + MULTI_OFFSET) { LYmove((LYlines - 4), 0); LYaddstr("'"); - start_bold(); + lynx_start_bold(); LYaddstr("["); - stop_bold(); + lynx_stop_bold(); LYaddstr("' "); LYaddstr(PREVIOUS); LYaddstr(", '"); - start_bold(); + lynx_start_bold(); LYaddstr("]"); - stop_bold(); + lynx_stop_bold(); LYaddstr("' "); LYaddstr(NEXT_SCREEN); } @@ -1836,17 +1836,17 @@ draw_bookmark_list: LYmove((LYlines - 3), 0); if (!no_option_save) { LYaddstr("'"); - start_bold(); + lynx_start_bold(); LYaddstr(">"); - stop_bold(); + lynx_stop_bold(); LYaddstr("'"); LYaddstr(TO_SAVE_SEGMENT); } LYaddstr(OR_SEGMENT); LYaddstr("'"); - start_bold(); + lynx_start_bold(); LYaddstr("^G"); - stop_bold(); + lynx_stop_bold(); LYaddstr("'"); LYaddstr(TO_RETURN_SEGMENT); @@ -1941,7 +1941,7 @@ draw_bookmark_list: _statusline(ACCEPT_DATA); if (a > 0) { - start_bold(); + lynx_start_bold(); if (LYlines < (MBM_V_MAXFILES + MULTI_OFFSET)) LYmove( (3 + a) - ((MBM_V_MAXFILES/2 + 1)*(MBM_current - 1)), @@ -1954,7 +1954,7 @@ draw_bookmark_list: sizeof(MBM_tmp_line) - 1); ch = LYgetstr(MBM_tmp_line, VISIBLE, sizeof(MBM_tmp_line), NORECALL); - stop_bold(); + lynx_stop_bold(); if (strlen(MBM_tmp_line) < 1) { FREE(MBM_A_subdescript[a]); @@ -1982,13 +1982,13 @@ draw_bookmark_list: LYmove((3 + a), 35); LYaddstr("| "); - start_bold(); + lynx_start_bold(); LYstrncpy(MBM_tmp_line, NonNull(MBM_A_subbookmark[a]), sizeof(MBM_tmp_line) - 1); ch = LYgetstr(MBM_tmp_line, VISIBLE, sizeof(MBM_tmp_line), NORECALL); - stop_bold(); + lynx_stop_bold(); if (*MBM_tmp_line == '\0') { if (a == 0) @@ -2174,6 +2174,8 @@ static OptValues show_color_values[] = { static char * show_cursor_string = RC_SHOW_CURSOR; +static char * underline_links_string = RC_UNDERLINE_LINKS; + #ifdef USE_SCROLLBAR static char * show_scrollbar_string = RC_SCROLLBAR; #endif @@ -2726,6 +2728,12 @@ PUBLIC int postoptions ARGS1( LYShowCursor = (BOOL) code; } + /* Underline links: ON/OFF */ + if (!strcmp(data[i].tag, underline_links_string) + && GetOptValues(bool_values, data[i].value, &code)) { + LYUnderlineLinks = (BOOL) code; + } + #ifdef USE_SCROLLBAR /* Show Scrollbar: ON/OFF */ if (!strcmp(data[i].tag, show_scrollbar_string) @@ -3507,6 +3515,12 @@ PRIVATE int gen_options ARGS1( PutOptValues(fp0, LYShowCursor, bool_values); EndSelect(fp0); + /* Underline links: ON/OFF */ + PutLabel(fp0, gettext("Underline links"), underline_links_string); + BeginSelect(fp0, underline_links_string); + PutOptValues(fp0, LYUnderlineLinks, bool_values); + EndSelect(fp0); + #ifdef USE_SCROLLBAR /* Show scrollbar: ON/OFF */ PutLabel(fp0, gettext("Show scrollbar"), show_scrollbar_string); diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c index 195edf71..4a24a940 100644 --- a/src/LYReadCFG.c +++ b/src/LYReadCFG.c @@ -1505,6 +1505,7 @@ PRIVATE Config_Type Config_Table [] = PARSE_DEF(RC_TRUSTED_LYNXCGI, CGI_PATH), #endif PARSE_PRG(RC_UNCOMPRESS_PATH, ppUNCOMPRESS), + PARSE_SET(RC_UNDERLINE_LINKS, LYUnderlineLinks), PARSE_PRG(RC_UNZIP_PATH, ppUNZIP), #ifdef DIRED_SUPPORT PARSE_ADD(RC_UPLOADER, uploaders), diff --git a/src/LYUtils.c b/src/LYUtils.c index 813c273c..db5468ee 100644 --- a/src/LYUtils.c +++ b/src/LYUtils.c @@ -1449,7 +1449,7 @@ PUBLIC void noviceline ARGS1( return; LYmove(LYlines-2,0); - /* stop_reverse(); */ + /* lynx_stop_reverse(); */ LYclrtoeol(); LYaddstr(NOVICE_LINE_ONE); LYclrtoeol(); @@ -6008,7 +6008,7 @@ PUBLIC FILE *LYOpenTemp ARGS3( } if (make_it) { int old_mask = umask(HIDE_UMASK); - StrAllocCat(lynx_temp_space, "XXXXXX"); + StrAllocCat(lynx_temp_space, "XXXXXXXXXX"); if (mkdtemp(lynx_temp_space) == 0) { printf("%s: %s\n", lynx_temp_space, LYStrerror(errno)); exit(EXIT_FAILURE); diff --git a/src/LYrcFile.c b/src/LYrcFile.c index 65ba26c6..fca9852c 100644 --- a/src/LYrcFile.c +++ b/src/LYrcFile.c @@ -533,6 +533,7 @@ presented regardless of user mode.\n\ ")), MAYBE_FUN(RC_TAGSOUP, get_tagsoup, put_tagsoup, MSG_ENABLE_LYNXRC), + MAYBE_SET(RC_UNDERLINE_LINKS, LYUnderlineLinks, MSG_ENABLE_LYNXRC), PARSE_ENU(RC_USER_MODE, user_mode, tbl_user_mode, N_("\ user_mode specifies the users level of knowledge with Lynx. The\n\ default is \"NOVICE\" which displays two extra lines of help at the\n\ diff --git a/src/LYrcFile.h b/src/LYrcFile.h index e5ae4548..a60e5f40 100644 --- a/src/LYrcFile.h +++ b/src/LYrcFile.h @@ -212,6 +212,7 @@ #define RC_TRUSTED_EXEC "trusted_exec" #define RC_TRUSTED_LYNXCGI "trusted_lynxcgi" #define RC_UNCOMPRESS_PATH "uncompress_path" +#define RC_UNDERLINE_LINKS "underline_links" #define RC_UNZIP_PATH "unzip_path" #define RC_UPLOADER "uploader" #define RC_URL_DOMAIN_PREFIXES "url_domain_prefixes" diff --git a/src/chrtrans/makefile.dos b/src/chrtrans/makefile.dos index 1ee118c7..975561d9 100644 --- a/src/chrtrans/makefile.dos +++ b/src/chrtrans/makefile.dos @@ -12,11 +12,10 @@ CFLAGS = $(MCFLAGS) CC = gcc -MCFLAGS = -O2 -DDOSPATH -DNO_TTYTYP \ +MCFLAGS = -O2 -DDOSPATH \ -I. \ -I../../WWW/Library/Implementation \ --I/djgpp/watt32/inc \ --I/djgpp/watt32/inc/sys \ +-I/djgpp/watt32/inc -I../.. .SUFFIXES: .tbl @@ -99,7 +98,7 @@ cp866u_uni.h: cp866u_uni.tbl makeuctb.exe cp869_uni.h: cp869_uni.tbl makeuctb.exe def7_uni.h: def7_uni.tbl makeuctb.exe dmcs_uni.h: dmcs_uni.tbl makeuctb.exe -hp_uni.h: hp_uni.tbl makeuctb.exe +hp_uni.h: hp_uni.tbl makeuctb.exe iso01_uni.h: iso01_uni.tbl makeuctb.exe iso02_uni.h: iso02_uni.tbl makeuctb.exe iso03_uni.h: iso03_uni.tbl makeuctb.exe diff --git a/src/chrtrans/makeuctb.c b/src/chrtrans/makeuctb.c index 04d05234..d8003cb8 100644 --- a/src/chrtrans/makeuctb.c +++ b/src/chrtrans/makeuctb.c @@ -887,4 +887,5 @@ id_append, id_append, nuni, id_append, lowest_eight, RawOrEnc, CodePage); } done(EX_OK); + return 0; } diff --git a/src/makefile.dos b/src/makefile.dos index 6c574947..14ded8d3 100644 --- a/src/makefile.dos +++ b/src/makefile.dos @@ -9,7 +9,7 @@ LYLeaks.o LYexit.o LYJump.o LYList.o LYCgi.o LYTraversal.o \ LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o LYExtern.o \ LYStyle.o LYHash.o LYPrettySrc.o TRSTable.o -CFLAGS= -O2 $(MCFLAGS) $(INTLFLAGS) -I. -I.. $(SLANGINC) +CFLAGS= -O2 $(MCFLAGS) $(INTLFLAGS) -I. -I.. # comment this line to suppress DIRED support DIRED_DEFS = \ @@ -21,8 +21,7 @@ DIRED_DEFS = \ -DOK_OVERRIDE # Use this option to enable optional and *experimental* color style. -#ENABLE_COLOR_STYLE = \ - -DUSE_COLOR_STYLE +#ENABLE_COLOR_STYLE = -DUSE_COLOR_STYLE CC = gcc @@ -48,14 +47,12 @@ MCFLAGS = \ -DUSE_FILE_UPLOAD \ -DUSE_PRETTYSRC \ -DUSE_ZLIB \ - -DWATT32 \ $(SSLFLAGS) \ $(SSLINC) \ -I./chrtrans \ -I../WWW/Library/Implementation \ -I/djgpp/pdcur26 \ - -I/djgpp/watt32/inc \ - -I/djgpp/watt32/inc/sys + -I/djgpp/watt32/inc WWWLIB = \ ../WWW/Library/djgpp/libwww.a \ @@ -67,7 +64,7 @@ LIBS= -L/djgpp/watt32/lib -lwatt -lz -lwmemu #INTLFLAGS = -DHAVE_GETTEXT -DHAVE_LIBINTL_H #INTLLIBS= -lintl -liconv -# Uncomment the followint to enable SSL. +# Uncomment the following to enable SSL. #SSLFLAGS = -DUSE_SSL #SSLLIB = -lssl -lcrypto #SSLINC = -I/djgpp/include/openssl diff --git a/src/makefile.dsl b/src/makefile.dsl index 1893b3ab..1af08539 100644 --- a/src/makefile.dsl +++ b/src/makefile.dsl @@ -9,7 +9,7 @@ LYLeaks.o LYexit.o LYJump.o LYList.o LYCgi.o LYTraversal.o \ LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o LYExtern.o \ LYStyle.o LYHash.o LYPrettySrc.o TRSTable.o -CFLAGS= -O1 $(MCFLAGS) $(INTLFLAGS) -I. -I.. $(SLANGINC) +CFLAGS= -O2 $(MCFLAGS) $(INTLFLAGS) -I. -I.. $(SLANGINC) # comment this line to suppress DIRED support DIRED_DEFS = \ @@ -18,7 +18,7 @@ DIRED_DEFS = \ -DOK_TAR \ -DOK_GZIP \ -DOK_ZIP \ - -DOK_OVERRIDE + -DOK_OVERRIDE CC = gcc @@ -28,6 +28,7 @@ MCFLAGS = \ -DDISP_PARTIAL \ -DDJGPP_KEYHANDLER \ -DDOSPATH \ + -DHAVE_POPEN \ -DNOUSERS \ -DNO_CUSERID \ -DNO_TTYTYPE \ @@ -37,18 +38,26 @@ MCFLAGS = \ -DUSE_SLANG \ -DUSE_SOURCE_CACHE \ -DUSE_ZLIB \ - -DWATT32 \ + $(SSLFLAGS) \ + $(SSLINC) \ -I./chrtrans \ -I../WWW/Library/Implementation \ - -I../djgpp/watt32/inc \ - -I../djgpp/watt32/inc/sys + -I/dev/env/DJDIR/watt32/inc WWWLIB = \ ../WWW/Library/djgpp/libwww.a \ - ../djgpp/watt32/lib/libwatt.a + /dev/env/DJDIR/watt32/lib/libwatt.a -LIBS= $(SLANGLIB) -lslang -lz # -lintl +LIBS= $(SLANGLIB) -lslang $(SSLLIB) -lz $(INTLLIBS) + +# Uncomment the following to enable Internationalization. #INTLFLAGS = -DHAVE_GETTEXT -DHAVE_LIBINTL_H +#INTLLIBS= -lintl -liconv + +# Uncomment the following to enable SSL. +#SSLFLAGS = -DUSE_SSL +#SSLLIB = -lssl -lcrypto +#SSLINC = -I/dev/env/DJDIR/include/openssl all: lynx.exe diff --git a/userdefs.h b/userdefs.h index 807dc8f7..3ccbae0f 100644 --- a/userdefs.h +++ b/userdefs.h @@ -517,6 +517,8 @@ /***************************** * If FTP_PASSIVE is set to TRUE here or in lynx.cfg, ftp transfers will * be done in passive mode. + * Note: if passive transfers fail, lynx falls back to active mode, and + * vice versa if active transfers fail at first. */ #define FTP_PASSIVE TRUE @@ -935,6 +937,14 @@ #define SHOW_CURSOR FALSE /****************************** +* UNDERLINE_LINKS controls whether links are underlined by default, or shown +* in bold. Normally this default is set from the configure script. +*/ +#ifndef HAVE_CONFIG_H +#define UNDERLINE_LINKS FALSE +#endif + +/****************************** * VERBOSE_IMAGES controls whether or not Lynx replaces the [LINK], [INLINE] * and [IMAGE] comments (for images without ALT) with filenames of these * images. This is extremely useful because now we can determine immediately @@ -1350,11 +1360,11 @@ * the version definition with the Project Version on checkout. Just * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -#define LYNX_VERSION "2.8.5pre.3" +#define LYNX_VERSION "2.8.5pre.4" #define LYNX_WWW_HOME "http://lynx.isc.org/" #define LYNX_WWW_DIST "http://lynx.isc.org/current/" /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */ -#define LYNX_DATE "Sat, 24 Jan 2004 17:51:04 -0800" +#define LYNX_DATE "Wed, 28 Jan 2004 11:30:38 -0800" #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */ #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */ @@ -1453,6 +1463,13 @@ #define TELNET_PATH "telnet" #define TN3270_PATH "tn3270" #define RLOGIN_PATH "rlogin" + +/* see src/LYLocal.c for these */ +#define TAR_UP_OPTIONS "-cf" +#define TAR_DOWN_OPTIONS "-xf" +#define TAR_PIPE_OPTIONS "-" +#define TAR_FILE_OPTIONS "" + /* * These are not used: * #define COPY_PATH "cp" |