diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2000-02-25 12:43:29 -0500 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2000-02-25 12:43:29 -0500 |
| commit | 184855c6f7b9e1727a8f419b475b1fffd9292911 (patch) | |
| tree | 1bd2388be832a1908b0f03cf89dcfa70e4a31ebb | |
| parent | 59ec2705df06b90f10f9ff6eeadfffcd02bbd39a (diff) | |
| download | lynx-snapshots-184855c6f7b9e1727a8f419b475b1fffd9292911.tar.gz | |
snapshot of project "lynx", label v2-8-3dev_21
35 files changed, 1276 insertions, 1277 deletions
diff --git a/CHANGES b/CHANGES index a6a6ad61..df4db0a7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,26 @@ Changes since Lynx 2.8 release =============================================================================== +2000-02-25 (2.8.3dev.21) +* modify check for empty news-posting to warn but allow user to override if + it contains nonspace characters -TD +* add FTP_PASSIVE option to lynx.cfg, allowing installer to defer decision + of whether lynx uses passive ftp connection (adapted from patch by + Bernhard Rosenkraenzer <bero@redhat.de>) -TD +* remove duplicate definitions of HT_NON_BREAK_SPACE, HT_EN_SPACE leaving them + in HTFont.h -TD +* lynx.cfg option CONNECT_TIMEOUT and commandline option "connect_timeout" were + added (not available for DOS port) -VH +* don't perform submission of the content of disabled form fields -VH +* add bindings for ^ and $ (like vi) to move the cursor to the first and last + link on the current line (prompted by complaint by DH that < and > used to + allow movement to the ends of a line) -TD +* remove --enable-kanji option (request by TH) -TD +* replace 3 CONV_JISX0201KANA_ISX0208KANA to CONV_JISX0201KANA_JISX0208KANA -TH +* enable the routines to change kanji code which is used for overriding, + since my last change disabled this -TH +* remove redundant/conflicting definitions of ON/OFF from HTVMS_WaisUI.h -TD +* fixes for K&R build on SunOS -TD 2000-02-15 (2.8.3dev.20) * ifdef fixes for CYGWIN, broken in dev.19 -TD * add make-msc.bat script, and update src/chrtrans/makefile.msc to add rules @@ -9,7 +29,7 @@ Changes since Lynx 2.8 release * use HTAddParam/HTEndParam rather than HTSprintf0 for building external commands, protecting against badly-formatted string with more than one %s (reported by PW) -TD -* update placeholder po/no.po -JS +* update placeholder po/nl.po -JS * add configure option --enable-kanji for defining symbols related to TH's patch. * improved handling of Japanese text (patch by Hataguchi Takeshi (TH) diff --git a/INSTALLATION b/INSTALLATION index bcad16f4..cf91699a 100644 --- a/INSTALLATION +++ b/INSTALLATION @@ -379,11 +379,6 @@ II. Compile instructions -- UNIX alternate opinion asserts that the feature could actually result in inappropriate resubmission of form content. - --enable-kanji (define KANJI_CODE_OVERRIDE) - Add special logic for supporting KANJI documents. - Also defines CONV_JISX0201KANA_JISX0208KANA and - USE_TH_JP_AUTO_DETECT. - --enable-kbd-layout (define EXP_KEYBOARD_LAYOUT) Disabled by default, this option allows you to use translation tables on the input keystrokes. Current tables include diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c index 20cafe2e..a4418474 100644 --- a/WWW/Library/Implementation/HTFTP.c +++ b/WWW/Library/Implementation/HTFTP.c @@ -38,11 +38,6 @@ ** and code to parse dates and sizes on most hosts. ** 27 Mar 93 (FM) Added code for getting dates and sizes on VMS hosts. ** -** Options: -** LISTEN We listen, the other guy connects for data. -** Otherwise, other way round, but problem finding our -** internet address! -** ** Notes: ** Portions Copyright 1994 Trustees of Dartmouth College ** Code for recognizing different FTP servers and @@ -52,15 +47,6 @@ */ /* -** If LISTEN is not defined, PASV is used instead of PORT, and not -** all FTP servers support PASV, so define it unless there is no -** alternative for your system. -*/ -#ifndef NOPORT -#define LISTEN /* @@@@ Test LJM */ -#endif /* !NOPORT */ - -/* BUGS: @@@ Limit connection cache size! Error reporting to user. 400 & 500 errors are ack'ed by user with windows. @@ -81,9 +67,7 @@ BUGS: @@@ Limit connection cache size! #include <HTFTP.h> /* Implemented here */ #include <HTTCP.h> - -/* this define should be in HTFont.h :( */ -#define HT_NON_BREAK_SPACE ((char)1) /* For now */ +#include <HTFont.h> #define REPEAT_PORT /* Give the port number for each file */ #define REPEAT_LISTEN /* Close each listen socket and open a new one */ @@ -109,6 +93,7 @@ BUGS: @@@ Limit connection cache size! #endif /* !IPORT_FTP */ #include <LYUtils.h> +#include <LYGlobalDefs.h> #include <LYStrings.h> #include <LYLeaks.h> @@ -189,14 +174,11 @@ PRIVATE int interrupted_in_next_data_char = FALSE; PRIVATE unsigned short port_number = FIRST_TCP_PORT; #endif /* POLL_PORTS */ -#ifdef LISTEN PRIVATE int master_socket = -1; /* Listening socket = invalid */ PRIVATE char port_command[255]; /* Command for setting the port */ PRIVATE fd_set open_sockets; /* Mask of active channels */ PRIVATE int num_sockets; /* Number of sockets to scan */ -#else PRIVATE unsigned short passive_port; /* Port server specified for data */ -#endif /* LISTEN */ #define NEXT_CHAR HTGetCharacter() /* Use function in HTFormat.c */ @@ -1053,8 +1035,6 @@ PRIVATE int get_connection ARGS2( } -#ifdef LISTEN - /* Close Master (listening) socket ** ------------------------------- ** @@ -1211,7 +1191,7 @@ PRIVATE int get_listen_socket NOARGS #ifdef REPEAT_LISTEN if (master_socket >= 0) (void) close_master_socket(); -#endif /* REPEAD_LISTEN */ +#endif /* REPEAT_LISTEN */ master_socket = new_socket; @@ -1251,7 +1231,6 @@ PRIVATE int get_listen_socket NOARGS return master_socket; /* Good */ } /* get_listen_socket */ -#endif /* LISTEN */ PRIVATE char * months[12] = { "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec" @@ -2891,21 +2870,20 @@ PUBLIC int HTFTPLoad ARGS4( if (status < 0) return status; -#ifdef LISTEN - status = get_listen_socket(); - if (status < 0) { - NETCLOSE (control->socket); - control->socket = -1; - close_master_socket (); - /* HT_INTERRUPTED would fall through, if we could interrupt - somehow in the middle of it, which we currently can't. */ - return status; - } + if (!ftp_passive) { + status = get_listen_socket(); + if (status < 0) { + NETCLOSE (control->socket); + control->socket = -1; + close_master_socket (); + /* HT_INTERRUPTED would fall through, if we could interrupt + somehow in the middle of it, which we currently can't. */ + return status; + } #ifdef REPEAT_PORT -/* Inform the server of the port number we will listen on -*/ - { + /* Inform the server of the port number we will listen on + */ status = response(port_command); if (status == HT_INTERRUPTED) { CTRACE((tfp, "HTFTP: Interrupted in response (port_command)\n")); @@ -2921,16 +2899,12 @@ PUBLIC int HTFTPLoad ARGS4( return -status; /* bad reply */ } CTRACE((tfp, "HTFTP: Port defined.\n")); - } #endif /* REPEAT_PORT */ -#else /* Use PASV */ -/* Tell the server to be passive -*/ - { + } else { /* Tell the server to be passive */ char command[LINE_LENGTH+1]; char *p; - int reply, h0, h1, h2, h3, p0, p1; /* Parts of reply */ - int status; + int h0, h1, h2, h3, p0, p1; /* Parts of reply */ + data_soc = status; status = send_cmd_1("PASV"); @@ -2945,19 +2919,18 @@ PUBLIC int HTFTPLoad ARGS4( while (--p > response_text && '0' <= *p && *p <= '9') ; /* null body */ - status = sscanf(p+1, "%d,%d,%d,%d,%d,%d", - &h0, &h1, &h2, &h3, &p0, &p1); - if (status < 4) { - fprintf(tfp, "HTFTP: PASV reply has no inet address!\n"); - return -99; - } - passive_port = (p0<<8) + p1; - CTRACE((tfp, "HTFTP: Server is listening on port %d\n", - passive_port)); + status = sscanf(p+1, "%d,%d,%d,%d,%d,%d", + &h0, &h1, &h2, &h3, &p0, &p1); + if (status < 4) { + fprintf(tfp, "HTFTP: PASV reply has no inet address!\n"); + return -99; + } + passive_port = (p0<<8) + p1; + CTRACE((tfp, "HTFTP: Server is listening on port %d\n", + passive_port)); + /* Open connection for data: */ -/* Open connection for data: -*/ sprintf(command, "ftp://%d.%d.%d.%d:%d/",h0,h1,h2,h3,passive_port); status = HTDoConnect(name, "FTP", passive_port, &data_soc); @@ -2970,7 +2943,6 @@ PUBLIC int HTFTPLoad ARGS4( CTRACE((tfp, "FTP data connected, socket %d\n", data_soc)); } -#endif /* use PASV */ status = 0; break; /* No more retries */ @@ -3460,10 +3432,8 @@ PUBLIC int HTFTPLoad ARGS4( } listen: -#ifdef LISTEN -/* Wait for the connection -*/ - { + if(!ftp_passive) { + /* Wait for the connection */ struct sockaddr_in soc_address; int soc_addrlen=sizeof(soc_address); #ifdef SOCKS @@ -3482,10 +3452,8 @@ listen: } CTRACE((tfp, "TCP: Accepted new socket %d\n", status)); data_soc = status; - } -#else -/* @@ */ -#endif /* LISTEN */ + } /* !ftp_passive */ + if ((status = send_cmd_nowait("QUIT")) == 1) outstanding++; if (isDirectory) { diff --git a/WWW/Library/Implementation/HTFormat.c b/WWW/Library/Implementation/HTFormat.c index b4def6e6..37a3172e 100644 --- a/WWW/Library/Implementation/HTFormat.c +++ b/WWW/Library/Implementation/HTFormat.c @@ -1418,7 +1418,7 @@ PRIVATE CONST HTStreamClass HTErrorStreamClass = HTErrorStream_write }; -PUBLIC HTStream * HTErrorStream (void) +PUBLIC HTStream * HTErrorStream NOARGS { CTRACE((tfp, "ErrorStream. Created\n")); HTBaseStreamInstance.isa = &HTErrorStreamClass; /* The rest is random */ diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c index 48d3b55a..ca024e41 100644 --- a/WWW/Library/Implementation/HTMIME.c +++ b/WWW/Library/Implementation/HTMIME.c @@ -166,7 +166,7 @@ PUBLIC void HTMIME_TrimDoubleQuotes ARGS1( value[i] = cp[(i +1)]; } -PRIVATE int pumpData (HTStream * me) +PRIVATE int pumpData ARGS1(HTStream *, me) { if (strchr(HTAtom_name(me->format), ';') != NULL) { char *cp = NULL, *cp1, *cp2, *cp3 = NULL, *cp4; @@ -437,7 +437,7 @@ PRIVATE int pumpData (HTStream * me) return HT_OK; } -PRIVATE int dispatchField (HTStream * me) +PRIVATE int dispatchField ARGS1(HTStream *, me) { int i, j; char *cp; diff --git a/WWW/Library/Implementation/HTMLDTD.h b/WWW/Library/Implementation/HTMLDTD.h index 9167fb2a..d732e7b4 100644 --- a/WWW/Library/Implementation/HTMLDTD.h +++ b/WWW/Library/Implementation/HTMLDTD.h @@ -13,19 +13,7 @@ #define HTMLDTD_H #include <SGML.h> - -/* -** Lynx internal character representations. -*/ -#ifndef HT_NON_BREAK_SPACE -#define HT_NON_BREAK_SPACE ((char)1) /* For now */ -#endif /* !HT_NON_BREAK_SPACE */ -#ifndef HT_EN_SPACE -#define HT_EN_SPACE ((char)2) /* For now */ -#endif /* !HT_EN_SPACE */ -#ifndef LY_SOFT_HYPHEN -#define LY_SOFT_HYPHEN ((char)7) -#endif /* !LY_SOFT_HYPHEN */ +#include <HTFont.h> /* ** Valid mane chars for tag parsing. diff --git a/WWW/Library/Implementation/HTNews.c b/WWW/Library/Implementation/HTNews.c index c37f07e0..68457ffd 100644 --- a/WWW/Library/Implementation/HTNews.c +++ b/WWW/Library/Implementation/HTNews.c @@ -16,13 +16,11 @@ #include <HTCJK.h> #include <HTMIME.h> +#include <HTFont.h> #include <HTTCP.h> #include <LYUtils.h> #include <LYStrings.h> -/* this define should be in HTFont.h :( */ -#define HT_NON_BREAK_SPACE ((char)1) /* For now */ - #define NEWS_PORT 119 /* See rfc977 */ #define SNEWS_PORT 563 /* See Lou Montulli */ #define APPEND /* Use append methods */ diff --git a/WWW/Library/Implementation/HTStream.h b/WWW/Library/Implementation/HTStream.h index a9c4703d..868e0f41 100644 --- a/WWW/Library/Implementation/HTStream.h +++ b/WWW/Library/Implementation/HTStream.h @@ -63,7 +63,7 @@ typedef struct _HTStreamClass { example from the network. */ -extern HTStream * HTErrorStream (void); +extern HTStream * HTErrorStream NOPARAMS; #endif /* HTSTREAM_H */ diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c index 36c8ef2d..505ed74f 100644 --- a/WWW/Library/Implementation/HTTCP.c +++ b/WWW/Library/Implementation/HTTCP.c @@ -1598,17 +1598,18 @@ PUBLIC int HTDoConnect ARGS4( /* ** Protect against an infinite loop. */ - if (tries++ >= 180000) { - HTAlert(gettext("Connection failed for 180,000 tries.")); + if ((tries++/10) >= connect_timeout) { + HTAlert(gettext("Connection failed (too many retries).")); return HT_NO_DATA; } #ifdef _WINDOWS_NSL - timeout.tv_sec = 100; + timeout.tv_sec = connect_timeout; + timeout.tv_usec = 0; #else timeout.tv_sec = 0; -#endif /* _WINDOWS_NSL */ timeout.tv_usec = 100000; +#endif /* _WINDOWS_NSL */ FD_ZERO(&writefds); FD_SET((unsigned) *s, &writefds); #ifdef SOCKS diff --git a/WWW/Library/Implementation/HTVMS_WaisUI.h b/WWW/Library/Implementation/HTVMS_WaisUI.h index 150e108d..474b943d 100644 --- a/WWW/Library/Implementation/HTVMS_WaisUI.h +++ b/WWW/Library/Implementation/HTVMS_WaisUI.h @@ -183,10 +183,6 @@ typedef unsigned long data_tag; #define ACCEPT TRUE #define REJECT FALSE -/* values for SearchAPDU replace indicator element */ -#define ON TRUE -#define OFF FALSE - /* values for SearchResponseAPDU search status element */ #define SUCCESS 0 /* intuitive huh? */ #define FAILURE 1 diff --git a/configure b/configure index c8bf1337..d4f1857a 100755 --- a/configure +++ b/configure @@ -211,10 +211,9 @@ Experimental Options: --enable-addrlist-page use experimental address-list page --enable-charset-choice use experimental charset-selection logic --enable-cjk use experimental CJK logic - --enable-cjk use experimental KANJI logic + --enable-color-style use optional/experimental color style EOF cat <<EOF - --enable-color-style use optional/experimental color style --enable-default-colors enable use of default-colors (ncurses/slang) --enable-file-upload use experimental file-upload support --enable-justify-elts use experimental element-justification logic @@ -226,9 +225,9 @@ cat <<EOF --enable-source-cache cache HTML source for parse mode changes Miscellaneous Options: --disable-alt-bindings disable alternative line-edit bindings + --disable-extended-dtd disable extended HTML DTD logic EOF cat <<EOF - --disable-extended-dtd disable extended HTML DTD logic --disable-partial use partial-display logic --enable-externs use external commands --enable-font-switch use Linux setfont for character-translation @@ -240,9 +239,9 @@ cat <<EOF --enable-nsl-fork fork NSL requests, allowing them to be aborted --enable-syslog log URL requests via syslog --disable-persistent-cookies disable persistent-cookie support + --enable-underlines underline links rather than using boldface EOF cat <<EOF - --enable-underlines underline links rather than using boldface --enable-gzip-help install gzip'ed help files --with-zlib use zlib for decompression of some gzip files --disable-finger disable FINGER logic @@ -254,9 +253,9 @@ Directory Editor Options: --disable-dired-archive disable dearchiving commands --disable-dired-override disable DirEd override keymap --disable-dired-permit disable chmod/attrib commands + --disable-dired-xpermit disable chmod/attrib commands EOF cat <<EOF - --disable-dired-xpermit disable chmod/attrib commands --disable-dired-tar disable "tar" command --disable-dired-uudecode disable "uudecode" command --disable-dired-zip disable "zip", "unzip" commands @@ -632,7 +631,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:636: checking host system type" >&5 +echo "configure:635: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -687,7 +686,7 @@ test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && ec # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:691: checking for $ac_word" >&5 +echo "configure:690: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -717,7 +716,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:721: checking for $ac_word" >&5 +echo "configure:720: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -768,7 +767,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:772: checking for $ac_word" >&5 +echo "configure:771: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -800,7 +799,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:804: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:803: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -811,12 +810,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 815 "configure" +#line 814 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -842,12 +841,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:846: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:845: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:851: checking whether we are using GNU C" >&5 +echo "configure:850: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -856,7 +855,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -875,7 +874,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:879: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:878: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -907,7 +906,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:911: checking how to run the C preprocessor" >&5 +echo "configure:910: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -922,13 +921,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 926 "configure" +#line 925 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:931: \"$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 : @@ -939,13 +938,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 943 "configure" +#line 942 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:948: \"$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 : @@ -956,13 +955,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 960 "configure" +#line 959 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:965: \"$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 : @@ -987,7 +986,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:991: checking whether ln -s works" >&5 +echo "configure:990: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1010,7 +1009,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1014: checking for $ac_word" >&5 +echo "configure:1013: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1038,7 +1037,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1042: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1041: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1076,7 +1075,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1080: checking for a BSD compatible install" >&5 +echo "configure:1079: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1133,7 +1132,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1137: checking for $ac_word" >&5 +echo "configure:1136: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LINT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1164,9 +1163,9 @@ done echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1168: checking for AIX" >&5 +echo "configure:1167: checking for AIX" >&5 cat > conftest.$ac_ext <<EOF -#line 1170 "configure" +#line 1169 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -1188,7 +1187,7 @@ rm -f conftest* echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1192: checking for POSIXized ISC" >&5 +echo "configure:1191: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1214,7 +1213,7 @@ fi echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:1218: checking if you want to see long compiling messages" >&5 +echo "configure:1217: checking if you want to see long compiling messages" >&5 # Check whether --enable-echo or --disable-echo was given. if test "${enable_echo+set}" = set; then @@ -1262,7 +1261,7 @@ fi echo $ac_n "checking if you want to check memory-leaks""... $ac_c" 1>&6 -echo "configure:1266: checking if you want to check memory-leaks" >&5 +echo "configure:1265: checking if you want to check memory-leaks" >&5 # Check whether --enable-find-leaks or --disable-find-leaks was given. if test "${enable_find_leaks+set}" = set; then @@ -1286,7 +1285,7 @@ EOF echo $ac_n "checking if you want to enable debug-code""... $ac_c" 1>&6 -echo "configure:1290: checking if you want to enable debug-code" >&5 +echo "configure:1289: checking if you want to enable debug-code" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -1328,7 +1327,7 @@ else fi echo $ac_n "checking if you want to enable lynx trace code *recommended* ""... $ac_c" 1>&6 -echo "configure:1332: checking if you want to enable lynx trace code *recommended* " >&5 +echo "configure:1331: checking if you want to enable lynx trace code *recommended* " >&5 # Check whether --enable-trace or --disable-trace was given. if test "${enable_trace+set}" = set; then @@ -1354,7 +1353,7 @@ EOF if test -n "$GCC" then echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:1358: checking if you want to turn on gcc warnings" >&5 +echo "configure:1357: checking if you want to turn on gcc warnings" >&5 # Check whether --enable-warnings or --disable-warnings was given. if test "${enable_warnings+set}" = set; then @@ -1394,9 +1393,9 @@ EOF if test -n "$GCC" then echo "checking for $CC __attribute__ directives" 1>&6 -echo "configure:1398: checking for $CC __attribute__ directives" >&5 +echo "configure:1397: checking for $CC __attribute__ directives" >&5 cat > conftest.$ac_ext <<EOF -#line 1400 "configure" +#line 1399 "configure" #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -1434,7 +1433,7 @@ EOF EOF ;; esac - if { (eval echo configure:1438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:1437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6 cat conftest.h >>confdefs.h # else @@ -1451,11 +1450,11 @@ fi if test -n "$GCC" then cat > conftest.$ac_ext <<EOF -#line 1455 "configure" +#line 1454 "configure" int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } EOF echo "checking for $CC warning options" 1>&6 -echo "configure:1459: checking for $CC warning options" >&5 +echo "configure:1458: checking for $CC warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" cf_warn_CONST="" @@ -1473,7 +1472,7 @@ echo "configure:1459: checking for $CC warning options" >&5 Wstrict-prototypes $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:1477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:1476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES" @@ -1491,12 +1490,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1495: checking for ANSI C header files" >&5 +echo "configure:1494: 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 1500 "configure" +#line 1499 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1504,7 +1503,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1507: \"$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* @@ -1521,7 +1520,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 1525 "configure" +#line 1524 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1539,7 +1538,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 1543 "configure" +#line 1542 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1560,7 +1559,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1564 "configure" +#line 1563 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1571,7 +1570,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1595,12 +1594,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1599: checking for working const" >&5 +echo "configure:1598: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1604 "configure" +#line 1603 "configure" #include "confdefs.h" int main() { @@ -1649,7 +1648,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:1653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1670,21 +1669,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1674: checking for inline" >&5 +echo "configure:1673: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 1681 "configure" +#line 1680 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:1688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1710,12 +1709,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1714: checking for off_t" >&5 +echo "configure:1713: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1719 "configure" +#line 1718 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1743,12 +1742,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1747: checking for size_t" >&5 +echo "configure:1746: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1752 "configure" +#line 1751 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1778,19 +1777,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:1782: checking for working alloca.h" >&5 +echo "configure:1781: 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 1787 "configure" +#line 1786 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1793: \"$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 @@ -1811,12 +1810,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1815: checking for alloca" >&5 +echo "configure:1814: 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 1820 "configure" +#line 1819 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -1844,7 +1843,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:1848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1847: \"$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 @@ -1876,12 +1875,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1880: checking whether alloca needs Cray hooks" >&5 +echo "configure:1879: 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 1885 "configure" +#line 1884 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -1906,12 +1905,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:1910: checking for $ac_func" >&5 +echo "configure:1909: 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 1915 "configure" +#line 1914 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1934,7 +1933,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1937: \"$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 @@ -1961,7 +1960,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1965: checking stack direction for C alloca" >&5 +echo "configure:1964: 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 @@ -1969,7 +1968,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 1973 "configure" +#line 1972 "configure" #include "confdefs.h" find_stack_direction () { @@ -1988,7 +1987,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:1992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1991: \"$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 @@ -2013,17 +2012,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2017: checking for $ac_hdr" >&5 +echo "configure:2016: 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 2022 "configure" +#line 2021 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2026: \"$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* @@ -2052,12 +2051,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2056: checking for $ac_func" >&5 +echo "configure:2055: 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 2061 "configure" +#line 2060 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2080,7 +2079,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2083: \"$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 @@ -2105,7 +2104,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2109: checking for working mmap" >&5 +echo "configure:2108: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2113,7 +2112,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 2117 "configure" +#line 2116 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -2253,7 +2252,7 @@ main() } EOF -if { (eval echo configure:2257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2281,17 +2280,17 @@ unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2285: checking for $ac_hdr" >&5 +echo "configure:2284: 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 2290 "configure" +#line 2289 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2294: \"$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* @@ -2321,12 +2320,12 @@ done strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2325: checking for $ac_func" >&5 +echo "configure:2324: 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 2330 "configure" +#line 2329 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2349,7 +2348,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2352: \"$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 @@ -2378,12 +2377,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2382: checking for $ac_func" >&5 +echo "configure:2381: 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 2387 "configure" +#line 2386 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2406,7 +2405,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2409: \"$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 @@ -2440,19 +2439,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:2444: checking for LC_MESSAGES" >&5 +echo "configure:2443: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2449 "configure" +#line 2448 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -2473,7 +2472,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2477: checking whether NLS is requested" >&5 +echo "configure:2476: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then @@ -2494,7 +2493,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:2498: checking whether included gettext is requested" >&5 +echo "configure:2497: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then @@ -2514,17 +2513,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:2518: checking for libintl.h" >&5 +echo "configure:2517: checking for libintl.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 2523 "configure" +#line 2522 "configure" #include "confdefs.h" #include <libintl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2527: \"$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* @@ -2541,19 +2540,19 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:2545: checking for gettext in libc" >&5 +echo "configure:2544: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2550 "configure" +#line 2549 "configure" #include "confdefs.h" #include <libintl.h> int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:2557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -2569,7 +2568,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:2573: checking for bindtextdomain in -lintl" >&5 +echo "configure:2572: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2577,7 +2576,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2581 "configure" +#line 2580 "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 @@ -2588,7 +2587,7 @@ int main() { bindtextdomain() ; return 0; } EOF -if { (eval echo configure:2592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2591: \"$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 @@ -2604,19 +2603,19 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:2608: checking for gettext in libintl" >&5 +echo "configure:2607: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2613 "configure" +#line 2612 "configure" #include "confdefs.h" int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:2620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libintl=yes else @@ -2648,7 +2647,7 @@ EOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2652: checking for $ac_word" >&5 +echo "configure:2651: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2682,12 +2681,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2686: checking for $ac_func" >&5 +echo "configure:2685: 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 2691 "configure" +#line 2690 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2710,7 +2709,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2713: \"$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 @@ -2737,7 +2736,7 @@ done # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2741: checking for $ac_word" >&5 +echo "configure:2740: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2773,7 +2772,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2777: checking for $ac_word" >&5 +echo "configure:2776: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2805,7 +2804,7 @@ else fi cat > conftest.$ac_ext <<EOF -#line 2809 "configure" +#line 2808 "configure" #include "confdefs.h" int main() { @@ -2813,7 +2812,7 @@ extern int _nl_msg_cat_cntr; return _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:2817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -2836,7 +2835,7 @@ fi if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:2840: checking whether catgets can be used" >&5 +echo "configure:2839: checking whether catgets can be used" >&5 # Check whether --with-catgets or --without-catgets was given. if test "${with_catgets+set}" = set; then @@ -2850,7 +2849,7 @@ fi if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:2854: checking for main in -li" >&5 +echo "configure:2853: checking for main in -li" >&5 ac_lib_var=`echo i'_'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 @@ -2858,14 +2857,14 @@ else ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <<EOF -#line 2862 "configure" +#line 2861 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2868: \"$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 @@ -2893,12 +2892,12 @@ else fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:2897: checking for catgets" >&5 +echo "configure:2896: checking for catgets" >&5 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2902 "configure" +#line 2901 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char catgets(); below. */ @@ -2921,7 +2920,7 @@ catgets(); ; return 0; } EOF -if { (eval echo configure:2925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -2943,7 +2942,7 @@ EOF # Extract the first word of "gencat", so it can be a program name with args. set dummy gencat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2947: checking for $ac_word" >&5 +echo "configure:2946: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2979,7 +2978,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2983: checking for $ac_word" >&5 +echo "configure:2982: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3016,7 +3015,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3020: checking for $ac_word" >&5 +echo "configure:3019: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3051,7 +3050,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3055: checking for $ac_word" >&5 +echo "configure:3054: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3109,7 +3108,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3113: checking for $ac_word" >&5 +echo "configure:3112: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3143,7 +3142,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3147: checking for $ac_word" >&5 +echo "configure:3146: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3179,7 +3178,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3183: checking for $ac_word" >&5 +echo "configure:3182: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3273,7 +3272,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:3277: checking for catalogs to be installed" >&5 +echo "configure:3276: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -3302,17 +3301,17 @@ echo "configure:3277: checking for catalogs to be installed" >&5 if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:3306: checking for linux/version.h" >&5 +echo "configure:3305: checking for linux/version.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 3311 "configure" +#line 3310 "configure" #include "confdefs.h" #include <linux/version.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3315: \"$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* @@ -3427,7 +3426,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:3431: checking if we should use included message-library" >&5 +echo "configure:3430: 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 @@ -3464,17 +3463,17 @@ elif test "$USE_NLS" = yes ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3468: checking for $ac_hdr" >&5 +echo "configure:3467: 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 3473 "configure" +#line 3472 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3478: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3477: \"$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* @@ -3544,7 +3543,7 @@ EOF fi echo $ac_n "checking if you want full utility pathnames""... $ac_c" 1>&6 -echo "configure:3548: checking if you want full utility pathnames" >&5 +echo "configure:3547: 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 @@ -3569,7 +3568,7 @@ EOF echo $ac_n "checking for system mailer""... $ac_c" 1>&6 -echo "configure:3573: checking for system mailer" >&5 +echo "configure:3572: 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 @@ -3596,7 +3595,7 @@ EOF echo $ac_n "checking system mail flags""... $ac_c" 1>&6 -echo "configure:3600: checking system mail flags" >&5 +echo "configure:3599: 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 @@ -3624,7 +3623,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "chmod", so it can be a program name with args. set dummy chmod; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3628: checking for $ac_word" >&5 +echo "configure:3627: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3659,7 +3658,7 @@ fi else echo $ac_n "checking for chmod""... $ac_c" 1>&6 -echo "configure:3663: checking for chmod" >&5 +echo "configure:3662: checking for chmod" >&5 echo "$ac_t""$CHMOD" 1>&6 eval 'ac_cv_path_'CHMOD'="'chmod'"' fi @@ -3701,7 +3700,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "compress", so it can be a program name with args. set dummy compress; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3705: checking for $ac_word" >&5 +echo "configure:3704: 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 @@ -3736,7 +3735,7 @@ fi else echo $ac_n "checking for compress""... $ac_c" 1>&6 -echo "configure:3740: checking for compress" >&5 +echo "configure:3739: checking for compress" >&5 echo "$ac_t""$COMPRESS" 1>&6 eval 'ac_cv_path_'COMPRESS'="'compress'"' fi @@ -3778,7 +3777,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "cp", so it can be a program name with args. set dummy cp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3782: checking for $ac_word" >&5 +echo "configure:3781: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_COPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3813,7 +3812,7 @@ fi else echo $ac_n "checking for cp""... $ac_c" 1>&6 -echo "configure:3817: checking for cp" >&5 +echo "configure:3816: checking for cp" >&5 echo "$ac_t""$COPY" 1>&6 eval 'ac_cv_path_'COPY'="'cp'"' fi @@ -3855,7 +3854,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "gzip", so it can be a program name with args. set dummy gzip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3859: checking for $ac_word" >&5 +echo "configure:3858: 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 @@ -3890,7 +3889,7 @@ fi else echo $ac_n "checking for gzip""... $ac_c" 1>&6 -echo "configure:3894: checking for gzip" >&5 +echo "configure:3893: checking for gzip" >&5 echo "$ac_t""$GZIP" 1>&6 eval 'ac_cv_path_'GZIP'="'gzip'"' fi @@ -3932,7 +3931,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "mkdir", so it can be a program name with args. set dummy mkdir; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3936: checking for $ac_word" >&5 +echo "configure:3935: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MKDIR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3967,7 +3966,7 @@ fi else echo $ac_n "checking for mkdir""... $ac_c" 1>&6 -echo "configure:3971: checking for mkdir" >&5 +echo "configure:3970: checking for mkdir" >&5 echo "$ac_t""$MKDIR" 1>&6 eval 'ac_cv_path_'MKDIR'="'mkdir'"' fi @@ -4009,7 +4008,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "mv", so it can be a program name with args. set dummy mv; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4013: checking for $ac_word" >&5 +echo "configure:4012: 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 @@ -4044,7 +4043,7 @@ fi else echo $ac_n "checking for mv""... $ac_c" 1>&6 -echo "configure:4048: checking for mv" >&5 +echo "configure:4047: checking for mv" >&5 echo "$ac_t""$MV" 1>&6 eval 'ac_cv_path_'MV'="'mv'"' fi @@ -4086,7 +4085,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "rm", so it can be a program name with args. set dummy rm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4090: checking for $ac_word" >&5 +echo "configure:4089: 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 @@ -4121,7 +4120,7 @@ fi else echo $ac_n "checking for rm""... $ac_c" 1>&6 -echo "configure:4125: checking for rm" >&5 +echo "configure:4124: checking for rm" >&5 echo "$ac_t""$RM" 1>&6 eval 'ac_cv_path_'RM'="'rm'"' fi @@ -4163,7 +4162,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "tar", so it can be a program name with args. set dummy tar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4167: checking for $ac_word" >&5 +echo "configure:4166: 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 @@ -4198,7 +4197,7 @@ fi else echo $ac_n "checking for tar""... $ac_c" 1>&6 -echo "configure:4202: checking for tar" >&5 +echo "configure:4201: checking for tar" >&5 echo "$ac_t""$TAR" 1>&6 eval 'ac_cv_path_'TAR'="'tar'"' fi @@ -4240,7 +4239,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "touch", so it can be a program name with args. set dummy touch; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4244: checking for $ac_word" >&5 +echo "configure:4243: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TOUCH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4275,7 +4274,7 @@ fi else echo $ac_n "checking for touch""... $ac_c" 1>&6 -echo "configure:4279: checking for touch" >&5 +echo "configure:4278: checking for touch" >&5 echo "$ac_t""$TOUCH" 1>&6 eval 'ac_cv_path_'TOUCH'="'touch'"' fi @@ -4317,7 +4316,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "gunzip", so it can be a program name with args. set dummy gunzip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4321: checking for $ac_word" >&5 +echo "configure:4320: 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 @@ -4352,7 +4351,7 @@ fi else echo $ac_n "checking for gunzip""... $ac_c" 1>&6 -echo "configure:4356: checking for gunzip" >&5 +echo "configure:4355: checking for gunzip" >&5 echo "$ac_t""$UNCOMPRESS" 1>&6 eval 'ac_cv_path_'UNCOMPRESS'="'gunzip'"' fi @@ -4394,7 +4393,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "unzip", so it can be a program name with args. set dummy unzip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4398: checking for $ac_word" >&5 +echo "configure:4397: 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 @@ -4429,7 +4428,7 @@ fi else echo $ac_n "checking for unzip""... $ac_c" 1>&6 -echo "configure:4433: checking for unzip" >&5 +echo "configure:4432: checking for unzip" >&5 echo "$ac_t""$UNZIP" 1>&6 eval 'ac_cv_path_'UNZIP'="'unzip'"' fi @@ -4471,7 +4470,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "bzip2", so it can be a program name with args. set dummy bzip2; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4475: checking for $ac_word" >&5 +echo "configure:4474: 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 @@ -4506,7 +4505,7 @@ fi else echo $ac_n "checking for bzip2""... $ac_c" 1>&6 -echo "configure:4510: checking for bzip2" >&5 +echo "configure:4509: checking for bzip2" >&5 echo "$ac_t""$BZIP2" 1>&6 eval 'ac_cv_path_'BZIP2'="'bzip2'"' fi @@ -4548,7 +4547,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "uudecode", so it can be a program name with args. set dummy uudecode; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4552: checking for $ac_word" >&5 +echo "configure:4551: 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 @@ -4583,7 +4582,7 @@ fi else echo $ac_n "checking for uudecode""... $ac_c" 1>&6 -echo "configure:4587: checking for uudecode" >&5 +echo "configure:4586: checking for uudecode" >&5 echo "$ac_t""$UUDECODE" 1>&6 eval 'ac_cv_path_'UUDECODE'="'uudecode'"' fi @@ -4625,7 +4624,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "zcat", so it can be a program name with args. set dummy zcat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4629: checking for $ac_word" >&5 +echo "configure:4628: 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 @@ -4660,7 +4659,7 @@ fi else echo $ac_n "checking for zcat""... $ac_c" 1>&6 -echo "configure:4664: checking for zcat" >&5 +echo "configure:4663: checking for zcat" >&5 echo "$ac_t""$ZCAT" 1>&6 eval 'ac_cv_path_'ZCAT'="'zcat'"' fi @@ -4702,7 +4701,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "zip", so it can be a program name with args. set dummy zip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4706: checking for $ac_word" >&5 +echo "configure:4705: 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 @@ -4737,7 +4736,7 @@ fi else echo $ac_n "checking for zip""... $ac_c" 1>&6 -echo "configure:4741: checking for zip" >&5 +echo "configure:4740: checking for zip" >&5 echo "$ac_t""$ZIP" 1>&6 eval 'ac_cv_path_'ZIP'="'zip'"' fi @@ -4779,7 +4778,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "telnet", so it can be a program name with args. set dummy telnet; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4783: checking for $ac_word" >&5 +echo "configure:4782: 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 @@ -4814,7 +4813,7 @@ fi else echo $ac_n "checking for telnet""... $ac_c" 1>&6 -echo "configure:4818: checking for telnet" >&5 +echo "configure:4817: checking for telnet" >&5 echo "$ac_t""$TELNET" 1>&6 eval 'ac_cv_path_'TELNET'="'telnet'"' fi @@ -4856,7 +4855,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "tn3270", so it can be a program name with args. set dummy tn3270; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4860: checking for $ac_word" >&5 +echo "configure:4859: 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 @@ -4891,7 +4890,7 @@ fi else echo $ac_n "checking for tn3270""... $ac_c" 1>&6 -echo "configure:4895: checking for tn3270" >&5 +echo "configure:4894: checking for tn3270" >&5 echo "$ac_t""$TN3270" 1>&6 eval 'ac_cv_path_'TN3270'="'tn3270'"' fi @@ -4933,7 +4932,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "rlogin", so it can be a program name with args. set dummy rlogin; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4937: checking for $ac_word" >&5 +echo "configure:4936: 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 @@ -4968,7 +4967,7 @@ fi else echo $ac_n "checking for rlogin""... $ac_c" 1>&6 -echo "configure:4972: checking for rlogin" >&5 +echo "configure:4971: checking for rlogin" >&5 echo "$ac_t""$RLOGIN" 1>&6 eval 'ac_cv_path_'RLOGIN'="'rlogin'"' fi @@ -5020,7 +5019,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "install", so it can be a program name with args. set dummy install; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5024: checking for $ac_word" >&5 +echo "configure:5023: 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 @@ -5055,7 +5054,7 @@ fi else echo $ac_n "checking for install""... $ac_c" 1>&6 -echo "configure:5059: checking for install" >&5 +echo "configure:5058: checking for install" >&5 echo "$ac_t""$INSTALL" 1>&6 eval 'ac_cv_path_'INSTALL'="'install'"' fi @@ -5104,7 +5103,7 @@ EOF if test -z "$GCC" ; then echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:5108: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:5107: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5128,7 +5127,7 @@ for cf_arg in "-DCC_HAS_PROTOS" \ do CFLAGS="$cf_save_CFLAGS $cf_arg" cat > conftest.$ac_ext <<EOF -#line 5132 "configure" +#line 5131 "configure" #include "confdefs.h" #ifndef CC_HAS_PROTOS @@ -5144,7 +5143,7 @@ int main() { struct s2 {int (*f) (double a);}; ; return 0; } EOF -if { (eval echo configure:5148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -5172,12 +5171,12 @@ fi fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5176: checking for working const" >&5 +echo "configure:5175: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5181 "configure" +#line 5180 "configure" #include "confdefs.h" int main() { @@ -5226,7 +5225,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:5230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5268,7 +5267,7 @@ clix*) # contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also # references -lmalloc and -lbsd. echo $ac_n "checking for strcmp in -lc_s""... $ac_c" 1>&6 -echo "configure:5272: checking for strcmp in -lc_s" >&5 +echo "configure:5271: checking for strcmp in -lc_s" >&5 ac_lib_var=`echo c_s'_'strcmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5276,7 +5275,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 5280 "configure" +#line 5279 "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 @@ -5287,7 +5286,7 @@ int main() { strcmp() ; return 0; } EOF -if { (eval echo configure:5291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5290: \"$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 @@ -5380,7 +5379,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5384: checking for $ac_word" >&5 +echo "configure:5383: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5425,17 +5424,17 @@ sony-newsos*) do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5429: checking for $ac_hdr" >&5 +echo "configure:5428: 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 5434 "configure" +#line 5433 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5438: \"$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* @@ -5479,17 +5478,17 @@ ultrix*) do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5483: checking for $ac_hdr" >&5 +echo "configure:5482: 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 5488 "configure" +#line 5487 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5492: \"$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* @@ -5525,13 +5524,13 @@ esac echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6 -echo "configure:5529: checking if we must define _GNU_SOURCE" >&5 +echo "configure:5528: 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 5535 "configure" +#line 5534 "configure" #include "confdefs.h" #include <sys/types.h> int main() { @@ -5541,7 +5540,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:5545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -5551,7 +5550,7 @@ else cf_save="$CFLAGS" CFLAGS="$CFLAGS -D_GNU_SOURCE" cat > conftest.$ac_ext <<EOF -#line 5555 "configure" +#line 5554 "configure" #include "confdefs.h" #include <sys/types.h> int main() { @@ -5561,7 +5560,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:5565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -5586,16 +5585,16 @@ if test -n "$TRY_CFLAGS" ; then cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $TRY_CFLAGS" echo $ac_n "checking if we should use compile options $TRY_CFLAGS""... $ac_c" 1>&6 -echo "configure:5590: checking if we should use compile options $TRY_CFLAGS" >&5 +echo "configure:5589: checking if we should use compile options $TRY_CFLAGS" >&5 cat > conftest.$ac_ext <<EOF -#line 5592 "configure" +#line 5591 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *fp = stdin ; return 0; } EOF -if { (eval echo configure:5599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -5613,7 +5612,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 socks library""... $ac_c" 1>&6 -echo "configure:5617: checking if you want socks library" >&5 +echo "configure:5616: 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 @@ -5633,7 +5632,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:5637: checking if you want socks5 library" >&5 +echo "configure:5636: 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 @@ -5699,7 +5698,7 @@ cat >> confdefs.h <<\EOF EOF cat > conftest.$ac_ext <<EOF -#line 5703 "configure" +#line 5702 "configure" #include "confdefs.h" #include <stdio.h> @@ -5708,7 +5707,7 @@ int main() { accept((char *)0) ; return 0; } EOF -if { (eval echo configure:5712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -5738,9 +5737,9 @@ cat >> confdefs.h <<\EOF EOF echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6 -echo "configure:5742: checking if the socks library uses socks4 prefix" >&5 +echo "configure:5741: checking if the socks library uses socks4 prefix" >&5 cat > conftest.$ac_ext <<EOF -#line 5744 "configure" +#line 5743 "configure" #include "confdefs.h" #include <socks.h> @@ -5749,7 +5748,7 @@ int main() { Rinit((char *)0) ; return 0; } EOF -if { (eval echo configure:5753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5752: \"$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 @@ -5761,14 +5760,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 5765 "configure" +#line 5764 "configure" #include "confdefs.h" #include <socks.h> int main() { SOCKSinit((char *)0) ; return 0; } EOF -if { (eval echo configure:5772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_use_socks4=no else @@ -5837,7 +5836,7 @@ else cf_test_netlibs=no echo $ac_n "checking for network libraries""... $ac_c" 1>&6 -echo "configure:5841: checking for network libraries" >&5 +echo "configure:5840: checking for network libraries" >&5 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5848,12 +5847,12 @@ cf_test_netlibs=yes for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5852: checking for $ac_func" >&5 +echo "configure:5851: 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 5857 "configure" +#line 5856 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5876,7 +5875,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5879: \"$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 @@ -5899,7 +5898,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:5903: checking for gethostname in -lnsl" >&5 +echo "configure:5902: 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 @@ -5907,7 +5906,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 5911 "configure" +#line 5910 "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 @@ -5918,7 +5917,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:5922: \"$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* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5951,7 +5950,7 @@ else echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:5955: checking for gethostname in -lsocket" >&5 +echo "configure:5954: 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 @@ -5959,7 +5958,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 5963 "configure" +#line 5962 "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 @@ -5970,7 +5969,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:5974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5973: \"$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 @@ -6015,7 +6014,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:6019: checking for main in -linet" >&5 +echo "configure:6018: 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 @@ -6023,14 +6022,14 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <<EOF -#line 6027 "configure" +#line 6026 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6033: \"$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 @@ -6055,12 +6054,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:6059: checking for $ac_func" >&5 +echo "configure:6058: 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 6064 "configure" +#line 6063 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6083,7 +6082,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6086: \"$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 @@ -6106,7 +6105,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:6110: checking for socket in -lsocket" >&5 +echo "configure:6109: 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 @@ -6114,7 +6113,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6118 "configure" +#line 6117 "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 @@ -6125,7 +6124,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:6129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6128: \"$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 @@ -6158,7 +6157,7 @@ else echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6 -echo "configure:6162: checking for socket in -lbsd" >&5 +echo "configure:6161: 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 @@ -6166,7 +6165,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6170 "configure" +#line 6169 "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 @@ -6177,7 +6176,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:6181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6180: \"$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 @@ -6222,12 +6221,12 @@ fi for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6226: checking for $ac_func" >&5 +echo "configure:6225: 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 6231 "configure" +#line 6230 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6250,7 +6249,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6253: \"$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 @@ -6273,7 +6272,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:6277: checking for gethostbyname in -lnsl" >&5 +echo "configure:6276: 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 @@ -6281,7 +6280,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6285 "configure" +#line 6284 "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 @@ -6292,7 +6291,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:6296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6295: \"$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 @@ -6333,12 +6332,12 @@ done for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6337: checking for $ac_func" >&5 +echo "configure:6336: 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 6342 "configure" +#line 6341 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6361,7 +6360,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6364: \"$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 @@ -6384,7 +6383,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:6388: checking for strcasecmp in -lresolv" >&5 +echo "configure:6387: 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 @@ -6392,7 +6391,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6396 "configure" +#line 6395 "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 @@ -6403,7 +6402,7 @@ int main() { strcasecmp() ; return 0; } EOF -if { (eval echo configure:6407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6406: \"$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 @@ -6449,13 +6448,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:6453: checking for inet_aton function" >&5 +echo "configure:6452: 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 6459 "configure" +#line 6458 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -6466,7 +6465,7 @@ int main() { inet_aton(0, (struct in_addr *)0) ; return 0; } EOF -if { (eval echo configure:6470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6469: \"$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 @@ -6486,13 +6485,13 @@ EOF else echo $ac_n "checking for inet_addr function""... $ac_c" 1>&6 -echo "configure:6490: checking for inet_addr function" >&5 +echo "configure:6489: 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 6496 "configure" +#line 6495 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -6503,7 +6502,7 @@ int main() { inet_addr(0) ; return 0; } EOF -if { (eval echo configure:6507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6506: \"$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 @@ -6518,7 +6517,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:6522: checking for library with inet_addr" >&5 +echo "configure:6521: 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 @@ -6528,7 +6527,7 @@ else do LIBS="$cf_save_LIBS $cf_inetlib" cat > conftest.$ac_ext <<EOF -#line 6532 "configure" +#line 6531 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -6539,7 +6538,7 @@ int main() { inet_addr(0) ; return 0; } EOF -if { (eval echo configure:6543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6542: \"$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 @@ -6566,7 +6565,7 @@ fi echo $ac_n "checking for screen type""... $ac_c" 1>&6 -echo "configure:6570: checking for screen type" >&5 +echo "configure:6569: checking for screen type" >&5 if eval "test \"`echo '$''{'cf_cv_screen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6601,12 +6600,12 @@ case $cf_cv_screen in curses) echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:6605: checking for initscr" >&5 +echo "configure:6604: 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 6610 "configure" +#line 6609 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr(); below. */ @@ -6629,7 +6628,7 @@ initscr(); ; return 0; } EOF -if { (eval echo configure:6633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6632: \"$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 @@ -6650,7 +6649,7 @@ else case $host_os in #(vi freebsd*) #(vi echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:6654: checking for tgoto in -lmytinfo" >&5 +echo "configure:6653: 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 @@ -6658,7 +6657,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 6662 "configure" +#line 6661 "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 @@ -6669,7 +6668,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:6673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6672: \"$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 @@ -6692,7 +6691,7 @@ fi ;; hpux10.*) echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 -echo "configure:6696: checking for initscr in -lcur_colr" >&5 +echo "configure:6695: 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 @@ -6700,7 +6699,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcur_colr $LIBS" cat > conftest.$ac_ext <<EOF -#line 6704 "configure" +#line 6703 "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 @@ -6711,7 +6710,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6714: \"$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 @@ -6735,7 +6734,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:6739: checking for initscr in -lHcurses" >&5 +echo "configure:6738: 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 @@ -6743,7 +6742,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lHcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 6747 "configure" +#line 6746 "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 @@ -6754,7 +6753,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6757: \"$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 @@ -6803,12 +6802,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:6807: checking for tgoto" >&5 +echo "configure:6806: 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 6812 "configure" +#line 6811 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char tgoto(); below. */ @@ -6831,7 +6830,7 @@ tgoto(); ; return 0; } EOF -if { (eval echo configure:6835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6834: \"$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 @@ -6852,7 +6851,7 @@ else for cf_term_lib in termcap termlib unknown do echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 -echo "configure:6856: checking for tgoto in -l$cf_term_lib" >&5 +echo "configure:6855: 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 @@ -6860,7 +6859,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_term_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 6864 "configure" +#line 6863 "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 @@ -6871,7 +6870,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:6875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6874: \"$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 @@ -6901,7 +6900,7 @@ fi for cf_curs_lib in cursesX curses ncurses xcurses jcurses unknown do echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 -echo "configure:6905: checking for initscr in -l$cf_curs_lib" >&5 +echo "configure:6904: 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 @@ -6909,7 +6908,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_curs_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 6913 "configure" +#line 6912 "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 @@ -6920,7 +6919,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6923: \"$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 @@ -6946,16 +6945,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:6950: checking if we can link with $cf_curs_lib library" >&5 +echo "configure:6949: checking if we can link with $cf_curs_lib library" >&5 cat > conftest.$ac_ext <<EOF -#line 6952 "configure" +#line 6951 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -6969,16 +6968,16 @@ rm -f conftest* test $cf_result = no && { echo "configure: error: Cannot link curses library" 1>&2; exit 1; } 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:6973: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +echo "configure:6972: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 cat > conftest.$ac_ext <<EOF -#line 6975 "configure" +#line 6974 "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:6982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=no else @@ -6988,14 +6987,14 @@ else LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 6992 "configure" +#line 6991 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -7017,14 +7016,14 @@ fi echo $ac_n "checking for curses performance tradeoff""... $ac_c" 1>&6 -echo "configure:7021: checking for curses performance tradeoff" >&5 +echo "configure:7020: 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 7028 "configure" +#line 7027 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -7038,11 +7037,11 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 7046 "configure" +#line 7045 "configure" #include "confdefs.h" #define CURS_PERFORMANCE @@ -7057,7 +7056,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_curs_performance=yes else @@ -7082,13 +7081,13 @@ EOF ncurses) echo $ac_n "checking for ncurses header file""... $ac_c" 1>&6 -echo "configure:7086: checking for ncurses header file" >&5 +echo "configure:7085: checking for ncurses header file" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7092 "configure" +#line 7091 "configure" #include "confdefs.h" #include <curses.h> int main() { @@ -7105,7 +7104,7 @@ make an error ; return 0; } EOF -if { (eval echo configure:7109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=predefined else @@ -7192,7 +7191,7 @@ done ;; esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:7196: checking for ncurses version" >&5 +echo "configure:7195: 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 @@ -7217,7 +7216,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:7221: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:7220: \"$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" @@ -7226,7 +7225,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 7230 "configure" +#line 7229 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -7249,7 +7248,7 @@ int main() exit(0); } EOF -if { (eval echo configure:7253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7252: \"$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` @@ -7274,7 +7273,7 @@ echo "$ac_t""$cf_cv_ncurses_version" 1>&6 cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:7278: checking for Gpm_Open in -lgpm" >&5 +echo "configure:7277: 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 @@ -7282,7 +7281,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 7286 "configure" +#line 7285 "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 @@ -7293,7 +7292,7 @@ int main() { Gpm_Open() ; return 0; } EOF -if { (eval echo configure:7297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7296: \"$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 @@ -7309,7 +7308,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:7313: checking for initscr in -lgpm" >&5 +echo "configure:7312: 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 @@ -7317,7 +7316,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 7321 "configure" +#line 7320 "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 @@ -7328,7 +7327,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7331: \"$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 @@ -7359,7 +7358,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:7363: checking for tgoto in -lmytinfo" >&5 +echo "configure:7362: 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 @@ -7367,7 +7366,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 7371 "configure" +#line 7370 "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 @@ -7378,7 +7377,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:7382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7381: \"$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 @@ -7406,12 +7405,12 @@ LIBS="$cf_ncurses_LIBS $LIBS" cf_cv_have_lib_ncurses=no cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:7410: checking for initscr" >&5 +echo "configure:7409: 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 7415 "configure" +#line 7414 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr(); below. */ @@ -7434,7 +7433,7 @@ initscr(); ; return 0; } EOF -if { (eval echo configure:7438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7437: \"$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 @@ -7454,17 +7453,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:7458: checking for initscr in -lncurses" >&5 +echo "configure:7457: checking for initscr in -lncurses" >&5 LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 7461 "configure" +#line 7460 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_ncurses=yes @@ -7492,17 +7491,17 @@ test "$prefix" != /opt && cf_search="$cf_search /opt/lib /opt/lib/ncur for cf_libdir in $cf_search do echo $ac_n "checking for -lncurses in $cf_libdir""... $ac_c" 1>&6 -echo "configure:7496: checking for -lncurses in $cf_libdir" >&5 +echo "configure:7495: checking for -lncurses in $cf_libdir" >&5 LIBS="-L$cf_libdir -lncurses $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 7499 "configure" +#line 7498 "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:7505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_ncurses=yes @@ -7534,7 +7533,7 @@ esac if test -n "$cf_ncurses_LIBS" ; then echo $ac_n "checking if we can link ncurses without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:7538: checking if we can link ncurses without $cf_ncurses_LIBS" >&5 +echo "configure:7537: checking if we can link ncurses 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'$//'` @@ -7543,14 +7542,14 @@ echo "configure:7538: checking if we can link ncurses without $cf_ncurses_LIBS" fi done cat > conftest.$ac_ext <<EOF -#line 7547 "configure" +#line 7546 "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:7554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7553: \"$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 @@ -7567,20 +7566,20 @@ fi slang) echo $ac_n "checking for slang header file""... $ac_c" 1>&6 -echo "configure:7571: checking for slang header file" >&5 +echo "configure:7570: 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 7577 "configure" +#line 7576 "configure" #include "confdefs.h" #include <slang.h> int main() { printf("%s\n", SLANG_VERSION) ; return 0; } EOF -if { (eval echo configure:7584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_slang_header=predefined else @@ -7663,24 +7662,24 @@ else cf_cv_termlib=none cat > conftest.$ac_ext <<EOF -#line 7667 "configure" +#line 7666 "configure" #include "confdefs.h" int main() { char *x=(char*)tgoto("",0,0) ; return 0; } EOF -if { (eval echo configure:7674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 7677 "configure" +#line 7676 "configure" #include "confdefs.h" int main() { int x=tigetstr("") ; return 0; } EOF -if { (eval echo configure:7684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_termlib=terminfo else @@ -7709,16 +7708,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:7713: checking for $cf_func in -l$cf_lib" >&5 +echo "configure:7712: checking for $cf_func in -l$cf_lib" >&5 cat > conftest.$ac_ext <<EOF -#line 7715 "configure" +#line 7714 "configure" #include "confdefs.h" int main() { int x=$cf_func("") ; return 0; } EOF -if { (eval echo configure:7722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -7745,7 +7744,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:7749: checking for initscr in -lcurses" >&5 +echo "configure:7748: 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 @@ -7753,7 +7752,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 7757 "configure" +#line 7756 "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 @@ -7764,7 +7763,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7767: \"$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 @@ -7785,7 +7784,7 @@ else fi echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:7789: checking for tgoto in -ltermcap" >&5 +echo "configure:7788: 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 @@ -7793,7 +7792,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 7797 "configure" +#line 7796 "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 @@ -7804,7 +7803,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:7808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7807: \"$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 @@ -7836,12 +7835,12 @@ fi cf_slang_LIBS2="$LIBS" echo $ac_n "checking for acos""... $ac_c" 1>&6 -echo "configure:7840: checking for acos" >&5 +echo "configure:7839: 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 7845 "configure" +#line 7844 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char acos(); below. */ @@ -7864,7 +7863,7 @@ acos(); ; return 0; } EOF -if { (eval echo configure:7868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7867: \"$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 @@ -7883,7 +7882,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for acos in -lm""... $ac_c" 1>&6 -echo "configure:7887: checking for acos in -lm" >&5 +echo "configure:7886: 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 @@ -7891,7 +7890,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 7895 "configure" +#line 7894 "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 @@ -7902,7 +7901,7 @@ int main() { acos() ; return 0; } EOF -if { (eval echo configure:7906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7905: \"$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 @@ -7942,12 +7941,12 @@ fi cf_cv_have_lib_slang=no cf_libdir="" echo $ac_n "checking for SLtt_get_screen_size""... $ac_c" 1>&6 -echo "configure:7946: checking for SLtt_get_screen_size" >&5 +echo "configure:7945: 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 7951 "configure" +#line 7950 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char SLtt_get_screen_size(); below. */ @@ -7970,7 +7969,7 @@ SLtt_get_screen_size(); ; return 0; } EOF -if { (eval echo configure:7974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7973: \"$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 @@ -7990,17 +7989,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6 -echo "configure:7994: checking for SLtt_get_screen_size in -lslang" >&5 +echo "configure:7993: checking for SLtt_get_screen_size in -lslang" >&5 LIBS="-lslang $LIBS" cat > conftest.$ac_ext <<EOF -#line 7997 "configure" +#line 7996 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:8004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_slang=yes @@ -8028,17 +8027,17 @@ test "$prefix" != /opt && cf_search="$cf_search /opt/lib /opt/lib/slan for cf_libdir in $cf_search do echo $ac_n "checking for -lslang in $cf_libdir""... $ac_c" 1>&6 -echo "configure:8032: checking for -lslang in $cf_libdir" >&5 +echo "configure:8031: checking for -lslang in $cf_libdir" >&5 LIBS="-L$cf_libdir -lslang $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 8035 "configure" +#line 8034 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:8042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_slang=yes @@ -8069,7 +8068,7 @@ esac cf_slang_LIBS3="$LIBS" echo $ac_n "checking if we can link slang without termcap""... $ac_c" 1>&6 -echo "configure:8073: checking if we can link slang without termcap" >&5 +echo "configure:8072: 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 @@ -8077,14 +8076,14 @@ else fi LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s@$cf_exclude@@" -e 's@^.@@'` cat > conftest.$ac_ext <<EOF -#line 8081 "configure" +#line 8080 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:8088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -8104,7 +8103,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:8108: checking for location of config-file" >&5 +echo "configure:8107: 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" @@ -8116,7 +8115,7 @@ CHARSET_DEFS= echo $ac_n "checking if you want only a few charsets""... $ac_c" 1>&6 -echo "configure:8120: checking if you want only a few charsets" >&5 +echo "configure:8119: 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 @@ -8161,12 +8160,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:8165: checking for ANSI C header files" >&5 +echo "configure:8164: 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 8170 "configure" +#line 8169 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -8174,7 +8173,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8177: \"$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* @@ -8191,7 +8190,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 8195 "configure" +#line 8194 "configure" #include "confdefs.h" #include <string.h> EOF @@ -8209,7 +8208,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 8213 "configure" +#line 8212 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -8230,7 +8229,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 8234 "configure" +#line 8233 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -8241,7 +8240,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:8245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -8265,12 +8264,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:8269: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:8268: 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 8274 "configure" +#line 8273 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -8279,7 +8278,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:8283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -8304,12 +8303,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:8308: checking for $ac_hdr that defines DIR" >&5 +echo "configure:8307: 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 8313 "configure" +#line 8312 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -8317,7 +8316,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:8321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -8342,7 +8341,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:8346: checking for opendir in -ldir" >&5 +echo "configure:8345: 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 @@ -8350,7 +8349,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 8354 "configure" +#line 8353 "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 @@ -8361,7 +8360,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:8365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8364: \"$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 @@ -8383,7 +8382,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:8387: checking for opendir in -lx" >&5 +echo "configure:8386: 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 @@ -8391,7 +8390,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 8395 "configure" +#line 8394 "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 @@ -8402,7 +8401,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:8406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8405: \"$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 @@ -8442,17 +8441,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:8446: checking for $ac_hdr" >&5 +echo "configure:8445: 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 8451 "configure" +#line 8450 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8455: \"$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* @@ -8480,13 +8479,13 @@ done echo $ac_n "checking termio.h and termios.h""... $ac_c" 1>&6 -echo "configure:8484: checking termio.h and termios.h" >&5 +echo "configure:8483: 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 8490 "configure" +#line 8489 "configure" #include "confdefs.h" #if HAVE_TERMIO_H @@ -8499,7 +8498,7 @@ int main() { putchar (0x0a) ; return 0; } EOF -if { (eval echo configure:8503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_termio_and_termios=yes else @@ -8519,13 +8518,13 @@ EOF echo $ac_n "checking for sigaction and structs""... $ac_c" 1>&6 -echo "configure:8523: checking for sigaction and structs" >&5 +echo "configure:8522: 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 8529 "configure" +#line 8528 "configure" #include "confdefs.h" #include <sys/types.h> @@ -8540,7 +8539,7 @@ struct sigaction act; ; return 0; } EOF -if { (eval echo configure:8544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_func_sigaction=yes else @@ -8564,17 +8563,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:8568: checking for $ac_hdr" >&5 +echo "configure:8567: 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 8573 "configure" +#line 8572 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8577: \"$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* @@ -8611,17 +8610,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:8615: checking for $ac_hdr" >&5 +echo "configure:8614: 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 8620 "configure" +#line 8619 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8624: \"$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* @@ -8651,17 +8650,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:8655: checking for $ac_hdr" >&5 +echo "configure:8654: 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 8660 "configure" +#line 8659 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8664: \"$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* @@ -8702,13 +8701,13 @@ fi echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:8706: checking for union wait" >&5 +echo "configure:8705: 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 8712 "configure" +#line 8711 "configure" #include "confdefs.h" $cf_wait_headers int main() { @@ -8719,7 +8718,7 @@ int x; ; return 0; } EOF -if { (eval echo configure:8723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8722: \"$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 @@ -8730,7 +8729,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 8734 "configure" +#line 8733 "configure" #include "confdefs.h" $cf_wait_headers int main() { @@ -8745,7 +8744,7 @@ union wait x; ; return 0; } EOF -if { (eval echo configure:8749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8748: \"$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 @@ -8772,20 +8771,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:8776: checking if union wait can be used as wait-arg" >&5 +echo "configure:8775: 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 8782 "configure" +#line 8781 "configure" #include "confdefs.h" $cf_wait_headers int main() { union wait x; wait(&x) ; return 0; } EOF -if { (eval echo configure:8789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_arg_union_wait=yes else @@ -8805,20 +8804,20 @@ EOF echo $ac_n "checking if union wait can be used as waitpid-arg""... $ac_c" 1>&6 -echo "configure:8809: checking if union wait can be used as waitpid-arg" >&5 +echo "configure:8808: 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 8815 "configure" +#line 8814 "configure" #include "confdefs.h" $cf_wait_headers int main() { union wait x; waitpid(0, &x, 0) ; return 0; } EOF -if { (eval echo configure:8822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_arg_union_waitpid=yes else @@ -8844,17 +8843,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:8848: checking for $ac_hdr" >&5 +echo "configure:8847: 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 8853 "configure" +#line 8852 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8857: \"$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* @@ -8881,13 +8880,13 @@ fi done echo $ac_n "checking for standard varargs""... $ac_c" 1>&6 -echo "configure:8885: checking for standard varargs" >&5 +echo "configure:8884: 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 8891 "configure" +#line 8890 "configure" #include "confdefs.h" #if HAVE_STDARG_H @@ -8902,7 +8901,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:8906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_varargs=yes else @@ -8922,12 +8921,12 @@ EOF echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:8926: checking for uid_t in sys/types.h" >&5 +echo "configure:8925: 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 8931 "configure" +#line 8930 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -8956,7 +8955,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:8960: checking type of array argument to getgroups" >&5 +echo "configure:8959: 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 @@ -8964,7 +8963,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <<EOF -#line 8968 "configure" +#line 8967 "configure" #include "confdefs.h" /* Thanks to Mike Rendell for this test. */ @@ -8989,7 +8988,7 @@ main() } EOF -if { (eval echo configure:8993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8992: \"$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 @@ -9003,7 +9002,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext <<EOF -#line 9007 "configure" +#line 9006 "configure" #include "confdefs.h" #include <unistd.h> EOF @@ -9027,12 +9026,12 @@ EOF echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:9031: checking for pid_t" >&5 +echo "configure:9030: 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 9036 "configure" +#line 9035 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -9060,12 +9059,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:9064: checking for uid_t in sys/types.h" >&5 +echo "configure:9063: 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 9069 "configure" +#line 9068 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -9094,12 +9093,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:9098: checking for mode_t" >&5 +echo "configure:9097: 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 9103 "configure" +#line 9102 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -9130,17 +9129,17 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:9134: checking for vfork.h" >&5 +echo "configure:9133: 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 9139 "configure" +#line 9138 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9143: \"$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* @@ -9165,18 +9164,18 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:9169: checking for working vfork" >&5 +echo "configure:9168: 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:9175: checking for vfork" >&5 +echo "configure:9174: 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 9180 "configure" +#line 9179 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vfork(); below. */ @@ -9199,7 +9198,7 @@ vfork(); ; return 0; } EOF -if { (eval echo configure:9203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9202: \"$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 @@ -9221,7 +9220,7 @@ fi ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext <<EOF -#line 9225 "configure" +#line 9224 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -9316,7 +9315,7 @@ main() { } } EOF -if { (eval echo configure:9320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9319: \"$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 @@ -9340,13 +9339,13 @@ fi echo $ac_n "checking if we should use fcntl or ioctl""... $ac_c" 1>&6 -echo "configure:9344: checking if we should use fcntl or ioctl" >&5 +echo "configure:9343: 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 9350 "configure" +#line 9349 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9358,7 +9357,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_fionbio=ioctl else @@ -9367,7 +9366,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9371 "configure" +#line 9370 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9384,7 +9383,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_fionbio=fcntl else @@ -9407,20 +9406,20 @@ EOF echo $ac_n "checking for broken/missing definition of remove""... $ac_c" 1>&6 -echo "configure:9411: checking for broken/missing definition of remove" >&5 +echo "configure:9410: 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 9417 "configure" +#line 9416 "configure" #include "confdefs.h" #include <stdio.h> int main() { remove("dummy") ; return 0; } EOF -if { (eval echo configure:9424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_baddef_remove=no else @@ -9428,7 +9427,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9432 "configure" +#line 9431 "configure" #include "confdefs.h" #include <stdio.h> int __unlink(name) { return unlink(name); } @@ -9436,7 +9435,7 @@ int main() { remove("dummy") ; return 0; } EOF -if { (eval echo configure:9440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_baddef_remove=yes else @@ -9460,13 +9459,13 @@ EOF echo $ac_n "checking for lstat""... $ac_c" 1>&6 -echo "configure:9464: checking for lstat" >&5 +echo "configure:9463: 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 9470 "configure" +#line 9469 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9475,7 +9474,7 @@ int main() { lstat(".", (struct stat *)0) ; return 0; } EOF -if { (eval echo configure:9479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_lstat=yes else @@ -9514,12 +9513,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9518: checking for $ac_func" >&5 +echo "configure:9517: 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 9523 "configure" +#line 9522 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9542,7 +9541,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:9546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9545: \"$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 @@ -9572,12 +9571,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9576: checking for $ac_func" >&5 +echo "configure:9575: 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 9581 "configure" +#line 9580 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9600,7 +9599,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:9604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9603: \"$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 @@ -9631,12 +9630,12 @@ for ac_func in strstr do echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6 -echo "configure:9635: checking for $ac_func declaration" >&5 +echo "configure:9634: 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 9640 "configure" +#line 9639 "configure" #include "confdefs.h" #include <string.h> int main() { @@ -9645,11 +9644,11 @@ extern int ${ac_func}(); #endif ; return 0; } EOF -if { (eval echo configure:9649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9653 "configure" +#line 9652 "configure" #include "confdefs.h" #include <string.h> int main() { @@ -9658,7 +9657,7 @@ int (*p)() = ${ac_func}; #endif ; return 0; } EOF -if { (eval echo configure:9662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_decl_$ac_func=yes" @@ -9700,12 +9699,12 @@ for ac_func in getgrgid getgrnam do echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6 -echo "configure:9704: checking for $ac_func declaration" >&5 +echo "configure:9703: 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 9709 "configure" +#line 9708 "configure" #include "confdefs.h" #include <stdio.h> @@ -9716,11 +9715,11 @@ extern int ${ac_func}(); #endif ; return 0; } EOF -if { (eval echo configure:9720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9724 "configure" +#line 9723 "configure" #include "confdefs.h" #include <stdio.h> @@ -9731,7 +9730,7 @@ int (*p)() = ${ac_func}; #endif ; return 0; } EOF -if { (eval echo configure:9735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_decl_$ac_func=yes" @@ -9773,13 +9772,13 @@ done echo $ac_n "checking if TRUE/FALSE are defined""... $ac_c" 1>&6 -echo "configure:9777: checking if TRUE/FALSE are defined" >&5 +echo "configure:9776: 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 9783 "configure" +#line 9782 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -9788,7 +9787,7 @@ int main() { int x = TRUE, y = FALSE ; return 0; } EOF -if { (eval echo configure:9792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_bool_defs=yes else @@ -9815,13 +9814,13 @@ fi echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6 -echo "configure:9819: checking if external errno is declared" >&5 +echo "configure:9818: 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 9825 "configure" +#line 9824 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -9834,7 +9833,7 @@ int main() { long x = (long) errno ; return 0; } EOF -if { (eval echo configure:9838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_dcl_'errno'=yes' else @@ -9865,13 +9864,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:9869: checking if external errno exists" >&5 +echo "configure:9868: 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 9875 "configure" +#line 9874 "configure" #include "confdefs.h" #undef errno @@ -9881,7 +9880,7 @@ int main() { errno = 2 ; return 0; } EOF -if { (eval echo configure:9885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval 'cf_cv_have_'errno'=yes' else @@ -9913,20 +9912,20 @@ fi echo $ac_n "checking for setlocale()""... $ac_c" 1>&6 -echo "configure:9917: checking for setlocale()" >&5 +echo "configure:9916: 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 9923 "configure" +#line 9922 "configure" #include "confdefs.h" #include <locale.h> int main() { setlocale(LC_ALL, "") ; return 0; } EOF -if { (eval echo configure:9930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_locale=yes else @@ -9947,13 +9946,13 @@ EOF echo $ac_n "checking if NGROUPS is defined""... $ac_c" 1>&6 -echo "configure:9951: checking if NGROUPS is defined" >&5 +echo "configure:9950: 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 9957 "configure" +#line 9956 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -9967,7 +9966,7 @@ int main() { int x = NGROUPS ; return 0; } EOF -if { (eval echo configure:9971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ngroups=yes else @@ -9975,7 +9974,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9979 "configure" +#line 9978 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -9989,7 +9988,7 @@ int main() { int x = NGROUPS_MAX ; return 0; } EOF -if { (eval echo configure:9993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ngroups=NGROUPS_MAX else @@ -10023,13 +10022,13 @@ for cf_name in sys_nerr sys_errlist do echo $ac_n "checking if external $cf_name is declared""... $ac_c" 1>&6 -echo "configure:10027: checking if external $cf_name is declared" >&5 +echo "configure:10026: checking if external $cf_name is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_$cf_name'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10033 "configure" +#line 10032 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -10042,7 +10041,7 @@ int main() { long x = (long) $cf_name ; return 0; } EOF -if { (eval echo configure:10046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_dcl_'$cf_name'=yes' else @@ -10073,13 +10072,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external $cf_name exists""... $ac_c" 1>&6 -echo "configure:10077: checking if external $cf_name exists" >&5 +echo "configure:10076: checking if external $cf_name exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_$cf_name'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10083 "configure" +#line 10082 "configure" #include "confdefs.h" #undef $cf_name @@ -10089,7 +10088,7 @@ int main() { $cf_name = 2 ; return 0; } EOF -if { (eval echo configure:10093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval 'cf_cv_have_'$cf_name'=yes' else @@ -10122,13 +10121,13 @@ done echo $ac_n "checking if struct utmp is declared""... $ac_c" 1>&6 -echo "configure:10126: checking if struct utmp is declared" >&5 +echo "configure:10125: checking if struct utmp is declared" >&5 if eval "test \"`echo '$''{'cf_cv_have_utmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10132 "configure" +#line 10131 "configure" #include "confdefs.h" #include <sys/types.h> @@ -10137,7 +10136,7 @@ int main() { struct utmp x; char *y = &x.ut_host[0] ; return 0; } EOF -if { (eval echo configure:10141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp=yes else @@ -10145,14 +10144,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 10149 "configure" +#line 10148 "configure" #include "confdefs.h" #include <utmpx.h> int main() { struct utmpx x; char *y = &x.ut_host[0] ; return 0; } EOF -if { (eval echo configure:10156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp=utmpx else @@ -10180,13 +10179,13 @@ EOF echo $ac_n "checking if external h_errno exists""... $ac_c" 1>&6 -echo "configure:10184: checking if external h_errno exists" >&5 +echo "configure:10183: 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 10190 "configure" +#line 10189 "configure" #include "confdefs.h" #undef h_errno @@ -10196,7 +10195,7 @@ int main() { h_errno = 2 ; return 0; } EOF -if { (eval echo configure:10200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval 'cf_cv_have_'h_errno'=yes' else @@ -10227,13 +10226,13 @@ fi echo $ac_n "checking if character set is EBCDIC""... $ac_c" 1>&6 -echo "configure:10231: checking if character set is EBCDIC" >&5 +echo "configure:10230: checking if character set is EBCDIC" >&5 if eval "test \"`echo '$''{'cf_cv_ebcdic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10237 "configure" +#line 10236 "configure" #include "confdefs.h" int main() { @@ -10246,7 +10245,7 @@ make an error "Character set is not EBCDIC" #endif ; return 0; } EOF -if { (eval echo configure:10250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # TryCompile action if true cf_cv_ebcdic=yes @@ -10280,7 +10279,7 @@ esac if test $cf_cv_screen != slang ; then echo $ac_n "checking if curses supports alternate-character set""... $ac_c" 1>&6 -echo "configure:10284: checking if curses supports alternate-character set" >&5 +echo "configure:10283: 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 @@ -10288,7 +10287,7 @@ else for mapname in acs_map _acs_map do cat > conftest.$ac_ext <<EOF -#line 10292 "configure" +#line 10291 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10297,7 +10296,7 @@ int main() { chtype x = $mapname['l']; $mapname['m'] = 0 ; return 0; } EOF -if { (eval echo configure:10301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10300: \"$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 @@ -10320,13 +10319,13 @@ EOF echo $ac_n "checking if curses supports fancy attributes""... $ac_c" 1>&6 -echo "configure:10324: checking if curses supports fancy attributes" >&5 +echo "configure:10323: 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 10330 "configure" +#line 10329 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10339,7 +10338,7 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE); ; return 0; } EOF -if { (eval echo configure:10343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_fancy_curses=yes else @@ -10359,7 +10358,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:10363: checking for ncurses version" >&5 +echo "configure:10362: 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 @@ -10384,7 +10383,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:10388: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:10387: \"$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" @@ -10393,7 +10392,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 10397 "configure" +#line 10396 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10416,7 +10415,7 @@ int main() exit(0); } EOF -if { (eval echo configure:10420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10419: \"$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` @@ -10436,13 +10435,13 @@ echo "$ac_t""$cf_cv_ncurses_version" 1>&6 if test "$cf_cv_ncurses_version" != no ; then echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6 -echo "configure:10440: checking for obsolete/broken version of ncurses" >&5 +echo "configure:10439: 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 10446 "configure" +#line 10445 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10456,7 +10455,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_broken=no else @@ -10481,13 +10480,13 @@ fi echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:10485: checking if curses supports color attributes" >&5 +echo "configure:10484: 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 10491 "configure" +#line 10490 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10502,7 +10501,7 @@ chtype x = COLOR_BLUE; ; return 0; } EOF -if { (eval echo configure:10506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_color_curses=yes else @@ -10529,7 +10528,7 @@ fi echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6 -echo "configure:10533: checking declaration of size-change" >&5 +echo "configure:10532: 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 @@ -10543,7 +10542,7 @@ do CFLAGS="$cf_save_CFLAGS" test -n "$cf_opts" && CFLAGS="$CFLAGS -D$cf_opts" cat > conftest.$ac_ext <<EOF -#line 10547 "configure" +#line 10546 "configure" #include "confdefs.h" #include <sys/types.h> #if HAVE_TERMIOS_H @@ -10582,7 +10581,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sizechange=yes else @@ -10614,20 +10613,20 @@ EOF echo $ac_n "checking if ttytype is declared in curses library""... $ac_c" 1>&6 -echo "configure:10618: checking if ttytype is declared in curses library" >&5 +echo "configure:10617: 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 10624 "configure" +#line 10623 "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:10631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_ttytype=yes else @@ -10648,13 +10647,13 @@ EOF echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:10652: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:10651: 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 10658 "configure" +#line 10657 "configure" #include "confdefs.h" #include <stdlib.h> @@ -10664,7 +10663,7 @@ int main() { long x = winnstr(stdscr, "", 0) ; return 0; } EOF -if { (eval echo configure:10668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10667: \"$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 @@ -10672,7 +10671,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 10676 "configure" +#line 10675 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -10683,7 +10682,7 @@ int main() { long x = winnstr(stdscr, "", 0) ; return 0; } EOF -if { (eval echo configure:10687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10686: \"$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 @@ -10716,9 +10715,9 @@ do cf_tr_func=`echo $cf_func | tr '[a-z]' '[A-Z]'` echo $ac_n "checking for ${cf_func}""... $ac_c" 1>&6 -echo "configure:10720: checking for ${cf_func}" >&5 +echo "configure:10719: checking for ${cf_func}" >&5 -echo "(line 10722) testing ${cf_func} ..." 1>&5 +echo "(line 10721) 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 @@ -10727,7 +10726,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat > conftest.$ac_ext <<EOF -#line 10731 "configure" +#line 10730 "configure" #include "confdefs.h" #include <curses.h> @@ -10742,7 +10741,7 @@ long foo = (long)(&${cf_func}); ; return 0; } EOF -if { (eval echo configure:10746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -10774,7 +10773,7 @@ fi echo $ac_n "checking if configuration info should be browsable""... $ac_c" 1>&6 -echo "configure:10778: checking if configuration info should be browsable" >&5 +echo "configure:10777: 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 @@ -10798,7 +10797,7 @@ EOF echo $ac_n "checking if new-style forms-based options screen should be used""... $ac_c" 1>&6 -echo "configure:10802: checking if new-style forms-based options screen should be used" >&5 +echo "configure:10801: 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 @@ -10822,7 +10821,7 @@ EOF echo $ac_n "checking if old-style options menu should be used""... $ac_c" 1>&6 -echo "configure:10826: checking if old-style options menu should be used" >&5 +echo "configure:10825: 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 @@ -10846,7 +10845,7 @@ EOF echo $ac_n "checking if experimental address-list page should be used""... $ac_c" 1>&6 -echo "configure:10850: checking if experimental address-list page should be used" >&5 +echo "configure:10849: 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 @@ -10870,7 +10869,7 @@ EOF echo $ac_n "checking if experimental charset-selection logic should be used""... $ac_c" 1>&6 -echo "configure:10874: checking if experimental charset-selection logic should be used" >&5 +echo "configure:10873: 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 @@ -10894,7 +10893,7 @@ EOF echo $ac_n "checking if experimental CJK logic should be used""... $ac_c" 1>&6 -echo "configure:10898: checking if experimental CJK logic should be used" >&5 +echo "configure:10897: 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 @@ -10917,42 +10916,8 @@ test $use_cjk != no && cat >> confdefs.h <<\EOF EOF -echo $ac_n "checking if experimental KANJI logic should be used""... $ac_c" 1>&6 -echo "configure:10922: checking if experimental KANJI logic should be used" >&5 - -# Check whether --enable-kanji or --disable-kanji was given. -if test "${enable_kanji+set}" = set; then - enableval="$enable_kanji" - test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then - use_kanji=$enableval - else - use_kanji=no - fi -else - enableval=no - use_kanji=no - -fi - -echo "$ac_t""$use_kanji" 1>&6 -if test $use_kanji != no ; then - cat >> confdefs.h <<\EOF -#define KANJI_CODE_OVERRIDE 1 -EOF - - cat >> confdefs.h <<\EOF -#define CONV_JISX0201KANA_JISX0208KANA 1 -EOF - - cat >> confdefs.h <<\EOF -#define USE_TH_JP_AUTO_DETECT 1 -EOF - -fi - echo $ac_n "checking if color-style code should be used""... $ac_c" 1>&6 -echo "configure:10956: checking if color-style code should be used" >&5 +echo "configure:10921: 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 @@ -11000,7 +10965,7 @@ EOF echo "$ac_t""yes" 1>&6 echo $ac_n "checking for location of style-sheet file""... $ac_c" 1>&6 -echo "configure:11004: checking for location of style-sheet file" >&5 +echo "configure:10969: 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" @@ -11018,7 +10983,7 @@ test ".$cf_cv_func_use_default_colors" = ".yes" && use_dft_colors=maybe if test "$use_dft_colors" != no ; then echo $ac_n "checking if you want to use default-colors""... $ac_c" 1>&6 -echo "configure:11022: checking if you want to use default-colors" >&5 +echo "configure:10987: 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 @@ -11043,7 +11008,7 @@ EOF fi echo $ac_n "checking if experimental file-upload logic should be used""... $ac_c" 1>&6 -echo "configure:11047: checking if experimental file-upload logic should be used" >&5 +echo "configure:11012: checking if experimental 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 @@ -11067,7 +11032,7 @@ EOF echo $ac_n "checking if experimental element-justification logic should be used""... $ac_c" 1>&6 -echo "configure:11071: checking if experimental element-justification logic should be used" >&5 +echo "configure:11036: 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 @@ -11091,7 +11056,7 @@ EOF echo $ac_n "checking if experimental keyboard-layout logic should be used""... $ac_c" 1>&6 -echo "configure:11095: checking if experimental keyboard-layout logic should be used" >&5 +echo "configure:11060: 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 @@ -11115,7 +11080,7 @@ EOF echo $ac_n "checking if experimental JavaScript support should be used""... $ac_c" 1>&6 -echo "configure:11119: checking if experimental JavaScript support should be used" >&5 +echo "configure:11084: checking if experimental JavaScript support should be used" >&5 # Check whether --enable-libjs or --disable-libjs was given. if test "${enable_libjs+set}" = set; then @@ -11139,7 +11104,7 @@ EOF echo $ac_n "checking if html source should be colorized""... $ac_c" 1>&6 -echo "configure:11143: checking if html source should be colorized" >&5 +echo "configure:11108: checking if html source should be colorized" >&5 # Check whether --enable-prettysrc or --disable-prettysrc was given. if test "${enable_prettysrc+set}" = set; then @@ -11163,7 +11128,7 @@ EOF echo $ac_n "checking if read-progress message should show ETA""... $ac_c" 1>&6 -echo "configure:11167: checking if read-progress message should show ETA" >&5 +echo "configure:11132: 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 @@ -11187,7 +11152,7 @@ EOF echo $ac_n "checking if scrollbar code should be used""... $ac_c" 1>&6 -echo "configure:11191: checking if scrollbar code should be used" >&5 +echo "configure:11156: checking if scrollbar code should be used" >&5 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -11218,7 +11183,7 @@ EOF fi echo $ac_n "checking if source caching should be used""... $ac_c" 1>&6 -echo "configure:11222: checking if source caching should be used" >&5 +echo "configure:11187: 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 @@ -11245,7 +11210,7 @@ EOF echo $ac_n "checking if alternative line-edit bindings should be used""... $ac_c" 1>&6 -echo "configure:11249: checking if alternative line-edit bindings should be used" >&5 +echo "configure:11214: 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 @@ -11269,7 +11234,7 @@ EOF echo $ac_n "checking if you want to use extended HTML DTD logic""... $ac_c" 1>&6 -echo "configure:11273: checking if you want to use extended HTML DTD logic" >&5 +echo "configure:11238: 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 @@ -11293,7 +11258,7 @@ EOF echo $ac_n "checking if partial-display should be used""... $ac_c" 1>&6 -echo "configure:11297: checking if partial-display should be used" >&5 +echo "configure:11262: checking if partial-display should be used" >&5 # Check whether --enable-partial or --disable-partial was given. if test "${enable_partial+set}" = set; then @@ -11317,7 +11282,7 @@ EOF echo $ac_n "checking if you want to use external commands""... $ac_c" 1>&6 -echo "configure:11321: checking if you want to use external commands" >&5 +echo "configure:11286: 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 @@ -11341,7 +11306,7 @@ EOF echo $ac_n "checking if you want to use setfont support""... $ac_c" 1>&6 -echo "configure:11345: checking if you want to use setfont support" >&5 +echo "configure:11310: 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 @@ -11365,7 +11330,7 @@ EOF echo $ac_n "checking if you want cgi-link support""... $ac_c" 1>&6 -echo "configure:11369: checking if you want cgi-link support" >&5 +echo "configure:11334: 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 @@ -11384,7 +11349,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you want change-exec support""... $ac_c" 1>&6 -echo "configure:11388: checking if you want change-exec support" >&5 +echo "configure:11353: 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 @@ -11408,7 +11373,7 @@ EOF echo $ac_n "checking if you want exec-links support""... $ac_c" 1>&6 -echo "configure:11412: checking if you want exec-links support" >&5 +echo "configure:11377: 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 @@ -11432,7 +11397,7 @@ EOF echo $ac_n "checking if you want exec-scripts support""... $ac_c" 1>&6 -echo "configure:11436: checking if you want exec-scripts support" >&5 +echo "configure:11401: 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 @@ -11456,7 +11421,7 @@ EOF echo $ac_n "checking if you want internal-links feature""... $ac_c" 1>&6 -echo "configure:11460: checking if you want internal-links feature" >&5 +echo "configure:11425: 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 @@ -11480,7 +11445,7 @@ EOF echo $ac_n "checking if you want to fork NSL requests""... $ac_c" 1>&6 -echo "configure:11484: checking if you want to fork NSL requests" >&5 +echo "configure:11449: 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 @@ -11504,7 +11469,7 @@ EOF echo $ac_n "checking if you want to log URL requests via syslog""... $ac_c" 1>&6 -echo "configure:11508: checking if you want to log URL requests via syslog" >&5 +echo "configure:11473: 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 @@ -11528,7 +11493,7 @@ EOF echo $ac_n "checking if persistent-cookie logic should be used""... $ac_c" 1>&6 -echo "configure:11532: checking if persistent-cookie logic should be used" >&5 +echo "configure:11497: 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 @@ -11552,7 +11517,7 @@ EOF echo $ac_n "checking if you want to underline links""... $ac_c" 1>&6 -echo "configure:11556: checking if you want to underline links" >&5 +echo "configure:11521: checking if you want to underline links" >&5 # Check whether --enable-underlines or --disable-underlines was given. if test "${enable_underlines+set}" = set; then @@ -11576,7 +11541,7 @@ EOF echo $ac_n "checking if help files should be gzip'ed""... $ac_c" 1>&6 -echo "configure:11580: checking if help files should be gzip'ed" >&5 +echo "configure:11545: 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 @@ -11605,7 +11570,7 @@ fi echo $ac_n "checking if you want to use zlib for decompression of some gzip files""... $ac_c" 1>&6 -echo "configure:11609: checking if you want to use zlib for decompression of some gzip files" >&5 +echo "configure:11574: 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 @@ -11622,12 +11587,12 @@ if test ".$use_zlib" != ".no" ; then cf_cv_have_lib_z=no cf_libdir="" echo $ac_n "checking for gzopen""... $ac_c" 1>&6 -echo "configure:11626: checking for gzopen" >&5 +echo "configure:11591: 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 11631 "configure" +#line 11596 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gzopen(); below. */ @@ -11650,7 +11615,7 @@ gzopen(); ; return 0; } EOF -if { (eval echo configure:11654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11619: \"$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 @@ -11670,17 +11635,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6 -echo "configure:11674: checking for gzopen in -lz" >&5 +echo "configure:11639: checking for gzopen in -lz" >&5 LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 11677 "configure" +#line 11642 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:11684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_z=yes @@ -11708,17 +11673,17 @@ test "$prefix" != /opt && cf_search="$cf_search /opt/lib /opt/lib/z" for cf_libdir in $cf_search do echo $ac_n "checking for -lz in $cf_libdir""... $ac_c" 1>&6 -echo "configure:11712: checking for -lz in $cf_libdir" >&5 +echo "configure:11677: checking for -lz in $cf_libdir" >&5 LIBS="-L$cf_libdir -lz $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 11715 "configure" +#line 11680 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:11722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_z=yes @@ -11754,7 +11719,7 @@ EOF fi echo $ac_n "checking if you want to exclude FINGER code""... $ac_c" 1>&6 -echo "configure:11758: checking if you want to exclude FINGER code" >&5 +echo "configure:11723: 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 @@ -11778,7 +11743,7 @@ EOF echo $ac_n "checking if you want to exclude GOPHER code""... $ac_c" 1>&6 -echo "configure:11782: checking if you want to exclude GOPHER code" >&5 +echo "configure:11747: 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 @@ -11802,7 +11767,7 @@ EOF echo $ac_n "checking if you want to exclude NEWS code""... $ac_c" 1>&6 -echo "configure:11806: checking if you want to exclude NEWS code" >&5 +echo "configure:11771: 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 @@ -11826,7 +11791,7 @@ EOF echo $ac_n "checking if you want to exclude FTP code""... $ac_c" 1>&6 -echo "configure:11830: checking if you want to exclude FTP code" >&5 +echo "configure:11795: 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 @@ -11855,7 +11820,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:11859: checking if directory-editor code should be used" >&5 +echo "configure:11824: 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 @@ -11881,7 +11846,7 @@ EOF echo $ac_n "checking if you wish to allow extracting from archives via DirEd""... $ac_c" 1>&6 -echo "configure:11885: checking if you wish to allow extracting from archives via DirEd" >&5 +echo "configure:11850: 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 @@ -11900,7 +11865,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if DirEd mode should override keys""... $ac_c" 1>&6 -echo "configure:11904: checking if DirEd mode should override keys" >&5 +echo "configure:11869: 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 @@ -11926,7 +11891,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:11930: checking if you wish to allow permissions commands via DirEd" >&5 +echo "configure:11895: 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 @@ -11952,7 +11917,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:11956: checking if you wish to allow executable-permission commands via DirEd" >&5 +echo "configure:11921: 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 @@ -11971,7 +11936,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:11975: checking if you wish to allow "tar" commands from DirEd" >&5 +echo "configure:11940: 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 @@ -11997,7 +11962,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:12001: checking if you wish to allow "uudecode" commands from DirEd" >&5 +echo "configure:11966: 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 @@ -12023,7 +11988,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:12027: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5 +echo "configure:11992: 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 @@ -12049,7 +12014,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:12053: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5 +echo "configure:12018: 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 @@ -12076,7 +12041,7 @@ fi fi echo $ac_n "checking if you want long-directory listings""... $ac_c" 1>&6 -echo "configure:12080: checking if you want long-directory listings" >&5 +echo "configure:12045: 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 @@ -12102,7 +12067,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if parent-directory references are permitted""... $ac_c" 1>&6 -echo "configure:12106: checking if parent-directory references are permitted" >&5 +echo "configure:12071: 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 @@ -12122,7 +12087,7 @@ echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if we can include termio.h with curses""... $ac_c" 1>&6 -echo "configure:12126: checking if we can include termio.h with curses" >&5 +echo "configure:12091: 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 @@ -12131,7 +12096,7 @@ else CFLAGS="$CFLAGS -DHAVE_CONFIG_H -I. -I${srcdir-.} -I${srcdir-.}/src -I${srcdir-.}/WWW/Library/Implementation" touch lynx_cfg.h cat > conftest.$ac_ext <<EOF -#line 12135 "configure" +#line 12100 "configure" #include "confdefs.h" #include <LYCurses.h> @@ -12140,7 +12105,7 @@ int main() { putchar(0x0a) ; return 0; } EOF -if { (eval echo configure:12144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_termio_and_curses=yes else diff --git a/configure.in b/configure.in index 5ea0eb05..3cf2efac 100644 --- a/configure.in +++ b/configure.in @@ -639,18 +639,6 @@ CF_ARG_ENABLE(cjk, AC_MSG_RESULT($use_cjk) test $use_cjk != no && AC_DEFINE(CJK_EX) -AC_MSG_CHECKING(if experimental KANJI logic should be used) -CF_ARG_ENABLE(kanji, -[ --enable-cjk use experimental KANJI logic], - [use_kanji=$enableval], - [use_kanji=no]) -AC_MSG_RESULT($use_kanji) -if test $use_kanji != no ; then - AC_DEFINE(KANJI_CODE_OVERRIDE) - AC_DEFINE(CONV_JISX0201KANA_JISX0208KANA) - AC_DEFINE(USE_TH_JP_AUTO_DETECT) -fi - AC_MSG_CHECKING(if color-style code should be used) CF_ARG_ENABLE(color-style, [ --enable-color-style use optional/experimental color style], diff --git a/lynx.cfg b/lynx.cfg index a0c66519..7cee0b77 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -2162,6 +2162,8 @@ MINIMAL_COMMENTS:TRUE #KEYMAP:0x101:NEXT_LINK # Move to the next link or page #KEYMAP:0x10F:FASTBACKW_LINK # Back Tab - Move to previous link or text area #KEYMAP:^I:FASTFORW_LINK # Tab key - Move always to next link or text area +#KEYMAP:^:FIRST_LINK # Move to the first link on line +#KEYMAP:$:LAST_LINK # Move to the last link on line #KEYMAP:<:UP_LINK # Move to the link above #KEYMAP:>:DOWN_LINK # Move to the link below #KEYMAP:0x7F:HISTORY # Show the history list @@ -2894,3 +2896,15 @@ MINIMAL_COMMENTS:TRUE # If set to TRUE, the confirmation prompt is always issued. # #LEFTARROW_IN_TEXTFIELD_PROMPT:FALSE + +.h1 Internal Behavior + +.h2 CONNECT_TIMEOUT +# Specifies (in seconds) connect timeout. Not available under DOS (use +# sockdelay parameter of wattcp). Default value is rather huge. +#CONNECT_TIMEOUT:18000 + +.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 diff --git a/lynx.hlp b/lynx.hlp index bbbc54c3..9fdaeff3 100644 --- a/lynx.hlp +++ b/lynx.hlp @@ -1,15 +1,15 @@ 1 LYNX -2 Name +2 NAME lynx - a general purpose distributed information browser for the World Wide Web -2 Synopsis +2 SYNOPSIS lynx [options] [path or URL] use "lynx -help" to display a complete list of current options. -2 Description +2 DESCRIPTION Lynx is a fully-featured World Wide Web (WWW) client for users running cursor-addressable, character-cell display devices (e.g., vt100 terminals, vt100 emulators running on @@ -28,7 +28,7 @@ addition, Lynx can be used to build systems isolated within a single LAN. -2 Options +2 OPTIONS At start up, Lynx will load any local file or remote URL specified at the command line. For help with URLs, press "?" or "H" while running Lynx. Then follow the link @@ -126,6 +126,11 @@ -cookie_file=FILENAME specifies a file to use to store cookies. + -connect_timeout=N + Sets the connection timeout, where N is given in + seconds. This is not available under DOS (use the + sockdelay parameter of WATTCP under DOS). + -core toggles forced core dumps on fatal errors. -crawl with -traversal, output each page to a file. with @@ -184,7 +189,8 @@ toggles forcing of the secure flag for SSL cookies. -forms_options - toggles whether the Options Menu is key-based or form-based. + toggles whether the Options Menu is key-based or + form-based. -from toggles transmissions of From headers. @@ -202,18 +208,18 @@ control the display of hidden links. merge hidden links show up as bracketed numbers and - are numbered together with other links in the + are numbered together with other links in the sequence of their occurrence in the document. - listonly hidden links are shown only on L)ist + listonly hidden links are shown only on L)ist screens and listings generated by -dump or from the - P)rint menu, but appear separately at the end of + P)rint menu, but appear separately at the end of those lists. This is the default behavior. ignore hidden links do not appear even in listings. -historical - toggles use of '>' or '-->' as a terminator for + toggles use of '>' or '-->' as a terminator for comments. -homepage=URL @@ -225,7 +231,7 @@ -index=URL set the default index file to the specified URL. - -ismap toggles inclusion of ISMAP links when client-side + -ismap toggles inclusion of ISMAP links when client-side MAPs are present. -justify @@ -239,12 +245,12 @@ disable URLs that point to remote hosts. -locexec - enable local program execution from local files - only (if Lynx was compiled with local execution + enable local program execution from local files + only (if Lynx was compiled with local execution enabled). -mime_header - prints the MIME header of a fetched document along + prints the MIME header of a fetched document along with its source. -minimal @@ -254,7 +260,7 @@ number of articles in chunked news listings. -newsmaxchunk=NUMBER - maximum news articles in listings before chunking. + maximum news articles in listings before chunking. -nobold disable bold video-attribute. @@ -262,20 +268,20 @@ -nobrowse disable directory browsing. - -nocc disable Cc: prompts for self copies of mailings. - Note that this does not disable any CCs which are + -nocc disable Cc: prompts for self copies of mailings. + Note that this does not disable any CCs which are incorporated within a mailto URL or form ACTION. -nocolor force color mode off, overriding terminal - capabilities and any -color flags, COLORTERM + capabilities and any -color flags, COLORTERM variable, and saved .lynxrc settings. -noexec disable local program execution. (DEFAULT) -nofilereferer - disable transmissions of Referer headers for file + disable transmissions of Referer headers for file URLs. -nolist @@ -285,10 +291,10 @@ owners. -nonrestarting_sigwinch - This flag is not available on all systems, Lynx - needs to be compiled with HAVE_SIGACTION defined. - If available, this flag may cause Lynx to react - more immediately to window changes when run within + This flag is not available on all systems, Lynx + needs to be compiled with HAVE_SIGACTION defined. + If available, this flag may cause Lynx to react + more immediately to window changes when run within an xterm. -nopause @@ -317,7 +323,8 @@ disable underline video-attribute. -number_fields - force numbering of links as well as form input + force numbering of links as well as form input + fields -number_links @@ -331,23 +338,23 @@ with partial-display logic -pauth=ID:PASSWD - set authorization ID and password for a protected - proxy server at startup. Be sure to protect any + set authorization ID and password for a protected + proxy server at startup. Be sure to protect any script files which use this switch. - -popup toggles handling of single-choice SELECT options + -popup toggles handling of single-choice SELECT options via popup windows or as lists of radio buttons. -post_data - send form data from stdin using POST method and + send form data from stdin using POST method and dump results. -preparsed - show HTML source preparsed and reformatted when + show HTML source preparsed and reformatted when used with -source or in source view. -prettysrc - show HTML source view with lexical elements and + show HTML source view with lexical elements and tags in color. -print enable print functions. (default) @@ -355,8 +362,8 @@ -pseudo_inlines toggles pseudo-ALTs for inlines with no ALT string. - -raw toggles default setting of 8-bit character - translations or CJK mode for the startup character + -raw toggles default setting of 8-bit character + translations or CJK mode for the startup character set. -realm restricts access to URLs in the starting realm. @@ -366,32 +373,31 @@ document affected). -restrictions=[option][,option][,option]... - allows a list of services to be disabled + allows a list of services to be disabled selectively. Dashes and underscores in option names can be intermixed. The following list is printed if no options are specified. all - restricts all options listed below. - - bookmark - disallow changing the location of the + bookmark - disallow changing the location of the bookmark file. - bookmark_exec - disallow execution links via the + bookmark_exec - disallow execution links via the bookmark file. - change_exec_perms - disallow changing the eXecute - permission on files (but still allow it for + change_exec_perms - disallow changing the eXecute + permission on files (but still allow it for directories) when local file management is enabled. - default - same as command line option -anonymous. + default - same as command line option -anonymous. Disables default services for anonymous users. Set - to all restricted, except for: inside_telnet, - outside_telnet, inside_ftp, outside_ftp, + to all restricted, except for: inside_telnet, + outside_telnet, inside_ftp, outside_ftp, inside_rlogin, outside_rlogin, inside_news, outside_news, telnet_port, jump, mail, print, exec, - and goto. The settings for these, as well as - additional goto restrictions for specific URL - schemes that are also applied, are derived from + and goto. The settings for these, as well as + additional goto restrictions for specific URL + schemes that are also applied, are derived from definitions within userdefs.h. dired_support - disallow local file management. @@ -399,43 +405,44 @@ disk_save - disallow saving to disk in the download and print menus. - dotfiles - disallow access to, or creation of, + dotfiles - disallow access to, or creation of, hidden (dot) files. - download - disallow some downloaders in the - download menu (does not imply disk_save + download - disallow some downloaders in the + download menu (does not imply disk_save restriction). editor - disallow external editing. exec - disable execution scripts. - exec_frozen - disallow the user from changing the + exec_frozen - disallow the user from changing the local execution option. - externals - disallow some "EXTERNAL" configuration - lines if support for passing URLs to external - applications (with the EXTERN command) is compiled + externals - disallow some "EXTERNAL" configuration + lines if support for passing URLs to external + applications (with the EXTERN command) is compiled in. - file_url - disallow using G)oto, served links or + file_url - disallow using G)oto, served links or bookmarks for file: URLs. goto - disable the 'g' (goto) command. - inside_ftp - disallow ftps for people coming from + inside_ftp - disallow ftps for people coming from inside your domain (utmp required for selectivity). - inside_news - disallow USENET news posting for - people coming from inside your domain (utmp + inside_news - disallow USENET news posting for + + people coming from inside your domain (utmp required for selectivity). - inside_rlogin - disallow rlogins for people coming - from inside your domain (utmp required for + inside_rlogin - disallow rlogins for people coming + from inside your domain (utmp required for selectivity). - inside_telnet - disallow telnets for people coming - from inside your domain (utmp required for + inside_telnet - disallow telnets for people coming + from inside your domain (utmp required for selectivity). jump - disable the 'j' (jump) command. @@ -446,45 +453,45 @@ news_post - disallow USENET News posting. - options_save - disallow saving options in .lynxrc. + options_save - disallow saving options in .lynxrc. - outside_ftp - disallow ftps for people coming from - outside your domain (utmp required for + outside_ftp - disallow ftps for people coming from + outside your domain (utmp required for selectivity). - outside_news - disallow USENET news reading and - posting for people coming from outside your domain - (utmp required for selectivity). This restriction - applies to "news", "nntp", "newspost", and - "newsreply" URLs, but not to "snews", "snewspost", + outside_news - disallow USENET news reading and + posting for people coming from outside your domain + (utmp required for selectivity). This restriction + applies to "news", "nntp", "newspost", and + "newsreply" URLs, but not to "snews", "snewspost", or "snewsreply" in case they are supported. outside_rlogin - disallow rlogins for people coming - from outside your domain (utmp required for + from outside your domain (utmp required for selectivity). outside_telnet - disallow telnets for people coming - from outside your domain (utmp required for + from outside your domain (utmp required for selectivity). print - disallow most print options. - shell - disallow shell escapes and lynxexec or + shell - disallow shell escapes and lynxexec or lynxprog G)oto's. - suspend - disallow Unix Control-Z suspends with + suspend - disallow Unix Control-Z suspends with escape to shell. - telnet_port - disallow specifying a port in telnet + telnet_port - disallow specifying a port in telnet G)oto's. - useragent - disallow modifications of the User- + useragent - disallow modifications of the User- Agent header. -resubmit_posts - toggles forced resubmissions (no-cache) of forms - with method POST when the documents they returned - are sought with the PREV_DOC command or from the + toggles forced resubmissions (no-cache) of forms + with method POST when the documents they returned + are sought with the PREV_DOC command or from the History List. -rlogin @@ -494,51 +501,56 @@ require .www_browsable files to browse directories. -short_url - show very long URLs in the status line with "___" + show very long URLs in the status line with "___" to represent the portion which cannot be displayed. - The beginning and end of the URL are displayed, + The beginning and end of the URL are displayed, rather than suppressing the end. -show_cursor - If enabled the cursor will not be hidden in the + If enabled the cursor will not be hidden in the right hand corner but will instead be positioned at - the start of the currently selected link. Show - cursor is the default for systems without + the start of the currently selected link. Show + cursor is the default for systems without FANCY_CURSES capabilities. The default configuration can be changed in userdefs.h or - lynx.cfg. The command line switch toggles the + lynx.cfg. The command line switch toggles the default. -soft_dquotes - toggles emulation of the old Netscape and Mosaic + toggles emulation of the old Netscape and Mosaic bug which treated '>' as a co-terminator for double-quotes and tags. -source - works the same as dump but outputs HTML source + works the same as dump but outputs HTML source instead of formatted text. -stack_dump disable SIGINT cleanup handler -startfile_ok - allow non-http startfile and homepage with + allow non-http startfile and homepage with -validate. -tagsoup - initialize parser, using Tag Soup DTD rather than + initialize parser, using Tag Soup DTD rather than SortaSGML. -telnet disable recognition of telnet commands. -term=TERM - tell Lynx what terminal type to assume it is - talking to. (This may be useful for remote - execution, when, for example, Lynx connects to a - remote TCP/IP port that starts a script that, in + tell Lynx what terminal type to assume it is + talking to. (This may be useful for remote + + execution, when, for example, Lynx connects to a + remote TCP/IP port that starts a script that, in turn, starts another Lynx process.) + -timeout=N + For win32, sets the network read-timeout, where N + is given in seconds. + -tlog toggles between using a Lynx Trace Log and stderr for trace output from the session. @@ -600,7 +612,7 @@ emit backspaces in output if -dumping or -crawling (like 'man' does) -2 Commands +2 COMMANDS o Use Up arrow and Down arrow to scroll through hypertext links. o Right arrow or Return will follow a highlighted @@ -611,7 +623,7 @@ o Type "K" for a complete list of the current key-stroke command mappings. -2 Environment +2 ENVIRONMENT In addition to various "standard" environment variables such as HOME, PATH, USER, DISPLAY, TMPDIR, etc, Lynx utilizes several Lynx-specific environment variables, if @@ -650,7 +662,6 @@ LYNX_LSS This variable, if set, specifies the location of the default Lynx character style sheet file. [Currently only - meaningful if Lynx was built using experimental color style support.] @@ -658,7 +669,7 @@ the default path prefix for files saved to disk that is defined in the lynx.cfg SAVE_SPACE: statement. See - the lynx.cfg file for more + the lynx.cfg file for more information. LYNX_TEMP_SPACE This variable, if set, will override @@ -703,9 +714,8 @@ by setting environment variables of the form PROTOCOL_proxy (literally: http_proxy, ftp_proxy, gopher_proxy, - etc), to + etc), to "http://some.server.dom:port/". See - Lynx Users Guide for additional details and examples. @@ -748,6 +758,7 @@ statement. If the field does not exist for the document, the variable is set to a null string under UNIX, or + "No LastMod" under VMS. LYNX_PRINT_TITLE This variable is set by the Lynx @@ -760,7 +771,6 @@ statement. If the field does not exist for the document, the variable is set to a null string under UNIX, or - "No Title" under VMS. LYNX_PRINT_URL This variable is set by the Lynx @@ -795,7 +805,7 @@ the LINES and/or COLUMNS environment variables may also be changed. -2 Simulated Cgi Support +2 SIMULATED CGI SUPPORT If built with the cgi-links option enabled, Lynx allows access to a cgi script directly without the need for an http daemon. @@ -841,7 +851,7 @@ should be consulted for general information on CGI script programming. -2 Native Language Support +2 NATIVE LANGUAGE SUPPORT If configured and installed with Native Language Support, Lynx will display status and other messages in your local language. See the file ABOUT_NLS in the source @@ -880,7 +890,7 @@ NLSPATH This variable, if set, is used as the path prefix for message catalogs. -2 Notes +2 NOTES This is the Lynx v2.8.2 Release If you wish to contribute to the further development of @@ -896,7 +906,7 @@ your message. Do not send the unsubscribe message to the lynx-dev list, itself. -2 See Also +2 SEE ALSO catgets(3), curses(3), environ(7), execve(2), ftp(1), gettext(GNU), localeconv(3), ncurses(3), setlocale(3), slang(?), termcap(5), terminfo(5), wget(GNU) @@ -910,12 +920,12 @@ page (i.e., try "info subject", rather than "man subject"). A section shown as (?) denotes that documentation on the - topic exists, but is not part of an established documentation - retrieval system (see the distribution files associated + topic exists, but is not part of an established documenta + tion retrieval system (see the distribution files associated with the topic, or contact your System Administrator for further information). -2 Acknowledgments +2 ACKNOWLEDGMENTS Lynx has incorporated code from a variety of sources along the way. The earliest versions of Lynx included code from Earl Fogel of Computing Services at the University of @@ -936,7 +946,7 @@ ports) or indirectly (through inspiration and development of other systems). -2 Authors +2 AUTHORS Lou Montulli, Garrett Blythe, Craig Lavender, Michael Grobe, Charles Rezac Academic Computing Services diff --git a/lynx.man b/lynx.man index 2a955dc1..aba20aaf 100644 --- a/lynx.man +++ b/lynx.man @@ -144,6 +144,11 @@ toggles handling of Set-Cookie headers. .B -cookie_file\fR=\fIFILENAME specifies a file to use to store cookies. .TP +.B -connect_timeout\fR=\fIN +Sets the connection timeout, where N is given in seconds. +This is not available under DOS (use the sockdelay +parameter of WATTCP under DOS). +.TP .B -core toggles forced core dumps on fatal errors. .TP @@ -570,6 +575,9 @@ tell Lynx what terminal type to assume it is talking to. Lynx connects to a remote TCP/IP port that starts a script that, in turn, starts another Lynx process.) .TP +.B -timeout\fR=\fIN +For win32, sets the network read-timeout, where N is given in seconds. +.TP .B -tlog toggles between using a Lynx Trace Log and stderr for trace output from the session. diff --git a/lynx_help/keystrokes/keystroke_help.html b/lynx_help/keystrokes/keystroke_help.html index db9861d0..3ce78b0d 100644 --- a/lynx_help/keystrokes/keystroke_help.html +++ b/lynx_help/keystrokes/keystroke_help.html @@ -27,6 +27,10 @@ CTRL-P - Go back two lines in the current document ) - Go forward half a page in the current document ( - Go back half a page in the current document + ^ - Go to the first link on the current line + $ - Go to the last link on the current line + < - Go to the previous link in the current column + > - Go to the next link in the current column # - Go to Toolbar or Banner in the current document <A HREF="dired_help.html">DIRED</A>: c - Create a new file diff --git a/lynx_help/keystrokes/scrolling_help.html b/lynx_help/keystrokes/scrolling_help.html index 8a42dda4..ad129448 100644 --- a/lynx_help/keystrokes/scrolling_help.html +++ b/lynx_help/keystrokes/scrolling_help.html @@ -49,6 +49,14 @@ ( - Moves you back half a page in the current document (Up-Half). + ^ - Go to the first link on the current line. + + $ - Go to the last link on the current line. + + < - Go to the previous link in the current column. + + > - Go to the next link in the current column. + # - Jumps you to the pseudo Toolbar or Banner if present in the current document. Use left-arrow to return from there to your previous position diff --git a/po/lynx.pot b/po/lynx.pot index 7156005d..8ba89d8d 100644 --- a/po/lynx.pot +++ b/po/lynx.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-12-14 22:05-0500\n" +"POT-Creation-Date: 2000-02-24 22:36-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" @@ -2249,14 +2249,14 @@ msgid "" msgstr "" #. #define ENTER_PERIOD_WHEN_DONE_A -#: LYMessages.c:712 src/LYNews.c:388 +#: LYMessages.c:712 src/LYNews.c:397 msgid "" "\n" " When you are done, press enter and put a single period (.)" msgstr "" #. #define ENTER_PERIOD_WHEN_DONE_B -#: LYMessages.c:714 src/LYNews.c:389 +#: LYMessages.c:714 src/LYNews.c:398 msgid "" "\n" " on a line and press enter again." @@ -2789,58 +2789,58 @@ msgstr "" msgid "External support is currently disabled." msgstr "" -#: WWW/Library/Implementation/HTAABrow.c:647 +#: WWW/Library/Implementation/HTAABrow.c:648 #, c-format msgid "Username for '%s' at %s '%s%s':" msgstr "" -#: WWW/Library/Implementation/HTAABrow.c:914 +#: WWW/Library/Implementation/HTAABrow.c:915 msgid "" "This client doesn't know how to compose proxy authorization information for " "scheme" msgstr "" -#: WWW/Library/Implementation/HTAABrow.c:989 +#: WWW/Library/Implementation/HTAABrow.c:990 msgid "" "This client doesn't know how to compose authorization information for scheme" msgstr "" -#: WWW/Library/Implementation/HTAABrow.c:1097 +#: WWW/Library/Implementation/HTAABrow.c:1098 #, c-format msgid "Invalid header '%s%s%s%s%s'" msgstr "" -#: WWW/Library/Implementation/HTAABrow.c:1201 +#: WWW/Library/Implementation/HTAABrow.c:1202 msgid "Proxy authorization required -- retrying" msgstr "" -#: WWW/Library/Implementation/HTAABrow.c:1260 +#: WWW/Library/Implementation/HTAABrow.c:1261 msgid "Access without authorization denied -- retrying" msgstr "" -#: WWW/Library/Implementation/HTAccess.c:687 +#: WWW/Library/Implementation/HTAccess.c:688 msgid "Access forbidden by rule" msgstr "" -#: WWW/Library/Implementation/HTAccess.c:789 +#: WWW/Library/Implementation/HTAccess.c:790 msgid "Document with POST content not found in cache. Resubmit?" msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1030 src/GridText.c:8122 +#: WWW/Library/Implementation/HTAccess.c:1031 src/GridText.c:8348 msgid "Loading incomplete." msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1060 +#: WWW/Library/Implementation/HTAccess.c:1061 msgid "" "**** HTAccess: socket or file number returned by obsolete load routine!\n" msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1062 +#: WWW/Library/Implementation/HTAccess.c:1063 msgid "" "**** HTAccess: Internal software error. Please mail lynx-dev@sig.net!\n" msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1063 +#: WWW/Library/Implementation/HTAccess.c:1064 #, c-format msgid "**** HTAccess: Status returned was: %d\n" msgstr "" @@ -2849,28 +2849,28 @@ msgstr "" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1069 src/LYMainLoop.c:7490 +#: WWW/Library/Implementation/HTAccess.c:1070 src/LYMainLoop.c:7565 msgid "Can't Access" msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1077 +#: WWW/Library/Implementation/HTAccess.c:1078 msgid "Unable to access document." msgstr "" -#: WWW/Library/Implementation/HTFTP.c:785 +#: WWW/Library/Implementation/HTFTP.c:767 #, c-format msgid "Enter password for user %s@%s:" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:813 +#: WWW/Library/Implementation/HTFTP.c:795 msgid "Unable to connect to FTP host." msgstr "" -#: WWW/Library/Implementation/HTFTP.c:1073 +#: WWW/Library/Implementation/HTFTP.c:1053 msgid "close master socket" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:1113 +#: WWW/Library/Implementation/HTFTP.c:1093 msgid "socket for master socket" msgstr "" @@ -2879,34 +2879,34 @@ msgstr "" #. ** knowing if it is symbolic? I think so since #. ** it might be a directory. #. -#: WWW/Library/Implementation/HTFTP.c:1562 -#: WWW/Library/Implementation/HTFTP.c:2193 +#: WWW/Library/Implementation/HTFTP.c:1542 +#: WWW/Library/Implementation/HTFTP.c:2173 msgid "Symbolic Link" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:2546 +#: WWW/Library/Implementation/HTFTP.c:2534 msgid "Receiving FTP directory." msgstr "" -#: WWW/Library/Implementation/HTFTP.c:2682 +#: WWW/Library/Implementation/HTFTP.c:2677 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:2953 +#: WWW/Library/Implementation/HTFTP.c:2939 msgid "connect for data" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:3556 +#: WWW/Library/Implementation/HTFTP.c:3537 msgid "Receiving FTP file." msgstr "" #. lines counter -#: WWW/Library/Implementation/HTFile.c:1709 +#: WWW/Library/Implementation/HTFile.c:1708 msgid "Reading directory..." msgstr "" -#: WWW/Library/Implementation/HTFile.c:1791 +#: WWW/Library/Implementation/HTFile.c:1790 msgid "OK" msgstr "" @@ -2930,44 +2930,44 @@ msgstr "" msgid "No response from finger server." msgstr "" -#: WWW/Library/Implementation/HTGopher.c:1727 +#: WWW/Library/Implementation/HTGopher.c:1729 msgid "Unable to access document!" msgstr "" -#: WWW/Library/Implementation/HTNews.c:366 +#: WWW/Library/Implementation/HTNews.c:364 #, c-format msgid "Username for news host '%s':" msgstr "" -#: WWW/Library/Implementation/HTNews.c:420 +#: WWW/Library/Implementation/HTNews.c:418 msgid "Change username?" msgstr "" -#: WWW/Library/Implementation/HTNews.c:424 +#: WWW/Library/Implementation/HTNews.c:422 msgid "Username:" msgstr "" -#: WWW/Library/Implementation/HTNews.c:451 +#: WWW/Library/Implementation/HTNews.c:449 #, c-format msgid "Password for news host '%s':" msgstr "" -#: WWW/Library/Implementation/HTNews.c:535 +#: WWW/Library/Implementation/HTNews.c:533 msgid "Change password?" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1704 +#: WWW/Library/Implementation/HTNews.c:1702 #, c-format msgid "No matches for: %s" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1756 +#: WWW/Library/Implementation/HTNews.c:1754 msgid "" "\n" "No articles in this group.\n" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1769 +#: WWW/Library/Implementation/HTNews.c:1767 msgid "" "\n" "No articles in this range.\n" @@ -2976,16 +2976,16 @@ msgstr "" #. #. ** Set window title. #. -#: WWW/Library/Implementation/HTNews.c:1782 +#: WWW/Library/Implementation/HTNews.c:1780 #, c-format msgid "%s, Articles %d-%d" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1804 +#: WWW/Library/Implementation/HTNews.c:1802 msgid "Earlier articles" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1817 +#: WWW/Library/Implementation/HTNews.c:1815 #, c-format msgid "" "\n" @@ -2993,41 +2993,41 @@ msgid "" "\n" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1877 +#: WWW/Library/Implementation/HTNews.c:1875 msgid "All available articles in " msgstr "" -#: WWW/Library/Implementation/HTNews.c:2093 +#: WWW/Library/Implementation/HTNews.c:2091 msgid "Later articles" msgstr "" -#: WWW/Library/Implementation/HTNews.c:2117 +#: WWW/Library/Implementation/HTNews.c:2115 msgid "Post to " msgstr "" -#: WWW/Library/Implementation/HTNews.c:2297 +#: WWW/Library/Implementation/HTNews.c:2295 msgid "This client does not contain support for SNEWS URLs." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2504 +#: WWW/Library/Implementation/HTNews.c:2502 msgid "No target for raw text!" msgstr "" -#: WWW/Library/Implementation/HTNews.c:2534 +#: WWW/Library/Implementation/HTNews.c:2532 msgid "Connecting to NewsHost ..." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2568 +#: WWW/Library/Implementation/HTNews.c:2566 #, c-format msgid "Could not access %s." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2620 +#: WWW/Library/Implementation/HTNews.c:2618 #, c-format msgid "Can't read news info. News host %.20s responded: %.200s" msgstr "" -#: WWW/Library/Implementation/HTNews.c:2624 +#: WWW/Library/Implementation/HTNews.c:2622 #, c-format msgid "Can't read news info, empty response from host %s" msgstr "" @@ -3035,22 +3035,22 @@ msgstr "" #. #. ** List available newsgroups. - FM #. -#: WWW/Library/Implementation/HTNews.c:2828 +#: WWW/Library/Implementation/HTNews.c:2826 msgid "Reading list of available newsgroups." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2850 +#: WWW/Library/Implementation/HTNews.c:2848 msgid "Reading list of articles in newsgroup." msgstr "" #. #. ** Get an article from a news group. - FM #. -#: WWW/Library/Implementation/HTNews.c:2856 +#: WWW/Library/Implementation/HTNews.c:2854 msgid "Reading news article." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2886 +#: WWW/Library/Implementation/HTNews.c:2884 msgid "Sorry, could not load requested news." msgstr "" @@ -3096,14 +3096,14 @@ msgid "Could not make connection non-blocking." msgstr "" #: WWW/Library/Implementation/HTTCP.c:1602 -msgid "Connection failed for 180,000 tries." +msgid "Connection failed (too many retries)." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1774 +#: WWW/Library/Implementation/HTTCP.c:1775 msgid "Could not restore socket to blocking." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1836 +#: WWW/Library/Implementation/HTTCP.c:1837 msgid "Socket read failed for 180,000 tries." msgstr "" @@ -3201,139 +3201,139 @@ msgstr "" msgid "remote %s session:" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:164 +#: WWW/Library/Implementation/HTWAIS.c:165 msgid "Could not connect to WAIS server." msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:173 +#: WWW/Library/Implementation/HTWAIS.c:174 msgid "Could not open WAIS connection for reading." msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:197 +#: WWW/Library/Implementation/HTWAIS.c:198 msgid "Diagnostic code is " msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:469 +#: WWW/Library/Implementation/HTWAIS.c:470 msgid "Index " msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:473 +#: WWW/Library/Implementation/HTWAIS.c:474 #, c-format msgid " contains the following %d item%s relevant to \"" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:481 +#: WWW/Library/Implementation/HTWAIS.c:482 msgid "The first figure after each entry is its relative score, " msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:482 +#: WWW/Library/Implementation/HTWAIS.c:483 msgid "the second is the number of lines in the item." msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:523 +#: WWW/Library/Implementation/HTWAIS.c:524 msgid " (bad file name)" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:545 +#: WWW/Library/Implementation/HTWAIS.c:546 msgid "(bad doc id)" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:561 +#: WWW/Library/Implementation/HTWAIS.c:562 msgid "(Short Header record, can't display)" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:568 +#: WWW/Library/Implementation/HTWAIS.c:569 msgid "" "\n" "Long Header record, can't display\n" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:575 +#: WWW/Library/Implementation/HTWAIS.c:576 msgid "" "\n" "Text record\n" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:584 +#: WWW/Library/Implementation/HTWAIS.c:585 msgid "" "\n" "Headline record, can't display\n" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:592 +#: WWW/Library/Implementation/HTWAIS.c:593 msgid "" "\n" "Code record, can't display\n" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:696 +#: WWW/Library/Implementation/HTWAIS.c:697 msgid "Syntax error in WAIS URL" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:768 +#: WWW/Library/Implementation/HTWAIS.c:769 msgid " (WAIS Index)" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:775 +#: WWW/Library/Implementation/HTWAIS.c:776 msgid "WAIS Index: " msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:781 +#: WWW/Library/Implementation/HTWAIS.c:782 msgid "This is a link for searching the " msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:785 +#: WWW/Library/Implementation/HTWAIS.c:786 msgid " WAIS Index.\n" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:811 +#: WWW/Library/Implementation/HTWAIS.c:812 msgid "" "\n" "Enter the 's'earch command and then specify search words.\n" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:832 +#: WWW/Library/Implementation/HTWAIS.c:834 msgid " (in " msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:841 +#: WWW/Library/Implementation/HTWAIS.c:843 msgid "WAIS Search of \"" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:845 +#: WWW/Library/Implementation/HTWAIS.c:847 msgid "\" in: " msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:860 +#: WWW/Library/Implementation/HTWAIS.c:862 msgid "HTWAIS: Request too large." msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:869 +#: WWW/Library/Implementation/HTWAIS.c:871 msgid "Searching WAIS database..." msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:879 +#: WWW/Library/Implementation/HTWAIS.c:881 msgid "Search interrupted." msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:929 +#: WWW/Library/Implementation/HTWAIS.c:931 msgid "Can't convert format of WAIS document" msgstr "" -#: WWW/Library/Implementation/HTWAIS.c:973 +#: WWW/Library/Implementation/HTWAIS.c:975 msgid "HTWAIS: Request too long." msgstr "" #. #. ** Actually do the transaction given by request_message. #. -#: WWW/Library/Implementation/HTWAIS.c:987 +#: WWW/Library/Implementation/HTWAIS.c:989 msgid "Fetching WAIS document..." msgstr "" #. display_search_response(target, retrieval_response, #. wais_database, keywords); -#: WWW/Library/Implementation/HTWAIS.c:1026 +#: WWW/Library/Implementation/HTWAIS.c:1028 msgid "No text was returned!\n" msgstr "" @@ -3370,110 +3370,110 @@ msgstr "" msgid "Host" msgstr "" -#: src/GridText.c:612 +#: src/GridText.c:624 msgid "Memory exhausted, display interrupted!" msgstr "" -#: src/GridText.c:617 +#: src/GridText.c:629 msgid "Memory exhausted, will interrupt transfer!" msgstr "" -#: src/GridText.c:3469 +#: src/GridText.c:3521 msgid " *** MEMORY EXHAUSTED ***" msgstr "" -#: src/GridText.c:5748 src/GridText.c:5755 src/LYList.c:257 +#: src/GridText.c:5980 src/GridText.c:5987 src/LYList.c:257 msgid "unknown field or link" msgstr "" -#: src/GridText.c:5764 +#: src/GridText.c:5996 msgid "text entry field" msgstr "" -#: src/GridText.c:5767 +#: src/GridText.c:5999 msgid "password entry field" msgstr "" -#: src/GridText.c:5770 +#: src/GridText.c:6002 msgid "checkbox" msgstr "" -#: src/GridText.c:5773 +#: src/GridText.c:6005 msgid "radio button" msgstr "" -#: src/GridText.c:5776 +#: src/GridText.c:6008 msgid "submit button" msgstr "" -#: src/GridText.c:5779 +#: src/GridText.c:6011 msgid "reset button" msgstr "" -#: src/GridText.c:5782 +#: src/GridText.c:6014 msgid "popup menu" msgstr "" -#: src/GridText.c:5785 +#: src/GridText.c:6017 msgid "hidden form field" msgstr "" -#: src/GridText.c:5788 +#: src/GridText.c:6020 msgid "text entry area" msgstr "" -#: src/GridText.c:5791 +#: src/GridText.c:6023 msgid "range entry field" msgstr "" -#: src/GridText.c:5794 +#: src/GridText.c:6026 msgid "file entry field" msgstr "" -#: src/GridText.c:5797 +#: src/GridText.c:6029 msgid "text-submit field" msgstr "" -#: src/GridText.c:5800 +#: src/GridText.c:6032 msgid "image-submit button" msgstr "" -#: src/GridText.c:5803 +#: src/GridText.c:6035 msgid "keygen field" msgstr "" -#: src/GridText.c:5806 +#: src/GridText.c:6038 msgid "unknown form field" msgstr "" -#: src/GridText.c:10817 +#: src/GridText.c:11046 #, c-format msgid "Submitting %s" msgstr "" -#: src/GridText.c:12122 +#: src/GridText.c:12369 msgid "Editor killed by signal" msgstr "" -#: src/GridText.c:12124 +#: src/GridText.c:12371 #, c-format msgid "Editor returned with error status, %s" msgstr "" -#: src/GridText.c:12125 +#: src/GridText.c:12372 msgid "reason unknown." msgstr "" #. don't show previous state -#: src/GridText.c:12221 +#: src/GridText.c:12468 msgid "Wrap lines to fit displayed area?" msgstr "" -#: src/GridText.c:12273 +#: src/GridText.c:12520 msgid "Very long lines have been wrapped!" msgstr "" -#: src/GridText.c:12726 +#: src/GridText.c:12973 msgid "Very long lines have been truncated!" msgstr "" @@ -3578,15 +3578,15 @@ msgstr "" msgid "(unknown)" msgstr "" -#: src/HTML.c:7836 +#: src/HTML.c:7856 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "" -#: src/HTML.c:8414 +#: src/HTML.c:8434 msgid "Source cache error - disk full?" msgstr "" -#: src/HTML.c:8427 +#: src/HTML.c:8447 msgid "Source cache error - not enough memory!" msgstr "" @@ -3638,19 +3638,19 @@ msgstr "" msgid "Unable to access cgi script" msgstr "" -#: src/LYCgi.c:657 src/LYCgi.c:660 +#: src/LYCgi.c:655 src/LYCgi.c:658 msgid "Good Advice" msgstr "" -#: src/LYCgi.c:663 +#: src/LYCgi.c:661 msgid "An excellent http server for VMS is available via" msgstr "" -#: src/LYCgi.c:670 +#: src/LYCgi.c:668 msgid "this link" msgstr "" -#: src/LYCgi.c:674 +#: src/LYCgi.c:672 msgid "It provides state of the art CGI script support.\n" msgstr "" @@ -3679,38 +3679,38 @@ msgstr "" msgid "cookie_domain_flag_set error, aborting program" msgstr "" -#: src/LYCurses.c:771 +#: src/LYCurses.c:801 msgid "Terminal initialisation failed - unknown terminal type?" msgstr "" -#: src/LYCurses.c:1048 +#: src/LYCurses.c:1106 msgid "Terminal =" msgstr "" -#: src/LYCurses.c:1053 +#: src/LYCurses.c:1111 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "" -#: src/LYCurses.c:1131 +#: src/LYCurses.c:1189 msgid "Your Terminal type is unknown!" msgstr "" -#: src/LYCurses.c:1132 +#: src/LYCurses.c:1190 msgid "Enter a terminal type:" msgstr "" -#: src/LYCurses.c:1145 +#: src/LYCurses.c:1203 msgid "TERMINAL TYPE IS SET TO" msgstr "" -#: src/LYCurses.c:1444 +#: src/LYCurses.c:1509 #, c-format msgid "" "\n" "A Fatal error has occurred in %s Ver. %s\n" msgstr "" -#: src/LYCurses.c:1446 +#: src/LYCurses.c:1511 msgid "" "\n" "Please notify your system administrator to confirm a bug, and if\n" @@ -3720,63 +3720,63 @@ msgid "" "TRACEBACK if it can be captured, and any other relevant information.\n" msgstr "" -#: src/LYDownload.c:527 +#: src/LYDownload.c:526 msgid "Downloaded link:" msgstr "" -#: src/LYDownload.c:532 +#: src/LYDownload.c:531 msgid "Suggested file name:" msgstr "" -#: src/LYDownload.c:537 +#: src/LYDownload.c:536 msgid "Standard download options:" msgstr "" -#: src/LYDownload.c:538 +#: src/LYDownload.c:537 msgid "Download options:" msgstr "" -#: src/LYDownload.c:552 +#: src/LYDownload.c:551 msgid "Save to disk" msgstr "" -#: src/LYDownload.c:554 +#: src/LYDownload.c:553 msgid "Save to disk disabled." msgstr "" -#: src/LYDownload.c:558 src/LYPrint.c:1346 +#: src/LYDownload.c:557 src/LYPrint.c:1342 msgid "Local additions:" msgstr "" -#: src/LYDownload.c:567 src/LYUpload.c:229 +#: src/LYDownload.c:566 src/LYUpload.c:229 msgid "No Name Given" msgstr "" -#: src/LYHistory.c:514 +#: src/LYHistory.c:558 msgid "You selected:" msgstr "" -#: src/LYHistory.c:538 src/LYHistory.c:786 +#: src/LYHistory.c:582 src/LYHistory.c:830 msgid "(no address)" msgstr "" -#: src/LYHistory.c:542 +#: src/LYHistory.c:586 msgid " (internal)" msgstr "" -#: src/LYHistory.c:544 +#: src/LYHistory.c:588 msgid " (was internal)" msgstr "" -#: src/LYHistory.c:642 +#: src/LYHistory.c:686 msgid " (From History)" msgstr "" -#: src/LYHistory.c:706 +#: src/LYHistory.c:750 msgid "You visited (POSTs, bookmark, menu and list files excluded):" msgstr "" -#: src/LYHistory.c:1002 +#: src/LYHistory.c:1046 msgid "(No messages yet)" msgstr "" @@ -3883,15 +3883,15 @@ msgstr "" msgid "remove %s" msgstr "" -#: src/LYLocal.c:482 +#: src/LYLocal.c:483 msgid "Enter new location for tagged items: " msgstr "" -#: src/LYLocal.c:551 +#: src/LYLocal.c:552 msgid "Path too long" msgstr "" -#: src/LYLocal.c:582 +#: src/LYLocal.c:583 msgid "Source and destination are the same location - request ignored!" msgstr "" @@ -4094,78 +4094,78 @@ msgstr "" msgid "Already in target directory: %s" msgstr "" -#: src/LYLocal.c:2131 +#: src/LYLocal.c:2132 msgid "Installation complete" msgstr "" -#: src/LYLocal.c:2320 +#: src/LYLocal.c:2321 msgid "Temporary URL or list would be too long." msgstr "" -#: src/LYLocal.c:2371 +#: src/LYLocal.c:2372 #, c-format msgid "Unable to %s due to system error!" msgstr "" #. error return -#: src/LYLocal.c:2400 +#: src/LYLocal.c:2401 #, c-format msgid "Probable failure to %s due to system error!" msgstr "" -#: src/LYMail.c:906 +#: src/LYMail.c:879 #, c-format msgid "The link %s :?: %s \n" msgstr "" -#: src/LYMail.c:908 +#: src/LYMail.c:881 #, c-format msgid "called \"%s\"\n" msgstr "" -#: src/LYMail.c:909 +#: src/LYMail.c:882 #, c-format msgid "in the file \"%s\" called \"%s\"\n" msgstr "" -#: src/LYMail.c:910 +#: src/LYMail.c:883 msgid "was requested but was not available." msgstr "" -#: src/LYMail.c:911 +#: src/LYMail.c:884 msgid "Thought you might want to know." msgstr "" -#: src/LYMail.c:913 +#: src/LYMail.c:886 msgid "This message was automatically generated by" msgstr "" -#: src/LYMail.c:914 +#: src/LYMail.c:887 #, c-format msgid "Lynx ver. %s" msgstr "" -#: src/LYMail.c:1534 +#: src/LYMail.c:1504 msgid "Personal_name: " msgstr "" -#: src/LYMail.c:1536 +#: src/LYMail.c:1506 msgid "X_Personal_name: " msgstr "" -#: src/LYMail.c:1539 +#: src/LYMail.c:1509 msgid "Personal Name: " msgstr "" -#: src/LYMain.c:800 +#: src/LYMain.c:807 msgid "No Winsock found, sorry." msgstr "" -#: src/LYMain.c:985 +#: src/LYMain.c:992 msgid "You MUST define a valid TMP or TEMP area!\n" msgstr "" -#: src/LYMain.c:1392 +#: src/LYMain.c:1399 #, c-format msgid "" "\n" @@ -4173,21 +4173,21 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1408 +#: src/LYMain.c:1415 msgid "" "\n" "Lynx character sets not declared.\n" "\n" msgstr "" -#: src/LYMain.c:1432 +#: src/LYMain.c:1439 msgid "" "\n" "Lynx edit map not declared.\n" "\n" msgstr "" -#: src/LYMain.c:1475 +#: src/LYMain.c:1482 #, c-format msgid "" "\n" @@ -4195,61 +4195,61 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1703 +#: src/LYMain.c:1711 msgid "Warning:" msgstr "" -#: src/LYMain.c:2247 +#: src/LYMain.c:2264 msgid "persistent cookies state will be changed in next session only." msgstr "" -#: src/LYMain.c:2526 +#: src/LYMain.c:2543 #, c-format msgid "Lynx: ignoring unrecognized charset=%s\n" msgstr "" -#: src/LYMain.c:3012 +#: src/LYMain.c:3029 #, c-format msgid "" "\n" "%s Version %s (%.*s)\n" msgstr "" -#: src/LYMain.c:3024 +#: src/LYMain.c:3041 #, c-format msgid "Built on %s %s %s\n" msgstr "" -#: src/LYMain.c:3028 +#: src/LYMain.c:3045 msgid "" "Copyrights held by the University of Kansas, CERN, and other contributors.\n" msgstr "" -#: src/LYMain.c:3030 +#: src/LYMain.c:3047 msgid "Distributed under the GNU General Public License.\n" msgstr "" -#: src/LYMain.c:3032 +#: src/LYMain.c:3049 msgid "" "See http://lynx.browser.org/ and the online help for more information.\n" "\n" msgstr "" -#: src/LYMain.c:3703 +#: src/LYMain.c:3726 #, c-format msgid "USAGE: %s [options] [file]\n" msgstr "" -#: src/LYMain.c:3704 +#: src/LYMain.c:3727 msgid "Options are:\n" msgstr "" -#: src/LYMain.c:3941 +#: src/LYMain.c:3964 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "" -#: src/LYMainLoop.c:418 +#: src/LYMainLoop.c:470 #, c-format msgid "Internal error: Invalid mouse link %d!" msgstr "" @@ -4257,68 +4257,68 @@ msgstr "" #. #. * Make a name for this new URL. #. -#: src/LYMainLoop.c:572 +#: src/LYMainLoop.c:624 msgid "A URL specified by the user" msgstr "" -#: src/LYMainLoop.c:1057 +#: src/LYMainLoop.c:1109 msgid "Enctype multipart/form-data not yet supported! Cannot submit." msgstr "" #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3006 +#: src/LYMainLoop.c:3068 msgid "Help Screen" msgstr "" -#: src/LYMainLoop.c:3147 +#: src/LYMainLoop.c:3209 msgid "System Index" msgstr "" -#: src/LYMainLoop.c:3522 src/LYMainLoop.c:5097 +#: src/LYMainLoop.c:3595 src/LYMainLoop.c:5152 msgid "Entry into main screen" msgstr "" -#: src/LYMainLoop.c:4106 +#: src/LYMainLoop.c:4170 msgid "charset for this document specified explicitly, sorry..." msgstr "" -#: src/LYMainLoop.c:6047 +#: src/LYMainLoop.c:6106 msgid "Reparsing document under current settings..." msgstr "" -#: src/LYMainLoop.c:6328 src/LYMainLoop.c:6332 +#: src/LYMainLoop.c:6394 src/LYMainLoop.c:6398 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "" -#: src/LYMainLoop.c:7367 src/LYMainLoop.c:7542 +#: src/LYMainLoop.c:7442 src/LYMainLoop.c:7617 msgid "-index-" msgstr "" -#: src/LYMainLoop.c:7409 +#: src/LYMainLoop.c:7484 msgid "Inactive text input, activate to edit (e.g., press ENTER)" msgstr "" -#: src/LYMainLoop.c:7485 +#: src/LYMainLoop.c:7560 msgid "lynx: Can't access startfile" msgstr "" -#: src/LYMainLoop.c:7498 +#: src/LYMainLoop.c:7573 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "" -#: src/LYMainLoop.c:7499 +#: src/LYMainLoop.c:7574 msgid " Exiting..." msgstr "" -#: src/LYMainLoop.c:7540 +#: src/LYMainLoop.c:7615 msgid "-more-" msgstr "" #. Enable scrolling. -#: src/LYNews.c:196 +#: src/LYNews.c:205 msgid "You will be posting to:" msgstr "" @@ -4326,7 +4326,7 @@ msgstr "" #. * Get the mail address for the From header, #. * offering personal_mail_address as default. #. -#: src/LYNews.c:205 +#: src/LYNews.c:214 msgid "" "\n" "\n" @@ -4338,14 +4338,14 @@ msgstr "" #. * document's title as the default if this is a #. * followup rather than a new post. - FM #. -#: src/LYNews.c:224 +#: src/LYNews.c:233 msgid "" "\n" "\n" " Please provide or edit the Subject: header\n" msgstr "" -#: src/LYNews.c:315 +#: src/LYNews.c:324 msgid "" "\n" "\n" @@ -4355,112 +4355,112 @@ msgstr "" #. #. * Use the built in line editior. #. -#: src/LYNews.c:387 +#: src/LYNews.c:396 msgid "" "\n" "\n" " Please enter your message below." msgstr "" -#: src/LYNews.c:421 +#: src/LYNews.c:442 msgid "Message has no original text!" msgstr "" -#: src/LYOptions.c:676 +#: src/LYOptions.c:704 msgid "review/edit B)ookmarks files" msgstr "" -#: src/LYOptions.c:678 +#: src/LYOptions.c:706 msgid "B)ookmark file: " msgstr "" -#: src/LYOptions.c:2467 +#: src/LYOptions.c:2384 msgid "Left mouse button or return to select, arrow keys to scroll." msgstr "" -#: src/LYOptions.c:3682 src/LYOptions.c:3706 +#: src/LYOptions.c:3604 src/LYOptions.c:3628 #, c-format msgid "Use %s to invoke the Options menu!" msgstr "" -#: src/LYOptions.c:4311 +#: src/LYOptions.c:4235 msgid "Personal Preferences" msgstr "" #. Cookies: SELECT #. @@@ This is inconsistent - LYAcceptAllCookies gets saved to RC file #. but LYSetCookies doesn't! -#: src/LYOptions.c:4316 +#: src/LYOptions.c:4240 msgid "Cookies" msgstr "" #. Editor: INPUT -#: src/LYOptions.c:4330 +#: src/LYOptions.c:4254 msgid "Editor" msgstr "" #. Emacs keys: ON/OFF -#: src/LYOptions.c:4335 +#: src/LYOptions.c:4259 msgid "Emacs keys" msgstr "" #. Keypad Mode: SELECT -#: src/LYOptions.c:4341 +#: src/LYOptions.c:4265 msgid "Keypad mode" msgstr "" #. Mail Address: INPUT -#: src/LYOptions.c:4371 +#: src/LYOptions.c:4295 msgid "Personal mail address" msgstr "" #. Search Type: SELECT -#: src/LYOptions.c:4376 +#: src/LYOptions.c:4300 msgid "Searching type" msgstr "" -#: src/LYOptions.c:4384 +#: src/LYOptions.c:4308 msgid "Show color" msgstr "" #. Show cursor: ON/OFF -#: src/LYOptions.c:4408 +#: src/LYOptions.c:4332 msgid "Show cursor" msgstr "" #. User Mode: SELECT -#: src/LYOptions.c:4414 +#: src/LYOptions.c:4338 msgid "User mode" msgstr "" #. VI Keys: ON/OFF -#: src/LYOptions.c:4420 +#: src/LYOptions.c:4344 msgid "VI keys" msgstr "" #. Visited Pages: SELECT -#: src/LYOptions.c:4426 +#: src/LYOptions.c:4350 msgid "Visited Pages" msgstr "" #. Display Character Set: SELECT -#: src/LYOptions.c:4432 +#: src/LYOptions.c:4356 msgid "Display character set" msgstr "" #. X Display: INPUT -#: src/LYOptions.c:4448 +#: src/LYOptions.c:4372 msgid "X Display" msgstr "" #. #. * Document Layout #. -#: src/LYOptions.c:4454 +#: src/LYOptions.c:4378 msgid "Document Layout" msgstr "" -#: src/LYOptions.c:4471 +#: src/LYOptions.c:4395 msgid "Assumed document character set" msgstr "" @@ -4469,161 +4469,161 @@ 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:4491 +#: src/LYOptions.c:4415 msgid "CJK mode" msgstr "" -#: src/LYOptions.c:4493 +#: src/LYOptions.c:4417 msgid "Raw 8-bit" msgstr "" #. HTML error recovery: SELECT -#: src/LYOptions.c:4502 +#: src/LYOptions.c:4426 msgid "HTML error recovery" msgstr "" #. Select Popups: ON/OFF -#: src/LYOptions.c:4509 +#: src/LYOptions.c:4433 msgid "Popups for select fields" msgstr "" #. Show Images: SELECT -#: src/LYOptions.c:4515 +#: src/LYOptions.c:4439 msgid "Show images" msgstr "" #. Verbose Images: ON/OFF -#: src/LYOptions.c:4529 +#: src/LYOptions.c:4453 msgid "Verbose images" msgstr "" #. #. * Bookmark Options #. -#: src/LYOptions.c:4537 +#: src/LYOptions.c:4461 msgid "Bookmark Options" msgstr "" -#: src/LYOptions.c:4541 +#: src/LYOptions.c:4465 msgid "Multi-bookmarks" msgstr "" -#: src/LYOptions.c:4558 +#: src/LYOptions.c:4482 msgid "Review/edit Bookmarks files" msgstr "" -#: src/LYOptions.c:4560 +#: src/LYOptions.c:4484 msgid "Goto multi-bookmark menu" msgstr "" -#: src/LYOptions.c:4563 +#: src/LYOptions.c:4487 msgid "Bookmarks file" msgstr "" #. FTP sort: SELECT -#: src/LYOptions.c:4574 +#: src/LYOptions.c:4498 msgid "FTP sort criteria" msgstr "" #. Local Directory Sort: SELECT -#: src/LYOptions.c:4581 +#: src/LYOptions.c:4505 msgid "Local directory sort criteria" msgstr "" -#: src/LYOptions.c:4589 +#: src/LYOptions.c:4513 msgid "Show dot files" msgstr "" -#: src/LYOptions.c:4597 +#: src/LYOptions.c:4521 msgid "Execution links" msgstr "" #. #. * Headers transferred to remote server #. -#: src/LYOptions.c:4618 +#: src/LYOptions.c:4542 msgid "Headers transferred to remote server" msgstr "" #. Preferred Document Character Set: INPUT -#: src/LYOptions.c:4621 +#: src/LYOptions.c:4545 msgid "Preferred document character set" msgstr "" #. Preferred Document Language: INPUT -#: src/LYOptions.c:4626 +#: src/LYOptions.c:4550 msgid "Preferred document language" msgstr "" -#: src/LYOptions.c:4632 +#: src/LYOptions.c:4556 msgid "User-Agent header" msgstr "" -#: src/LYPrint.c:786 +#: src/LYPrint.c:782 msgid "Sending" msgstr "" -#: src/LYPrint.c:967 +#: src/LYPrint.c:963 msgid " Print job complete.\n" msgstr "" -#: src/LYPrint.c:1304 +#: src/LYPrint.c:1300 msgid "Document:" msgstr "" -#: src/LYPrint.c:1305 +#: src/LYPrint.c:1301 msgid "Number of lines:" msgstr "" -#: src/LYPrint.c:1306 +#: src/LYPrint.c:1302 msgid "Number of pages:" msgstr "" -#: src/LYPrint.c:1307 +#: src/LYPrint.c:1303 msgid "pages" msgstr "" -#: src/LYPrint.c:1307 +#: src/LYPrint.c:1303 msgid "page" msgstr "" -#: src/LYPrint.c:1308 +#: src/LYPrint.c:1304 msgid "(approximately)" msgstr "" -#: src/LYPrint.c:1313 +#: src/LYPrint.c:1309 msgid "Some print functions have been disabled!" msgstr "" -#: src/LYPrint.c:1317 +#: src/LYPrint.c:1313 msgid "Standard print options:" msgstr "" -#: src/LYPrint.c:1318 +#: src/LYPrint.c:1314 msgid "Print options:" msgstr "" -#: src/LYPrint.c:1324 +#: src/LYPrint.c:1320 msgid "Save to a local file" msgstr "" -#: src/LYPrint.c:1326 +#: src/LYPrint.c:1322 msgid "Save to disk disabled" msgstr "" -#: src/LYPrint.c:1332 +#: src/LYPrint.c:1328 msgid "Mail the file" msgstr "" -#: src/LYPrint.c:1338 +#: src/LYPrint.c:1334 msgid "Print to the screen" msgstr "" -#: src/LYPrint.c:1342 +#: src/LYPrint.c:1338 msgid "Print out on a printer attached to your vt100 terminal" msgstr "" -#: src/LYReadCFG.c:385 +#: src/LYReadCFG.c:409 msgid "" "Syntax Error parsing COLOR in configuration file:\n" "The line must be of the form:\n" @@ -4633,77 +4633,77 @@ msgid "" "The special strings 'nocolor' or 'default', or\n" msgstr "" -#: src/LYReadCFG.c:398 +#: src/LYReadCFG.c:422 msgid "Offending line:" msgstr "" -#: src/LYReadCFG.c:667 +#: src/LYReadCFG.c:691 #, c-format msgid "key remapping of %s to %s for %s failed\n" msgstr "" -#: src/LYReadCFG.c:674 +#: src/LYReadCFG.c:698 #, c-format msgid "key remapping of %s to %s failed\n" msgstr "" -#: src/LYReadCFG.c:695 +#: src/LYReadCFG.c:719 #, c-format msgid "invalid line-editor selection %s for key %s, selecting all\n" msgstr "" -#: src/LYReadCFG.c:722 src/LYReadCFG.c:735 +#: src/LYReadCFG.c:746 src/LYReadCFG.c:759 #, c-format msgid "" "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n" msgstr "" -#: src/LYReadCFG.c:740 +#: src/LYReadCFG.c:764 #, c-format msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n" msgstr "" -#: src/LYReadCFG.c:845 +#: src/LYReadCFG.c:869 #, c-format msgid "Lynx: cannot start, CERN rules file %s is not available\n" msgstr "" -#: src/LYReadCFG.c:847 +#: src/LYReadCFG.c:871 msgid "(no name)" msgstr "" -#: src/LYReadCFG.c:1631 +#: src/LYReadCFG.c:1651 #, c-format msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n" msgstr "" -#: src/LYReadCFG.c:1633 +#: src/LYReadCFG.c:1653 #, c-format msgid "Last attempted include was '%s',\n" msgstr "" -#: src/LYReadCFG.c:1634 +#: src/LYReadCFG.c:1654 #, c-format msgid "included from '%s'.\n" msgstr "" -#: src/LYReadCFG.c:2136 src/LYReadCFG.c:2149 src/LYReadCFG.c:2185 +#: src/LYReadCFG.c:2156 src/LYReadCFG.c:2169 src/LYReadCFG.c:2205 msgid "The following is read from your lynx.cfg file." msgstr "" -#: src/LYReadCFG.c:2137 src/LYReadCFG.c:2150 +#: src/LYReadCFG.c:2157 src/LYReadCFG.c:2170 msgid "Please read the distribution" msgstr "" -#: src/LYReadCFG.c:2143 src/LYReadCFG.c:2153 +#: src/LYReadCFG.c:2163 src/LYReadCFG.c:2173 msgid "for more comments." msgstr "" -#: src/LYReadCFG.c:2167 +#: src/LYReadCFG.c:2187 msgid "RELOAD THE CHANGES" msgstr "" -#: src/LYReadCFG.c:2176 +#: src/LYReadCFG.c:2196 msgid "Your primary configuration" msgstr "" @@ -4934,19 +4934,19 @@ msgstr "" msgid "Upload options:" msgstr "" -#: src/LYUtils.c:3013 +#: src/LYUtils.c:3063 msgid "Unexpected access protocol for this URL scheme." msgstr "" -#: src/LYUtils.c:4101 +#: src/LYUtils.c:4150 msgid "No restrictions set.\n" msgstr "" -#: src/LYUtils.c:4104 +#: src/LYUtils.c:4153 msgid "Restrictions set:\n" msgstr "" -#: src/LYUtils.c:5463 +#: src/LYUtils.c:5514 msgid "Ignoring invalid HOME" msgstr "" diff --git a/src/DefaultStyle.c b/src/DefaultStyle.c index 9532c973..c3b2eb66 100644 --- a/src/DefaultStyle.c +++ b/src/DefaultStyle.c @@ -4,8 +4,8 @@ */ #include <HTUtils.h> -#include <HTStyle.h> #include <HTFont.h> +#include <HTStyle.h> #include <LYLeaks.h> diff --git a/src/GridText.c b/src/GridText.c index 2082036c..a8687293 100644 --- a/src/GridText.c +++ b/src/GridText.c @@ -4,7 +4,6 @@ #include <HTUtils.h> #include <HTString.h> -#include <HTFont.h> #include <HTAccess.h> #include <HTAnchor.h> #include <HTParse.h> @@ -3809,7 +3808,7 @@ PUBLIC void HText_appendCharacter ARGS2( ) && ((unsigned char)ch >= 0xA1) && ((unsigned char)ch <= 0xDF)) { -#ifdef CONV_JISX0201KANA_ISX0208KANA +#ifdef CONV_JISX0201KANA_JISX0208KANA unsigned char c = (unsigned char)ch; unsigned char kb = (unsigned char)text->kanji_buf; JISx0201TO0208_SJIS(c, @@ -4297,7 +4296,7 @@ check_WrapSource: line->data[line->size++] = tmp[0]; line->data[line->size++] = tmp[1]; } else if (IS_EUC(hi, lo)) { -#ifdef CONV_JISX0201KANA_ISX0208KANA +#ifdef CONV_JISX0201KANA_JISX0208KANA JISx0201TO0208_EUC(hi, lo, &hi, &lo); #endif line->data[line->size++] = hi; @@ -4312,7 +4311,7 @@ check_WrapSource: case SJIS: if ((text->kcode == EUC) || (text->kcode == JIS)) { -#ifndef CONV_JISX0201KANA_ISX0208KANA +#ifndef CONV_JISX0201KANA_JISX0208KANA if (IS_EUC_X0201KANA(hi, lo)) line->data[line->size++] = lo; else @@ -10191,7 +10190,8 @@ PUBLIC int HText_SubmitForm ARGS4( anchor_ptr = HTMainText->first_anchor; while (anchor_ptr) { if (anchor_ptr->link_type == INPUT_ANCHOR) { - if (anchor_ptr->input_field->number == form_number) { + if (anchor_ptr->input_field->number == form_number && + !anchor_ptr->input_field->disabled) { char *p; char * val; @@ -10375,7 +10375,8 @@ PUBLIC int HText_SubmitForm ARGS4( */ while (anchor_ptr) { if (anchor_ptr->link_type == INPUT_ANCHOR) { - if (anchor_ptr->input_field->number == form_number) { + if (anchor_ptr->input_field->number == form_number && + !anchor_ptr->input_field->disabled) { char *p; int out_cs; form_ptr = anchor_ptr->input_field; @@ -11443,11 +11444,7 @@ PUBLIC void HText_setKcode ARGS3( ** If we get to here, it's not CJK, so disable that if ** it is enabled. But only if we are quite sure. - FM & kw */ -#ifdef KANJI_CODE_OVERRIDE - last_kcode = text->kcode = NOKANJI; -#else text->kcode = NOKANJI; -#endif if (HTCJK != NOCJK) { if (!p_in || p_in->enc != UCT_ENC_CJK) HTCJK = NOCJK; diff --git a/src/GridText.h b/src/GridText.h index da17b203..22116f3c 100644 --- a/src/GridText.h +++ b/src/GridText.h @@ -10,35 +10,7 @@ #include <HTForms.h> #endif /* HTFORMS_H */ -#ifndef HT_NON_BREAK_SPACE -#define HT_NON_BREAK_SPACE ((char)1) /* remember it */ -#endif /* !HT_NON_BREAK_SPACE */ -#ifndef HT_EN_SPACE -#define HT_EN_SPACE ((char)2) /* remember it */ -#endif /* !HT_EN_SPACE */ -#define LY_UNDERLINE_START_CHAR '\003' -#define LY_UNDERLINE_END_CHAR '\004' - -/* Turn about is fair play ASCII platforms use EBCDIC tab; - EBCDIC platforms use ASCII tab for LY_BOLD_START_CHAR. -*/ -#ifdef EBCDIC -#define LY_BOLD_START_CHAR '\011' -#else -#define LY_BOLD_START_CHAR '\005' -#endif - -#define LY_BOLD_END_CHAR '\006' -#ifndef LY_SOFT_HYPHEN -#define LY_SOFT_HYPHEN ((char)7) -#endif /* !LY_SOFT_HYPHEN */ -#define LY_SOFT_NEWLINE ((char)8) - -#ifdef EBCDIC -#define IsSpecialAttrChar(a) (((a) > '\002') && ((a) <= '\011') && ((a)!='\t')) -#else -#define IsSpecialAttrChar(a) (((a) > '\002') && ((a) <= '\010')) -#endif +#include <HTFont.h> #define TABSTOP 8 #define SPACES " " /* must be at least TABSTOP spaces long */ diff --git a/src/HTFont.h b/src/HTFont.h index 9e7a9202..9404b88f 100644 --- a/src/HTFont.h +++ b/src/HTFont.h @@ -8,14 +8,6 @@ typedef long int HTMLFont; /* For now */ -#ifndef HT_NON_BREAK_SPACE -#define HT_NON_BREAK_SPACE ((char)1) /* For now */ -#endif /* !HT_NON_BREAK_SPACE */ -#ifndef HT_EN_SPACE -#define HT_EN_SPACE ((char)2) /* For now */ -#endif /* !HT_EN_SPACE */ - - #define HT_FONT 0 #define HT_CAPITALS 1 #define HT_BOLD 2 @@ -26,4 +18,32 @@ typedef long int HTMLFont; /* For now */ #define HT_BLACK 0 #define HT_WHITE 1 +/* +** Lynx internal character representations. +*/ +#define HT_NON_BREAK_SPACE ((char)1) +#define HT_EN_SPACE ((char)2) +#define LY_UNDERLINE_START_CHAR '\003' +#define LY_UNDERLINE_END_CHAR '\004' + +/* Turn about is fair play ASCII platforms use EBCDIC tab; + EBCDIC platforms use ASCII tab for LY_BOLD_START_CHAR. +*/ +#ifdef EBCDIC +#define LY_BOLD_START_CHAR '\011' +#else +#define LY_BOLD_START_CHAR '\005' +#endif + +#define LY_BOLD_END_CHAR '\006' +#define LY_SOFT_HYPHEN ((char)7) +#define LY_SOFT_NEWLINE ((char)8) + +#ifdef EBCDIC +#define IsSpecialAttrChar(a) (((a) > '\002') && ((a) <= '\011') && ((a)!='\t')) +#else +#define IsSpecialAttrChar(a) (((a) > '\002') && ((a) <= '\010')) +#endif + + #endif /* HTFONT_H */ diff --git a/src/HTML.c b/src/HTML.c index 95a59897..e79ef01e 100644 --- a/src/HTML.c +++ b/src/HTML.c @@ -35,7 +35,6 @@ #include <LYCharSets.h> #include <HTAlert.h> -#include <HTFont.h> #include <HTForms.h> #include <HTNestedList.h> #include <GridText.h> diff --git a/src/LYCharSets.c b/src/LYCharSets.c index 62e1fdfc..6120a5a2 100644 --- a/src/LYCharSets.c +++ b/src/LYCharSets.c @@ -6,7 +6,6 @@ #include <UCMap.h> #include <UCDefs.h> #include <LYCharSets.h> -#include <HTFont.h> #include <GridText.h> #include <LYCurses.h> #include <LYStrings.h> diff --git a/src/LYCharUtils.c b/src/LYCharUtils.c index d4227365..b5e8f58d 100644 --- a/src/LYCharUtils.c +++ b/src/LYCharUtils.c @@ -25,7 +25,6 @@ #include <LYCharSets.h> #include <HTAlert.h> -#include <HTFont.h> #include <HTForms.h> #include <HTNestedList.h> #include <GridText.h> diff --git a/src/LYEdit.c b/src/LYEdit.c index e9b9a88d..cd2bbbb0 100644 --- a/src/LYEdit.c +++ b/src/LYEdit.c @@ -13,15 +13,30 @@ PUBLIC BOOLEAN editor_can_position NOARGS { + static CONST char *table[] = { #ifdef VMS - return (strstr(editor, "sedt") || strstr(editor, "SEDT")); + "sedt", + "SEDT" #else - return (strstr(editor, "emacs") || strstr(editor, "vi") || - strstr(editor, "pico") || strstr(editor, "jove") || - strstr(editor, "jed") || strstr(editor, "joe") || - strstr(editor, "jstar") || strstr(editor, "jmacs") || - strstr(editor, "rjoe") || strstr(editor, "jpico")); + "emacs", + "jed", + "jmacs", + "joe", + "jove", + "jpico", + "jstar", + "pico", + "rjoe", + "vi" #endif + }; + unsigned n; + for (n = 0; n < TABLESIZE(table); n++) { + if (strstr(editor, table[n]) != 0) { + return TRUE; + } + } + return FALSE; } /* diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h index b39fe04a..14cdc76d 100644 --- a/src/LYGlobalDefs.h +++ b/src/LYGlobalDefs.h @@ -171,6 +171,7 @@ extern BOOLEAN dump_output_immediately; extern BOOLEAN emacs_keys; /* TRUE to turn on emacs-like key movement */ extern BOOLEAN error_logging; /* TRUE to mail error messages */ extern BOOLEAN ftp_ok; +extern BOOLEAN ftp_passive; /* TRUE if we want to use passive mode ftp */ extern BOOLEAN goto_buffer; /* TRUE if offering default goto URL */ extern BOOLEAN is_www_index; extern BOOLEAN jump_buffer; /* TRUE if offering default shortcut */ @@ -381,15 +382,19 @@ extern char *LYCookieSRejectDomains; /* domains to reject all cookies */ extern char *LYCookieSStrictCheckDomains;/* domains to check strictly */ extern char *LYCookieSLooseCheckDomains;/* domains to check loosely */ extern char *LYCookieSQueryCheckDomains;/* domains to check w/a query */ + #ifdef EXP_PERSISTENT_COOKIES extern BOOLEAN persistent_cookies; extern char *LYCookieFile; /* cookie read file */ extern char *LYCookieSaveFile; /* cookie save file */ #endif /* EXP_PERSISTENT_COOKIES */ + extern char *XLoadImageCommand; /* Default image viewer for X */ + #ifdef USE_EXTERNALS extern BOOLEAN no_externals; /* don't allow the use of externals */ #endif + extern BOOLEAN LYNoISMAPifUSEMAP; /* Omit ISMAP link if MAP present? */ extern int LYHiddenLinks; @@ -400,24 +405,24 @@ extern BOOL Old_DTD; * Arrays that holds the names of sub-bookmark files * and their descriptions. */ -extern char *MBM_A_subbookmark[MBM_V_MAXFILES+1]; -extern char *MBM_A_subdescript[MBM_V_MAXFILES+1]; -extern FILE *LYTraceLogFP; /* Pointer for TRACE log */ -extern char *LYTraceLogPath; /* Path for TRACE log */ -extern BOOLEAN LYUseTraceLog; /* Use a TRACE log? */ -extern BOOLEAN LYSeekFragMAPinCur; -extern BOOLEAN LYSeekFragAREAinCur; -extern BOOLEAN LYStripDotDotURLs; /* Try to fix ../ in some URLs? */ extern BOOLEAN LYForceSSLCookiesSecure; extern BOOLEAN LYNoCc; +extern BOOLEAN LYNonRestartingSIGWINCH; extern BOOLEAN LYPreparsedSource; /* Show source as preparsed? */ extern BOOLEAN LYPrependBaseToSource; extern BOOLEAN LYPrependCharsetToSource; extern BOOLEAN LYQuitDefaultYes; -extern BOOLEAN LYNonRestartingSIGWINCH; extern BOOLEAN LYReuseTempfiles; +extern BOOLEAN LYSeekFragAREAinCur; +extern BOOLEAN LYSeekFragMAPinCur; +extern BOOLEAN LYStripDotDotURLs; /* Try to fix ../ in some URLs? */ extern BOOLEAN LYUseBuiltinSuffixes; +extern BOOLEAN LYUseTraceLog; /* Use a TRACE log? */ extern BOOLEAN dont_wrap_pre; +extern FILE *LYTraceLogFP; /* Pointer for TRACE log */ +extern char *LYTraceLogPath; /* Path for TRACE log */ +extern char *MBM_A_subbookmark[MBM_V_MAXFILES+1]; +extern char *MBM_A_subdescript[MBM_V_MAXFILES+1]; #ifdef MISC_EXP extern int LYNoZapKey; /* 0: off (do 'z' checking), 1: full, 2: initially */ @@ -433,6 +438,7 @@ extern BOOLEAN with_backspaces; #endif extern BOOL force_empty_hrefless_a; +extern int connect_timeout; #ifdef TEXTFIELDS_MAY_NEED_ACTIVATION extern BOOL textfields_need_activation; diff --git a/src/LYKeymap.c b/src/LYKeymap.c index a21e4003..dbde16f1 100644 --- a/src/LYKeymap.c +++ b/src/LYKeymap.c @@ -99,19 +99,14 @@ LYK_TRACE_TOGGLE, 0, LYK_SWITCH_DTD, LYK_REFRESH, LYK_NEXT_PAGE, LYK_SHELL, LYK_SOFT_DQUOTES, LYK_TOOLBAR, /* sp */ /* ! */ /* " */ /* # */ -0, 0, 0, LYK_HISTORICAL, +LYK_LAST_LINK, 0, 0, LYK_HISTORICAL, /* $ */ /* % */ /* & */ /* ' */ LYK_UP_HALF, LYK_DOWN_HALF, LYK_IMAGE_TOGGLE, LYK_NEXT_PAGE, /* ( */ /* ) */ /* * */ /* + */ -#ifndef USE_EXTERNALS -LYK_NEXT_PAGE, LYK_PREV_PAGE, 0, LYK_WHEREIS, -/* , */ /* - */ /* . */ /* / */ -#else LYK_NEXT_PAGE, LYK_PREV_PAGE, LYK_EXTERN, LYK_WHEREIS, /* , */ /* - */ /* . */ /* / */ -#endif LYK_F_LINK_NUM, LYK_1, LYK_2, LYK_3, /* 0 */ /* 1 */ /* 2 */ /* 3 */ @@ -128,18 +123,8 @@ LYK_UP_LINK, LYK_INFO, LYK_DOWN_LINK, LYK_HELP, LYK_RAW_TOGGLE, LYK_ADDRLIST, LYK_PREV_PAGE, LYK_COMMENT, /* @ */ /* A */ /* B */ /* C */ -LYK_DOWNLOAD, LYK_ELGOTO, -/* D */ /* E */ - -#if defined(DIRED_SUPPORT) || defined(VMS) -LYK_DIRED_MENU, -#else -0, -#endif /* DIRED_SUPPORT || VMS */ -/* F */ - -LYK_ECGOTO, -/* G */ +LYK_DOWNLOAD, LYK_ELGOTO, LYK_DIRED_MENU, LYK_ECGOTO, +/* D */ /* E */ /* F */ /* G */ LYK_HELP, LYK_INDEX, LYK_JUMP, LYK_KEYMAP, /* H */ /* I */ /* J */ /* K */ @@ -156,24 +141,14 @@ LYK_TAG_LINK, LYK_PREV_DOC, LYK_VLINKS, 0, LYK_NOCACHE, 0, LYK_INTERRUPT, LYK_INLINE_TOGGLE, /* X */ /* Y */ /* Z */ /* [ */ -LYK_SOURCE, LYK_HEAD, 0, LYK_CLEAR_AUTH, +LYK_SOURCE, LYK_HEAD, LYK_FIRST_LINK, LYK_CLEAR_AUTH, /* \ */ /* ] */ /* ^ */ /* _ */ LYK_MINIMAL, LYK_ADD_BOOKMARK, LYK_PREV_PAGE, LYK_COMMENT, /* ` */ /* a */ /* b */ /* c */ -LYK_DOWNLOAD, LYK_EDIT, -/* d */ /* e */ - -#if defined(DIRED_SUPPORT) || defined(VMS) -LYK_DIRED_MENU, -#else -0, -#endif /* DIRED_SUPPORT || VMS */ -/* f */ - -LYK_GOTO, -/* g */ +LYK_DOWNLOAD, LYK_EDIT, LYK_DIRED_MENU, LYK_GOTO, +/* d */ /* e */ /* f */ /* g */ LYK_HELP, LYK_INDEX, LYK_JUMP, LYK_KEYMAP, /* h */ /* i */ /* j */ /* k */ @@ -672,6 +647,8 @@ PRIVATE struct rmap revmap[] = { { "REFRESH", "refresh the screen to clear garbled text" }, { "HOME", "go to the beginning of the current document" }, { "END", "go to the end of the current document" }, +{ "FIRST_LINK", "make the first link on the line current" }, +{ "LAST_LINK", "make the last link on the line current" }, { "PREV_LINK", "make the previous link current" }, { "NEXT_LINK", "make the next link current" }, { "LPOS_PREV_LINK", "make previous link current, same column for input" }, diff --git a/src/LYKeymap.h b/src/LYKeymap.h index bd0048b8..f58b54a9 100644 --- a/src/LYKeymap.h +++ b/src/LYKeymap.h @@ -136,6 +136,8 @@ typedef enum { , LYK_REFRESH , LYK_HOME , LYK_END + , LYK_FIRST_LINK + , LYK_LAST_LINK , LYK_PREV_LINK , LYK_NEXT_LINK , LYK_LPOS_PREV_LINK @@ -206,6 +208,8 @@ typedef enum { #ifdef USE_EXTERNALS , LYK_EXTERN +#else +#define LYK_EXTERN LYK_UNKNOWN #endif /* !defined(USE_EXTERNALS) */ #if defined(VMS) || defined(DIRED_SUPPORT) diff --git a/src/LYMain.c b/src/LYMain.c index 52c8600b..1313b2dd 100644 --- a/src/LYMain.c +++ b/src/LYMain.c @@ -164,6 +164,7 @@ PUBLIC BOOLEAN LYUserSpecifiedURL = TRUE;/* always TRUE the first time */ PUBLIC BOOLEAN LYJumpFileURL = FALSE; /* always FALSE the first time */ PUBLIC BOOLEAN jump_buffer = JUMPBUFFER; /* TRUE if offering default shortcut */ PUBLIC BOOLEAN goto_buffer = GOTOBUFFER; /* TRUE if offering default goto URL */ +PUBLIC BOOLEAN ftp_passive = FTP_PASSIVE; /* TRUE if doing ftp in passive mode */ PUBLIC BOOLEAN recent_sizechange = FALSE;/* the window size changed recently? */ PUBLIC int user_mode = NOVICE_MODE; PUBLIC BOOLEAN dump_output_immediately = FALSE; @@ -438,6 +439,8 @@ PUBLIC BOOLEAN LYPrependCharsetToSource = TRUE; PUBLIC BOOLEAN LYQuitDefaultYes = QUIT_DEFAULT_YES; PUBLIC BOOLEAN dont_wrap_pre = FALSE; +PUBLIC int connect_timeout = 18000;/*=180000*0.1 - used in HTDoConnect.*/ + #ifdef EXP_JUSTIFY_ELTS PUBLIC BOOL ok_justify = TRUE; PUBLIC int justify_max_void_percent = 35; @@ -3159,6 +3162,12 @@ static Parse_Args_Type Arg_Table [] = "force color mode on with standard bg colors" ), #endif +#ifndef __DJGPP__ + PARSE_SET( + "connect_timeout", NEED_INT_ARG, &connect_timeout, + "=N\nset the N-second connection timeout" + ), +#endif #ifdef MISC_EXP PARSE_SET( "convert_to", FUNCTION_ARG, convert_to_fun, @@ -3208,8 +3217,8 @@ with -dump, format output as with -traversal, but to stdout" ), PARSE_SET( "dont_wrap_pre", SET_ARG, &dont_wrap_pre, - "inhibit wrapping of text in <pre> when -dump'ing and \n" - "-crawl'ing, mark wrapped lines in interactive session" + "inhibit wrapping of text in <pre> when -dump'ing and \n\ +-crawl'ing, mark wrapped lines in interactive session" ), PARSE_FUN( "dump", FUNCTION_ARG, dump_output_fun, diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c index 5704abd1..b3f0f624 100644 --- a/src/LYMainLoop.c +++ b/src/LYMainLoop.c @@ -446,16 +446,24 @@ PUBLIC void LYMainLoop_pageDisplay ARGS1( } +PRIVATE void set_curdoc_link ARGS1( + int, nextlink) +{ + if (curdoc.link != nextlink + && nextlink >= 0 + && nextlink < nlinks) { + if (curdoc.link >= 0 && curdoc.link < nlinks) + highlight(OFF, curdoc.link, prev_target); + curdoc.link = nextlink; + } +} + PRIVATE int do_change_link NOARGS { /* Is there a mouse-clicked link waiting? */ int mouse_tmp = get_mouse_link(); /* If yes, use it as the link */ if (mouse_tmp != -1) { - if (curdoc.link >= 0 && curdoc.link < nlinks - && curdoc.link != mouse_tmp) { - highlight(OFF, curdoc.link, prev_target); - } if (mouse_tmp < 0 || mouse_tmp >= nlinks) { char *msgtmp = NULL; HTSprintf0(&msgtmp, @@ -465,7 +473,7 @@ PRIVATE int do_change_link NOARGS FREE(msgtmp); return(-1); /* indicates unexpected error */ } - curdoc.link = mouse_tmp; + set_curdoc_link(mouse_tmp); } return(0); /* indicates OK */ } @@ -2229,10 +2237,9 @@ PRIVATE void handle_LYK_DOWN_LINK ARGS3( newlink = find_link_near_col(*follow_col, 1); if (newlink > -1) { - highlight(OFF, curdoc.link, prev_target); - curdoc.link = newlink; + set_curdoc_link(newlink); } else if (more) { /* next page */ - Newline += (display_lines); + Newline += (display_lines); } else if (*old_c != real_c) { *old_c = real_c; HTUserMsg(NO_LINKS_BELOW); @@ -2743,8 +2750,7 @@ PRIVATE BOOLEAN handle_LYK_FASTBACKW_LINK ARGS3( nextlink--; } } - highlight(OFF, curdoc.link, prev_target); - curdoc.link = nextlink; + set_curdoc_link(nextlink); return FALSE; /* and we are done. */ } else if (Newline > 1 && /* need a previous page */ @@ -2813,8 +2819,7 @@ PRIVATE void handle_LYK_FASTFORW_LINK ARGS2( } } if (samepage) { - highlight(OFF, curdoc.link, prev_target); - curdoc.link = nextlink; + set_curdoc_link(nextlink); return; /* and we are done. */ /* @@ -2822,8 +2827,7 @@ PRIVATE void handle_LYK_FASTFORW_LINK ARGS2( * Move to the top link on the page. */ } else if (!more && Newline == 1 && curdoc.link == nlinks-1) { - highlight(OFF, curdoc.link, prev_target); - curdoc.link = 0; + set_curdoc_link(0); } else if (more && /* need a later page */ HTGetLinkOrFieldStart(curdoc.link, @@ -2839,6 +2843,18 @@ PRIVATE void handle_LYK_FASTFORW_LINK ARGS2( return; } +PRIVATE void handle_LYK_FIRST_LINK NOARGS +{ + int i; + + for (i = curdoc.link - 1; i >= 0; i--) { + if (links[i].ly != links[curdoc.link].ly) { + set_curdoc_link(i + 1); + break; + } + } +} + PRIVATE BOOLEAN handle_LYK_GOTO ARGS9( int *, ch, char *, user_input_buffer, @@ -3509,12 +3525,23 @@ PRIVATE void handle_LYK_KEYMAP ARGS4( } } +PRIVATE void handle_LYK_LAST_LINK NOARGS +{ + int i; + + for (i = curdoc.link; i < nlinks; i++) { + if (links[i].ly != links[curdoc.link].ly) { + set_curdoc_link(i - 1); + break; + } + } +} + PRIVATE void handle_LYK_LEFT_LINK NOARGS { if (curdoc.link>0 && links[curdoc.link].ly == links[curdoc.link-1].ly) { - highlight(OFF, curdoc.link, prev_target); - curdoc.link--; + set_curdoc_link(curdoc.link-1); } } @@ -3869,11 +3896,10 @@ PRIVATE void handle_LYK_NEXT_LINK ARGS3( * Move to the top link on the page. */ } else if (!more && Newline == 1 && curdoc.link == nlinks-1) { - highlight(OFF, curdoc.link, prev_target); - curdoc.link = 0; + set_curdoc_link(0); } else if (more) { /* next page */ - Newline += (display_lines); + Newline += (display_lines); } else if (*old_c != real_c) { *old_c = real_c; @@ -3888,8 +3914,7 @@ PRIVATE void handle_LYK_NEXT_PAGE ARGS2( if (more) { Newline += display_lines; } else if (curdoc.link < nlinks-1) { - highlight(OFF, curdoc.link, prev_target); - curdoc.link = nlinks-1; /* put on last link */ + set_curdoc_link(nlinks - 1); } else if (*old_c != real_c) { *old_c = real_c; HTInfoMsg(ALREADY_AT_END); @@ -3924,22 +3949,16 @@ PRIVATE void handle_LYK_PREV_LINK ARGS3( int, real_c) { if (curdoc.link > 0) { /* previous link */ - /* - * Unhighlight current link. - */ - highlight(OFF, curdoc.link, prev_target); - curdoc.link--; + set_curdoc_link(curdoc.link - 1); } else if (!more && curdoc.link==0 && Newline==1) { /* at the top of list */ /* * If there is only one page of data and the user - * goes off the top, then unhighlight the current - * link and just move the cursor to last link on + * goes off the top, just move the cursor to last link on * the page. */ - highlight(OFF, curdoc.link, prev_target); - curdoc.link = nlinks-1; /* the last link */ + set_curdoc_link(nlinks - 1); } else if (curdoc.line > 1) { /* previous page */ /* @@ -4082,8 +4101,7 @@ PRIVATE void handle_LYK_PREV_PAGE ARGS2( if (Newline > 1) { Newline -= display_lines; } else if (curdoc.link > 0) { - highlight(OFF, curdoc.link, prev_target); - curdoc.link = 0; /* put on first link */ + set_curdoc_link(0); } else if (*old_c != real_c) { *old_c = real_c; HTInfoMsg(ALREADY_AT_BEGIN); @@ -4245,8 +4263,7 @@ PRIVATE void handle_LYK_RIGHT_LINK NOARGS { if (curdoc.link<nlinks-1 && links[curdoc.link].ly == links[curdoc.link+1].ly) { - highlight(OFF, curdoc.link, prev_target); - curdoc.link++; + set_curdoc_link(curdoc.link + 1); } } @@ -4469,11 +4486,9 @@ PRIVATE void handle_LYK_TAG_LINK NOARGS } } if (curdoc.link < nlinks-1) { - highlight(OFF, curdoc.link, prev_target); - curdoc.link++; + set_curdoc_link(curdoc.link + 1); } else if (!more && Newline == 1 && curdoc.link == nlinks-1) { - highlight(OFF, curdoc.link, prev_target); - curdoc.link = 0; + set_curdoc_link(0); } else if (more) { /* next page */ Newline += (display_lines); } @@ -4653,8 +4668,7 @@ PRIVATE void handle_LYK_UP_LINK ARGS4( newlink = find_link_near_col(*follow_col, -1); if (newlink > -1) { - highlight(OFF, curdoc.link, prev_target); - curdoc.link = newlink; + set_curdoc_link(newlink); } else if (*old_c != real_c) { *old_c = real_c; HTUserMsg(NO_LINKS_ABOVE); @@ -5005,13 +5019,8 @@ PRIVATE void handle_LYK_digit ARGS6( } else { /* * It's a different link on this page, - * so turn the highlighting off, set the - * current link to the new link value from - * follow_link_number(), and re-initialize - * the new link value. - FM */ - highlight(OFF, curdoc.link, prev_target); - curdoc.link = newdoc.link; + set_curdoc_link(newdoc.link); newdoc.link = 0; } } @@ -6861,6 +6870,14 @@ new_cmd: /* } break; + case LYK_FIRST_LINK: + handle_LYK_FIRST_LINK(); + break; + + case LYK_LAST_LINK: + handle_LYK_LAST_LINK(); + break; + case LYK_PREV_LINK: case LYK_LPOS_PREV_LINK: handle_LYK_PREV_LINK(&arrowup, &old_c, real_c); diff --git a/src/LYNews.c b/src/LYNews.c index 0a031c93..910f8a9b 100644 --- a/src/LYNews.c +++ b/src/LYNews.c @@ -29,13 +29,16 @@ PRIVATE void terminate_message PARAMS((int sig)); extern HTCJKlang HTCJK; #endif -PRIVATE BOOLEAN message_has_content ARGS1( - CONST char *, filename) +PRIVATE BOOLEAN message_has_content ARGS2( + CONST char *, filename, + BOOLEAN *, nonspaces) { FILE *fp; char *buffer = NULL; BOOLEAN in_headers = TRUE; + *nonspaces = FALSE; + if (!filename || (fp = fopen(filename, "r")) == NULL) { CTRACE((tfp, "Failed to open file %s for reading!\n", NONNULL(filename))); @@ -53,14 +56,19 @@ PRIVATE BOOLEAN message_has_content ARGS1( } else if (*cp != ' ') { if (!firstnonblank && isgraph((unsigned char)*cp)) { firstnonblank = *cp; + } else if (!isspace((unsigned char)*cp)) { + *nonspaces = TRUE; } } } if (*cp != '\n') { int c; - while ((c = getc(fp)) != EOF && c != (int)(unsigned char)'\n') { - if (!firstnonblank && isgraph((unsigned char)c)) + while ((c = getc(fp)) != EOF && c != '\n') { + if (!firstnonblank && isgraph((unsigned char)c)) { firstnonblank = (char)c; + } else if (!isspace((unsigned char)*cp)) { + *nonspaces = TRUE; + } } } if (firstnonblank && firstnonblank != '>') { @@ -109,6 +117,7 @@ PUBLIC char *LYNewsPost ARGS2( char *org = NULL; FILE *fp = NULL; BOOLEAN nonempty = FALSE; + BOOLEAN nonspaces = FALSE; /* * Make sure a non-zero length newspost, newsreply, @@ -378,7 +387,7 @@ PUBLIC char *LYNewsPost ARGS2( start_curses(); } - nonempty = message_has_content(my_tempfile); + nonempty = message_has_content(my_tempfile, &nonspaces); } else { /* @@ -417,20 +426,23 @@ PUBLIC char *LYNewsPost ARGS2( scrollok(stdscr, FALSE); /* Stop scrolling. */ } - if (!nonempty) { + if (nonempty) { + /* + * Confirm whether to post, and if so, + * whether to append the sig file. - FM + */ + LYStatusLine = (LYlines - 1); + c = HTConfirm(POST_MSG_PROMPT); + LYStatusLine = -1; + if (c != YES) { + clear(); /* clear the screen */ + goto cleanup; + } + } else { HTAlert(gettext("Message has no original text!")); - goto cleanup; - } - /* - * Confirm whether to post, and if so, - * whether to append the sig file. - FM - */ - LYStatusLine = (LYlines - 1); - c = HTConfirm(POST_MSG_PROMPT); - LYStatusLine = -1; - if (c != YES) { - clear(); /* clear the screen */ - goto cleanup; + if (!nonspaces + || HTConfirmDefault(POST_MSG_PROMPT, NO) != YES) + goto cleanup; } if ((LynxSigFile != NULL) && (fp = fopen(LynxSigFile, TXT_R)) != NULL) { char *msg = NULL; diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c index 48398fdd..bfaa0de1 100644 --- a/src/LYReadCFG.c +++ b/src/LYReadCFG.c @@ -1318,6 +1318,9 @@ static Config_Type Config_Table [] = #ifdef USE_COLOR_TABLE PARSE_FUN("color", CONF_FUN, color_fun), #endif +#ifndef __DJGPP__ + PARSE_INT("connect_timeout",CONF_INT,&connect_timeout), +#endif PARSE_STR("cookie_accept_domains", CONF_STR, &LYCookieSAcceptDomains), #ifdef EXP_PERSISTENT_COOKIES PARSE_STR("cookie_file", CONF_STR, &LYCookieFile), @@ -1363,6 +1366,7 @@ static Config_Type Config_Table [] = #if !defined(NO_OPTION_FORMS) && !defined(NO_OPTION_MENU) PARSE_SET("forms_options", CONF_BOOL, &LYUseFormsOptions), #endif + PARSE_SET("ftp_passive", CONF_BOOL, &ftp_passive), PARSE_ENV("ftp_proxy", CONF_ENV, 0 ), PARSE_STR("global_extension_map", CONF_STR, &global_extension_map), PARSE_STR("global_mailcap", CONF_STR, &global_type_map), diff --git a/src/UCdomap.c b/src/UCdomap.c index 48991d6a..64875fef 100644 --- a/src/UCdomap.c +++ b/src/UCdomap.c @@ -1728,9 +1728,9 @@ PRIVATE CONST char ** UC_setup_LYCharSets_repl ARGS2( { CONST char **ISO_Latin1 = LYCharSets[0]; CONST char **p; - char **prepl; + CONST char **prepl; CONST u16 *pp; - char **tp; + CONST char **tp; CONST char *s7; CONST char *s8; size_t i; @@ -1741,7 +1741,7 @@ PRIVATE CONST char ** UC_setup_LYCharSets_repl ARGS2( /* * Create a temporary table for reverse lookup of latin1 codes: */ - tp = (char **)malloc(96 * sizeof(CONST char *)); + tp = (CONST char **)malloc(96 * sizeof(CONST char *)); if (!tp) return NULL; for (i = 0; i < 96; i++) @@ -1786,7 +1786,7 @@ PRIVATE CONST char ** UC_setup_LYCharSets_repl ARGS2( list = UCInfo[UC_charset_in_hndl].replacedesc.entries; while (ct--) { if ((k = list->unicode) >= 160 && k < 256) { - tp[k-160] = (char *)(list->replace_str); + tp[k-160] = list->replace_str; } list++; } @@ -1795,14 +1795,14 @@ PRIVATE CONST char ** UC_setup_LYCharSets_repl ARGS2( * Now allocate a new table compatible with LYCharSets[] * and with the HTMLDTD for entities. * We don't know yet whether we'll keep it around. */ - prepl = (char **)malloc(HTML_dtd.number_of_entities * sizeof(char *)); + prepl = (CONST char **)malloc(HTML_dtd.number_of_entities * sizeof(char *)); if (!prepl) { FREE(tp); FREE(ti); return 0; } - p = (CONST char **)prepl; + p = prepl; changed = 0; for (i = 0; i < HTML_dtd.number_of_entities; i++, p++) { /* @@ -1873,7 +1873,7 @@ PRIVATE CONST char ** UC_setup_LYCharSets_repl ARGS2( FREE(prepl); return NULL; } - return (CONST char **)prepl; + return prepl; } /* diff --git a/userdefs.h b/userdefs.h index 4f2d4300..9c0e297b 100644 --- a/userdefs.h +++ b/userdefs.h @@ -496,6 +496,12 @@ #define GOTOBUFFER FALSE /***************************** + * If FTP_PASSIVE is set to TRUE here or in lynx.cfg, ftp transfers will + * be done in passive mode. + */ +#define FTP_PASSIVE FALSE + +/***************************** * JUMPFILE is the default local file checked for shortcut URLs when * the user presses the 'J' (JUMP) key. The user will be prompted for * a shortcut entry (analogously to 'g'oto), and can enter one @@ -1302,12 +1308,12 @@ * the version definition with the Project Version on checkout. Just * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -#define LYNX_VERSION "2.8.3dev.20" +#define LYNX_VERSION "2.8.3dev.21" #define LYNX_WWW_HOME "http://lynx.browser.org/" #define LYNX_WWW_DIST "http://www.slcc.edu/lynx/current/" #define LYNX_RELEASE FALSE /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */ -#define LYNX_DATE "Tue, 15 Feb 2000 04:01:32 -0800" +#define LYNX_DATE "Fri, 25 Feb 2000 04:38:35 -0800" #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */ #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */ #define LYNX_RELEASE_DATE "1999" |